* 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, 0 insertions, 582 deletions

diff --git a/yarvcore.c b/yarvcore.c
deleted file mode 100644
index 194ca1a586..0000000000
--- a/yarvcore.c
+++ /dev/null
@@ -1,582 +0,0 @@
-/**********************************************************************
-
-  yarvcore.h - 
-
-  $Author$
-  $Date$
-  created at: 04/01/01 01:17:22 JST
-
-  Copyright (C) 2004-2006 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include "ruby/node.h"
-#include "yarvcore.h"
-#include "gc.h"
-
-
-VALUE rb_cVM;
-VALUE rb_cThread;
-
-VALUE symIFUNC;
-VALUE symCFUNC;
-
-ID idPLUS;
-ID idMINUS;
-ID idMULT;
-ID idDIV;
-ID idMOD;
-ID idLT;
-ID idLTLT;
-ID idLE;
-ID idGT;
-ID idGE;
-ID idEq;
-ID idEqq;
-ID idBackquote;
-ID idEqTilde;
-ID idThrowState;
-ID idAREF;
-ID idASET;
-ID idIntern;
-ID idMethodMissing;
-ID idLength;
-ID idLambda;
-ID idGets;
-ID idSucc;
-ID idEach;
-ID idRangeEachLT;
-ID idRangeEachLE;
-ID idArrayEach;
-ID idTimes;
-ID idEnd;
-ID idBitblt;
-ID idAnswer;
-ID idSvarPlaceholder;
-ID idSend;
-ID id__send__;
-ID id__send;
-ID idFuncall;
-ID id__send_bang;
-
-/* from Ruby 1.9 eval.c */
-#ifdef HAVE_STDARG_PROTOTYPES
-#include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
-
-/************/
-/* YARVCore */
-/************/
-
-rb_thread_t *ruby_current_thread = 0;
-rb_vm_t *ruby_current_vm = 0;
-
-static NODE *
-compile_string(VALUE str, VALUE file, VALUE line)
-{
-    VALUE parser = rb_parser_new();
-    NODE *node;
-
-    node = rb_parser_compile_string(parser, StringValueCStr(file),
-				    str, NUM2INT(line));
-
-    if (!node) {
-	rb_exc_raise(GET_THREAD()->errinfo);	/* TODO: check err */
-    }
-    return node;
-}
-
-static VALUE
-yarvcore_eval_iseq(VALUE iseq)
-{
-    return rb_thread_eval(GET_THREAD(), iseq);
-}
-
-static VALUE
-vm_compile_from_node(rb_thread_t *th, NODE * node, VALUE file)
-{
-    VALUE iseq;
-    if (th->base_block) {
-	iseq = rb_iseq_new(node,
-			     th->base_block->iseq->name,
-			     file,
-			     th->base_block->iseq->self,
-			     ISEQ_TYPE_EVAL);
-    }
-    else {
-	iseq = rb_iseq_new(node, rb_str_new2("<main>"), file,
-			   Qfalse, ISEQ_TYPE_TOP);
-    }
-    return iseq;
-}
-
-VALUE
-vm_compile(rb_thread_t *th, VALUE str, VALUE file, VALUE line)
-{
-    NODE *node = (NODE *) compile_string(str, file, line);
-    return vm_compile_from_node(th, (NODE *) node, file);
-}
-
-VALUE
-yarvcore_eval_parsed(NODE *node, VALUE file)
-{
-    VALUE iseq = vm_compile_from_node(GET_THREAD(), node, file);
-    return yarvcore_eval_iseq(iseq);
-}
-
-VALUE
-yarvcore_eval(VALUE self, VALUE str, VALUE file, VALUE line)
-{
-    NODE *node;
-    node = compile_string(str, file, line);
-    return yarvcore_eval_parsed(node, file);
-}
-
-/******/
-/* VM */
-/******/
-
-void native_thread_cleanup(void *);
-
-static void
-vm_free(void *ptr)
-{
-    RUBY_FREE_ENTER("vm");
-    if (ptr) {
-	rb_vm_t *vmobj = ptr;
-
-	st_free_table(vmobj->living_threads);
-	/* TODO: MultiVM Instance */
-	/* VM object should not be cleaned by GC */
-	/* ruby_xfree(ptr); */
-	/* ruby_current_vm = 0; */
-    }
-    RUBY_FREE_LEAVE("vm");
-}
-
-static int
-vm_mark_each_thread_func(st_data_t key, st_data_t value, st_data_t dummy)
-{
-    VALUE thval = (VALUE)key;
-    rb_gc_mark(thval);
-    return ST_CONTINUE;
-}
-
-static void
-mark_event_hooks(rb_event_hook_t *hook)
-{
-    while (hook) {
-	rb_gc_mark(hook->data);
-	hook = hook->next;
-    }
-}
-
-static void
-vm_mark(void *ptr)
-{
-    RUBY_MARK_ENTER("vm");
-    RUBY_GC_INFO("-------------------------------------------------\n");
-    if (ptr) {
-	rb_vm_t *vm = ptr;
-	if (vm->living_threads) {
-	    st_foreach(vm->living_threads, vm_mark_each_thread_func, 0);
-	}
-	RUBY_MARK_UNLESS_NULL(vm->thgroup_default);
-	RUBY_MARK_UNLESS_NULL(vm->mark_object_ary);
-	RUBY_MARK_UNLESS_NULL(vm->last_status);
-	RUBY_MARK_UNLESS_NULL(vm->loaded_features);
-
-	if (vm->loading_table) {
-	    rb_mark_tbl(vm->loading_table);
-	}
-
-	mark_event_hooks(vm->event_hooks);
-    }
-
-    RUBY_MARK_LEAVE("vm");
-}
-
-void
-rb_vm_mark(void *ptr)
-{
-    vm_mark(ptr);
-}
-
-static void
-vm_init2(rb_vm_t *vm)
-{
-    MEMZERO(vm, rb_vm_t, 1);
-}
-
-/**********/
-/* Thread */
-/**********/
-
-static void
-thread_free(void *ptr)
-{
-    rb_thread_t *th;
-    RUBY_FREE_ENTER("thread");
-
-    if (ptr) {
-	th = ptr;
-
-	if (!th->root_fiber) {
-	    RUBY_FREE_UNLESS_NULL(th->stack);
-	}
-
-	if (th->local_storage) {
-	    st_free_table(th->local_storage);
-	}
-
-#if USE_VALUE_CACHE
-	{
-	    VALUE *ptr = th->value_cache_ptr;
-	    while (*ptr) {
-		VALUE v = *ptr;
-		RBASIC(v)->flags = 0;
-		RBASIC(v)->klass = 0;
-		ptr++;
-	    }
-	}
-#endif
-
-	if (th->vm->main_thread == th) {
-	    RUBY_GC_INFO("main thread\n");
-	}
-	else {
-	    ruby_xfree(ptr);
-	}
-    }
-    RUBY_FREE_LEAVE("thread");
-}
-
-void yarv_machine_stack_mark(rb_thread_t *th);
-
-void
-rb_thread_mark(void *ptr)
-{
-    rb_thread_t *th = NULL;
-    RUBY_MARK_ENTER("thread");
-    if (ptr) {
-	th = ptr;
-	if (th->stack) {
-	    VALUE *p = th->stack;
-	    VALUE *sp = th->cfp->sp + th->mark_stack_len;
-	    rb_control_frame_t *cfp = th->cfp;
-	    rb_control_frame_t *limit_cfp =
-	      (void *)(th->stack + th->stack_size);
-
-	    while (p < sp) {
-		rb_gc_mark(*p++);
-	    }
-	    while (cfp != limit_cfp) {
-		rb_gc_mark(cfp->proc);
-		cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
-	    }
-	}
-
-	/* mark ruby objects */
-	RUBY_MARK_UNLESS_NULL(th->first_proc);
-	RUBY_MARK_UNLESS_NULL(th->first_args);
-
-	RUBY_MARK_UNLESS_NULL(th->thgroup);
-	RUBY_MARK_UNLESS_NULL(th->value);
-	RUBY_MARK_UNLESS_NULL(th->errinfo);
-	RUBY_MARK_UNLESS_NULL(th->thrown_errinfo);
-	RUBY_MARK_UNLESS_NULL(th->local_svar);
-	RUBY_MARK_UNLESS_NULL(th->top_self);
-	RUBY_MARK_UNLESS_NULL(th->top_wrapper);
-	RUBY_MARK_UNLESS_NULL(th->fiber);
-	RUBY_MARK_UNLESS_NULL(th->root_fiber);
-
-	rb_mark_tbl(th->local_storage);
-
-	if (GET_THREAD() != th && th->machine_stack_start && th->machine_stack_end) {
-	    yarv_machine_stack_mark(th);
-	    rb_gc_mark_locations((VALUE *)&th->machine_regs,
-				 (VALUE *)(&th->machine_regs) +
-				 sizeof(th->machine_regs) / sizeof(VALUE));
-	}
-
-	mark_event_hooks(th->event_hooks);
-    }
-
-    RUBY_MARK_UNLESS_NULL(th->stat_insn_usage);
-    RUBY_MARK_LEAVE("thread");
-}
-
-static VALUE
-thread_alloc(VALUE klass)
-{
-    VALUE volatile obj;
-    rb_thread_t *th;
-    obj = Data_Make_Struct(klass, rb_thread_t,
-			   rb_thread_mark, thread_free, th);
-    return obj;
-}
-
-static void
-th_init2(rb_thread_t *th)
-{
-    MEMZERO(th, rb_thread_t, 1);
-
-    /* allocate thread stack */
-    th->stack_size = RUBY_VM_THREAD_STACK_SIZE;
-    th->stack = ALLOC_N(VALUE, th->stack_size);
-
-    th->cfp = (void *)(th->stack + th->stack_size);
-    th->cfp--;
-
-    th->cfp->pc = 0;
-    th->cfp->sp = th->stack + 1;
-    th->cfp->bp = 0;
-    th->cfp->lfp = th->stack;
-    *th->cfp->lfp = 0;
-    th->cfp->dfp = th->stack;
-    th->cfp->self = Qnil;
-    th->cfp->flag = 0;
-    th->cfp->iseq = 0;
-    th->cfp->proc = 0;
-    th->cfp->block_iseq = 0;
-
-    th->status = THREAD_RUNNABLE;
-    th->errinfo = Qnil;
-
-#if USE_VALUE_CACHE
-    th->value_cache_ptr = &th->value_cache[0];
-#endif
-}
-
-static void
-th_init(rb_thread_t *th)
-{
-    th_init2(th);
-}
-
-extern VALUE ruby_top_self;
-
-static VALUE
-ruby_thread_init(VALUE self)
-{
-    rb_thread_t *th;
-    rb_vm_t *vm = GET_THREAD()->vm;
-    GetThreadPtr(self, th);
-
-    th_init(th);
-    th->self = self;
-    th->vm = vm;
-
-    th->top_wrapper = 0;
-    th->top_self = ruby_top_self;
-    return self;
-}
-
-VALUE
-rb_thread_alloc(VALUE klass)
-{
-    VALUE self = thread_alloc(klass);
-    ruby_thread_init(self);
-    return self;
-}
-
-/********************************************************************/
-
-VALUE insns_name_array(void);
-extern VALUE *rb_gc_stack_start;
-#ifdef __ia64
-extern VALUE *rb_gc_register_stack_start;
-#endif
-
-static VALUE
-sdr(void)
-{
-    yarv_bug();
-    return Qnil;
-}
-
-static VALUE
-nsdr(void)
-{
-    VALUE ary = rb_ary_new();
-#if HAVE_BACKTRACE
-#include <execinfo.h>
-#define MAX_NATIVE_TRACE 1024
-    static void *trace[MAX_NATIVE_TRACE];
-    int n = backtrace(trace, MAX_NATIVE_TRACE);
-    char **syms = backtrace_symbols(trace, n);
-    int i;
-
-    if (syms == 0) {
-	rb_memerror();
-    }
-
-    for (i=0; i<n; i++) {
-	rb_ary_push(ary, rb_str_new2(syms[i]));
-    }
-    free(syms);
-#endif
-    return ary;
-}
-
-static char *yarv_options = ""
-#if   OPT_DIRECT_THREADED_CODE
-    "[direct threaded code] "
-#elif OPT_TOKEN_THREADED_CODE
-    "[token threaded code] "
-#elif OPT_CALL_THREADED_CODE
-    "[call threaded code] "
-#endif
-
-#if OPT_BASIC_OPERATIONS
-    "[optimize basic operation] "
-#endif
-#if OPT_STACK_CACHING
-    "[stack caching] "
-#endif
-#if OPT_OPERANDS_UNIFICATION
-    "[operands unification] "
-#endif
-#if OPT_INSTRUCTIONS_UNIFICATION
-    "[instructions unification] "
-#endif
-#if OPT_INLINE_METHOD_CACHE
-    "[inline method cache] "
-#endif
-#if OPT_BLOCKINLINING
-    "[block inlining] "
-#endif
-    ;
-
-void yarv_init_redefined_flag(void);
-
-void
-Init_VM(void)
-{
-    /* ::VM */
-    rb_cVM = rb_define_class("VM", rb_cObject);
-    rb_undef_alloc_func(rb_cVM);
-
-    /* Env */
-    rb_cEnv = rb_define_class_under(rb_cVM, "Env", rb_cObject);
-    rb_undef_alloc_func(rb_cEnv);
-
-    /* ::Thread */
-    rb_cThread = rb_define_class("Thread", rb_cObject);
-    rb_undef_alloc_func(rb_cThread);
-    rb_define_method(rb_cThread, "initialize", ruby_thread_init, 0);
-
-    /* ::VM::USAGE_ANALISYS_* */
-    rb_define_const(rb_cVM, "USAGE_ANALISYS_INSN", rb_hash_new());
-    rb_define_const(rb_cVM, "USAGE_ANALISYS_REGS", rb_hash_new());
-    rb_define_const(rb_cVM, "USAGE_ANALISYS_INSN_BIGRAM", rb_hash_new());
-    rb_define_const(rb_cVM, "OPTS", rb_str_new2(yarv_options));
-
-    /* ::VM::InsnNameArray */
-    rb_define_const(rb_cVM, "InsnNameArray", insns_name_array());
-
-    /* ::VM::eval() */
-    rb_define_singleton_method(rb_cVM, "eval", yarvcore_eval, 3);
-
-    /* debug functions ::VM::SDR(), ::VM::NSDR() */
-    rb_define_singleton_method(rb_cVM, "SDR", sdr, 0);
-    rb_define_singleton_method(rb_cVM, "NSDR", nsdr, 0);
-
-    /* Symbols */
-    symIFUNC = ID2SYM(rb_intern("<IFUNC>"));
-    symCFUNC = ID2SYM(rb_intern("<CFUNC>"));
-
-    /* IDs */
-    idPLUS = rb_intern("+");
-    idMINUS = rb_intern("-");
-    idMULT = rb_intern("*");
-    idDIV = rb_intern("/");
-    idMOD = rb_intern("%");
-    idLT = rb_intern("<");
-    idLTLT = rb_intern("<<");
-    idLE = rb_intern("<=");
-    idGT = rb_intern(">");
-    idGE = rb_intern(">=");
-    idEq = rb_intern("==");
-    idEqq = rb_intern("===");
-    idBackquote = rb_intern("`");
-    idEqTilde = rb_intern("=~");
-
-    idAREF = rb_intern("[]");
-    idASET = rb_intern("[]=");
-
-    idEach = rb_intern("each");
-    idTimes = rb_intern("times");
-    idLength = rb_intern("length");
-    idLambda = rb_intern("lambda");
-    idIntern = rb_intern("intern");
-    idGets = rb_intern("gets");
-    idSucc = rb_intern("succ");
-    idEnd = rb_intern("end");
-    idRangeEachLT = rb_intern("Range#each#LT");
-    idRangeEachLE = rb_intern("Range#each#LE");
-    idArrayEach = rb_intern("Array#each");
-    idMethodMissing = rb_intern("method_missing");
-
-    idThrowState = rb_intern("#__ThrowState__");
-
-    idBitblt = rb_intern("bitblt");
-    idAnswer = rb_intern("the_answer_to_life_the_universe_and_everything");
-    idSvarPlaceholder = rb_intern("#svar");
-
-    idSend = rb_intern("send");
-    id__send__ = rb_intern("__send__");
-    id__send = rb_intern("__send");
-    idFuncall = rb_intern("funcall");
-    id__send_bang = rb_intern("__send!");
-
-    /* VM bootstrap: phase 2 */
-    {
-	rb_vm_t *vm = ruby_current_vm;
-	rb_thread_t *th = GET_THREAD();
-        volatile VALUE th_self;
-
-	/* create vm object */
-	vm->self = Data_Wrap_Struct(rb_cVM, vm_mark, vm_free, vm);
-
-	/* create main thread */
-	th_self = th->self = Data_Wrap_Struct(rb_cThread, rb_thread_mark,
-					      thread_free, th);
-
-	vm->main_thread = th;
-	vm->running_thread = th;
-	th->vm = vm;
-	th->top_wrapper = 0;
-	th->top_self = ruby_top_self;
-	rb_thread_set_current(th);
-
-	vm->living_threads = st_init_numtable();
-	st_insert(vm->living_threads, th_self, (st_data_t) th->thread_id);
-    }
-    yarv_init_redefined_flag();
-}
-
-void
-Init_yarv(void)
-{
-    /* VM bootstrap: phase 1 */
-    rb_vm_t *vm = ALLOC(rb_vm_t);
-    rb_thread_t *th = ALLOC(rb_thread_t);
-
-    vm_init2(vm);
-    ruby_current_vm = vm;
-
-    th_init2(th);
-    th->vm = vm;
-    th->machine_stack_start = rb_gc_stack_start;
-#ifdef __ia64
-    th->machine_register_stack_start = rb_gc_register_stack_start;
-#endif
-    rb_thread_set_current_raw(th);
-}
-