* blockinlining.c: remove "yarv" prefix.

* array.c, numeric.c: ditto.
* insnhelper.ci, insns.def, vm_evalbody.ci: ditto.
* yarvcore.c: removed.
* yarvcore.h: renamed to core.h.
* cont.c, debug.c, error.c, process.c, signal.c : ditto.
* ext/probeprofiler/probeprofiler.c: ditto.
* id.c, id.h: added.
* inits.c: ditto.
* compile.c: rename internal functions.
* compile.h: fix debug flag.
* eval.c, object.c, vm.c: remove ruby_top_self.
  use rb_vm_top_self() instead.
* eval_intern.h, eval_load: ditto.
* gc.c: rename yarv_machine_stack_mark() to
  rb_gc_mark_machine_stack().
* insnhelper.h: remove unused macros.
* iseq.c: add iseq_compile() to create iseq object
  from source string.
* proc.c: rename a internal function.
* template/insns.inc.tmpl: remove YARV prefix.
* thread.c:
* vm.c (rb_iseq_eval): added.
* vm.c: move some functions from yarvcore.c.
* vm_dump.c: fix to remove compiler warning.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 6 deletions

diff --git a/eval_load.c b/eval_load.c
index 3974513b16..d0cd5e2d41 100644
--- a/eval_load.c
+++ b/eval_load.c
@@ -4,8 +4,6 @@
 
 #include "eval_intern.h"
 
-extern VALUE ruby_top_self;
-
 VALUE ruby_dln_librefs;
 
 #define IS_SOEXT(e) (strcmp(e, ".so") == 0 || strcmp(e, ".o") == 0)
@@ -157,7 +155,7 @@ rb_load(VALUE fname, int wrap)
     }
     else {
 	/* load in anonymous module as toplevel */
-	th->top_self = rb_obj_clone(ruby_top_self);
+	th->top_self = rb_obj_clone(rb_vm_top_self());
 	th->top_wrapper = rb_module_new();
 	rb_extend_object(th->top_self, th->top_wrapper);
     }
@@ -175,7 +173,7 @@ rb_load(VALUE fname, int wrap)
 	loaded = Qtrue;
 	iseq = rb_iseq_new(node, rb_str_new2("<top (required)>"),
 			   fname, Qfalse, ISEQ_TYPE_TOP);
-	rb_thread_eval(th, iseq);
+	rb_iseq_eval(iseq);
     }
     POP_TAG();
 
@@ -435,7 +433,7 @@ rb_require_safe(VALUE fname, int safe)
 		    break;
 
 		  case 's':
-		    handle = (long)rb_vm_call_cfunc(ruby_top_self, load_ext,
+		    handle = (long)rb_vm_call_cfunc(rb_vm_top_self(), load_ext,
 						    path, 0, path);
 		    rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
 		    break;
@@ -482,7 +480,7 @@ void
 ruby_init_ext(const char *name, void (*init)(void))
 {
     if (load_lock(name)) {
-	rb_vm_call_cfunc(ruby_top_self, init_ext_call, (VALUE)init,
+	rb_vm_call_cfunc(rb_vm_top_self(), init_ext_call, (VALUE)init,
 			 0, rb_str_new2(name));
 	rb_provide(name);
 	load_unlock(name);