diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-24 10:06:23 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-24 10:06:23 +0000 |
| commit | 1757fc9927fe25b761fca9f2391d1982e7a781c3 (patch) | |
| tree | 481602fbaf7d4d215d8447ab246c939ea2218a18 /vm_macro.def | |
| parent | f2074245b4c4d712cb74716c680d876eda9b8789 (diff) | |
| download | ruby-1757fc9927fe25b761fca9f2391d1982e7a781c3.tar.gz | |
* vm.c, vm_macro.def : remove macro_eval_invoke_cfunc() and
add vm_call_cfunc().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_macro.def')
| -rw-r--r-- | vm_macro.def | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/vm_macro.def b/vm_macro.def index 0d635c55fe..cba36a51e6 100644 --- a/vm_macro.def +++ b/vm_macro.def @@ -2,32 +2,6 @@ /* do not use C++ style comment */ /* */ -MACRO macro_eval_invoke_cfunc(num, id, recv, klass, mn, blockptr) -{ - EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, id, klass); - { - rb_control_frame_t *cfp = - push_frame(th, 0, FRAME_MAGIC_CFUNC, - recv, (VALUE) blockptr, 0, GET_SP(), 0, 1); - - cfp->method_id = id; - cfp->method_klass = klass; - - reg_cfp->sp -= num + 1; - - val = call_cfunc(mn->nd_cfnc, recv, mn->nd_argc, num, reg_cfp->sp + 1); - - if (reg_cfp != th->cfp + 1) { - SDR2(reg_cfp); - SDR2(th->cfp-5); - rb_bug("cfp consistency error - send"); - th->cfp = reg_cfp; - } - pop_frame(th); - } - EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, id, klass); -} - MACRO macro_eval_invoke_func(niseqval, recv, klass, blockptr, num) { rb_iseq_t *niseq; @@ -136,7 +110,7 @@ MACRO macro_eval_invoke_method(recv, klass, id, num, mn, blockptr) NEXT_INSN(); } case NODE_CFUNC:{ - macro_eval_invoke_cfunc(num, id, recv, klass, node, blockptr); + val = vm_call_cfunc(th, GET_CFP(), num, id, recv, klass, node, blockptr); break; } case NODE_ATTRSET:{ |