diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-24 15:42:41 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-24 15:42:41 +0000 |
commit | 97ba019c9410ccb5ec76f6b54fd2e140b7583038 (patch) | |
tree | f3d3c428b2fa8b14e801896c25d5d78a4e4cd91d /insns.def | |
parent | a5c2d584284e2b137b1d4d06574470a971c9087e (diff) | |
download | ruby-97ba019c9410ccb5ec76f6b54fd2e140b7583038.tar.gz |
* vm.c: some refactoring.
* rename th_* to vm_*.
* remove unused variables functions.
* add prototypes.
* blockinlining.c, compile.c, cont.c, eval.c, eval_intern.h,
eval_jump.h, eval_load.c, inits.c, insns.def, iseq.c, parse.y,
proc.c, process.c, signal.c, thread.c, vm.c, vm_dump.c,
vm_evalbody.ci, yarvcore.c, yarvcore.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insns.def')
-rw-r--r-- | insns.def | 54 |
1 files changed, 27 insertions, 27 deletions
@@ -215,7 +215,7 @@ getclassvariable () (VALUE val) { - VALUE klass = eval_get_cvar_base(th, GET_ISEQ()); + VALUE klass = vm_get_cvar_base(th, GET_ISEQ()); val = rb_cvar_get(klass, id); } @@ -230,7 +230,7 @@ setclassvariable (VALUE val) () { - rb_cvar_set(eval_get_cvar_base(th, GET_ISEQ()), id, val); + rb_cvar_set(vm_get_cvar_base(th, GET_ISEQ()), id, val); } /** @@ -251,7 +251,7 @@ getconstant (VALUE klass) (VALUE val) { - val = eval_get_ev_const(th, GET_ISEQ(), klass, id, 0); + val = vm_get_ev_const(th, GET_ISEQ(), klass, id, 0); } /** @@ -275,7 +275,7 @@ setconstant () { if (klass == Qnil) { - klass = th_get_cbase(th); + klass = vm_get_cbase(th); } if (NIL_P(klass)) { rb_raise(rb_eTypeError, "no class/module to define constant"); @@ -448,7 +448,7 @@ toregexp (VALUE str) (VALUE val) { - volatile VALUE tmp = str; + volatile VALUE tmp = str; /* for GC */ val = rb_reg_new(RSTRING_PTR(str), RSTRING_LEN(str), flag); } @@ -842,8 +842,8 @@ definemethod (VALUE obj) () { - eval_define_method(th, obj, id, body, is_singleton, - get_cref(GET_ISEQ(), GET_LFP())); + vm_define_method(th, obj, id, body, is_singleton, + get_cref(GET_ISEQ(), GET_LFP())); } /** @@ -923,7 +923,7 @@ defined break; case DEFINED_CONST: klass = v; - if (eval_get_ev_const(th, GET_ISEQ(), klass, SYM2ID(obj), 1)) { + if (vm_get_ev_const(th, GET_ISEQ(), klass, SYM2ID(obj), 1)) { expr_type = "constant"; } break; @@ -1011,7 +1011,7 @@ postexe blockptr->iseq = blockiseq; blockptr->proc = 0; - proc = th_make_proc(th, GET_CFP(), blockptr); + proc = vm_make_proc(th, GET_CFP(), blockptr); rb_set_end_proc(call_yarv_end_proc, proc); } @@ -1059,7 +1059,7 @@ defineclass } if (cbase == Qnil) { - cbase = th_get_cbase(th); + cbase = vm_get_cbase(th); } /* find klass */ @@ -1097,7 +1097,7 @@ defineclass /* val is dummy. classdef returns class scope value */ /* super is dummy */ if (cbase == Qnil) { - cbase = th_get_cbase(th); + cbase = vm_get_cbase(th); } /* find klass */ @@ -1119,13 +1119,13 @@ defineclass rb_bug("unknown defineclass type: %d", define_type); } - COPY_CREF(klass_iseq->cref_stack, th_cref_push(th, klass, NOEX_PUBLIC)); + COPY_CREF(klass_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC)); /* enter scope */ - push_frame(th, klass_iseq, - FRAME_MAGIC_CLASS, klass, (VALUE) GET_DFP() | 0x02, - klass_iseq->iseq_encoded, GET_SP(), 0, - klass_iseq->local_size); + vm_push_frame(th, klass_iseq, + FRAME_MAGIC_CLASS, klass, (VALUE) GET_DFP() | 0x02, + klass_iseq->iseq_encoded, GET_SP(), 0, + klass_iseq->local_size); RESTORE_REGS(); INC_VM_STATE_VERSION(); @@ -1153,7 +1153,7 @@ send (VALUE val) // inc += - (op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0)); { NODE *mn; - VALUE recv, klass, v; + VALUE recv, klass; rb_block_t *blockptr = 0; rb_num_t num = caller_setup_args(th, GET_CFP(), op_flag, op_argc, blockiseq, &blockptr); rb_num_t flag = op_flag; @@ -1171,7 +1171,7 @@ send klass = CLASS_OF(recv); - mn = eval_method_search(id, klass, ic); + mn = vm_method_search(id, klass, ic); /* send/funcall optimization */ if ((flag & VM_CALL_SEND_BIT) && mn && nd_type(mn->nd_body) == NODE_CFUNC) { @@ -1287,7 +1287,7 @@ invokeblock int argc = num; if (GET_ISEQ()->local_iseq->type != ISEQ_TYPE_METHOD || block == 0) { - th_localjump_error("no block given (yield)", Qnil, 0); + vm_localjump_error("no block given (yield)", Qnil, 0); } iseq = block->iseq; @@ -1297,14 +1297,14 @@ invokeblock DEC_SP(argc); - argc = th_yield_setup_args(th, iseq, argc, GET_SP(), + argc = vm_yield_setup_args(th, iseq, argc, GET_SP(), block_proc_is_lambda(block->proc)); INC_SP(argc); - push_frame(th, iseq, - FRAME_MAGIC_BLOCK, block->self, (VALUE) block->dfp, - iseq->iseq_encoded, GET_SP(), block->lfp, - iseq->local_size - argc); + vm_push_frame(th, iseq, + FRAME_MAGIC_BLOCK, block->self, (VALUE) block->dfp, + iseq->iseq_encoded, GET_SP(), block->lfp, + iseq->local_size - argc); reg_cfp->sp -= argc; RESTORE_REGS(); @@ -1312,7 +1312,7 @@ invokeblock /* unreachable */ } else { - val = th_yield_with_cfunc(th, block, block->self, + val = vm_yield_with_cfunc(th, block, block->self, num, STACK_ADDR_FROM_TOP(num)); POPN(num); } @@ -1337,7 +1337,7 @@ leave } RUBY_VM_CHECK_INTS(); - pop_frame(th); + vm_pop_frame(th); RESTORE_REGS(); } @@ -1416,7 +1416,7 @@ throw cfp++; } if (is_orphan) { - th_localjump_error("unexpected return", throwobj, + vm_localjump_error("unexpected return", throwobj, TAG_RETURN); } |