diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-27 08:21:21 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-27 08:21:21 +0000 |
commit | c44e2cdd58efbe13ed3b57cd56f98fc81ea64c2e (patch) | |
tree | abdc14d507681448910f39bd422f65296ed9b8ce /vm.c | |
parent | 35ecb83d413f5d7143dd269b2d591cb742526a90 (diff) | |
download | ruby-c44e2cdd58efbe13ed3b57cd56f98fc81ea64c2e.tar.gz |
* vm_evalbody.ci: support OPT_CALL_THREADED_CODE.
* insns.def, vm.c, vm.h: ditto.
* vm.h: add VM_CFP_CNT() and VM_SP_CNT().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -409,7 +409,6 @@ vm_call0(rb_thread_t *th, VALUE klass, VALUE recv, if (0) printf("id: %s, nd: %s, argc: %d, passed: %p\n", rb_id2name(id), ruby_node_name(nd_type(body)), argc, th->passed_block); - //SDR2(th->cfp); if (th->passed_block) { blockptr = th->passed_block; @@ -418,18 +417,20 @@ vm_call0(rb_thread_t *th, VALUE klass, VALUE recv, switch (nd_type(body)) { case RUBY_VM_METHOD_NODE:{ rb_control_frame_t *reg_cfp; + VALUE iseqval = (VALUE)body->nd_body; int i; rb_vm_set_finish_env(th); reg_cfp = th->cfp; - CHECK_STACK_OVERFLOW(reg_cfp, argc); + CHECK_STACK_OVERFLOW(reg_cfp, argc + 1); + *reg_cfp->sp++ = recv; for (i = 0; i < argc; i++) { *reg_cfp->sp++ = argv[i]; } - vm_setup_method(th, reg_cfp, argc, blockptr, 0, (VALUE)body->nd_body, recv, klass); + vm_setup_method(th, reg_cfp, argc, blockptr, 0, iseqval, recv, klass); val = vm_eval_body(th); break; } |