1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm_eval.c (vm_call0_body): remove RUBY_VM_CHECK_INTS()

Browse Source 
after method invocation using rb_call0().
* vm_eval.c (vm_call0_body): remove default section on top of
  switch statement and add cases for `VM_METHOD_TYPE_CFUNC_FRAMELESS'
  and `VM_METHOD_TYPE_UNDEF'.
* vm_eval.c (vm_call0_body): remove useless brackets.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2012-10-23 20:34:25 +00:00
parent fe38109ffe
commit a0873931ce
2 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Wed Oct 24 05:17:52 2012 Koichi Sasada <ko1@atdot.net>
* vm_eval.c (vm_call0_body): remove RUBY_VM_CHECK_INTS()
after method invocation using rb_call0().
* vm_eval.c (vm_call0_body): remove default section on top of
switch statement and add cases for `VM_METHOD_TYPE_CFUNC_FRAMELESS'
and `VM_METHOD_TYPE_UNDEF'.
* vm_eval.c (vm_call0_body): remove useless brackets.
Tue Oct 23 22:34:49 2012 Koichi Sasada <ko1@atdot.net> Tue Oct 23 22:34:49 2012 Koichi Sasada <ko1@atdot.net>
* thread.c (thread_raise_m): check interrupts after Thread#raise * thread.c (thread_raise_m): check interrupts after Thread#raise

99
vm_eval.c
View File

@ -131,8 +131,6 @@ vm_call0_cfunc(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv)
static VALUE static VALUE
vm_call0_body(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv) vm_call0_body(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv)
{ {
VALUE val;
if (!ci->me->def) return Qnil; if (!ci->me->def) return Qnil;
if (th->passed_block) { if (th->passed_block) {
@ -145,40 +143,33 @@ vm_call0_body(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv)
again: again:
switch (ci->me->def->type) { switch (ci->me->def->type) {
case VM_METHOD_TYPE_ISEQ: { case VM_METHOD_TYPE_ISEQ:
rb_control_frame_t *reg_cfp = th->cfp; {
int i; rb_control_frame_t *reg_cfp = th->cfp;
int i;
CHECK_STACK_OVERFLOW(reg_cfp, ci->argc + 1); CHECK_STACK_OVERFLOW(reg_cfp, ci->argc + 1);
*reg_cfp->sp++ = ci->recv; *reg_cfp->sp++ = ci->recv;
for (i = 0; i < ci->argc; i++) { for (i = 0; i < ci->argc; i++) {
*reg_cfp->sp++ = argv[i]; *reg_cfp->sp++ = argv[i];
}
vm_call_iseq_setup(th, reg_cfp, ci);
th->cfp->flag |= VM_FRAME_FLAG_FINISH;
return vm_exec(th);
} }
vm_call_iseq_setup(th, reg_cfp, ci);
th->cfp->flag |= VM_FRAME_FLAG_FINISH;
val = vm_exec(th);
break;
}
case VM_METHOD_TYPE_NOTIMPLEMENTED: case VM_METHOD_TYPE_NOTIMPLEMENTED:
case VM_METHOD_TYPE_CFUNC: case VM_METHOD_TYPE_CFUNC:
val = vm_call0_cfunc(th, ci, argv); return vm_call0_cfunc(th, ci, argv);
break; case VM_METHOD_TYPE_ATTRSET:
case VM_METHOD_TYPE_ATTRSET: {
rb_check_arity(ci->argc, 1, 1); rb_check_arity(ci->argc, 1, 1);
val = rb_ivar_set(ci->recv, ci->me->def->body.attr.id, argv[0]); return rb_ivar_set(ci->recv, ci->me->def->body.attr.id, argv[0]);
break; case VM_METHOD_TYPE_IVAR:
}
case VM_METHOD_TYPE_IVAR: {
rb_check_arity(ci->argc, 0, 0); rb_check_arity(ci->argc, 0, 0);
val = rb_attr_get(ci->recv, ci->me->def->body.attr.id); return rb_attr_get(ci->recv, ci->me->def->body.attr.id);
break; case VM_METHOD_TYPE_BMETHOD:
} return vm_call_bmethod_body(th, ci, argv);
case VM_METHOD_TYPE_BMETHOD: {
val = vm_call_bmethod_body(th, ci, argv);
break;
}
case VM_METHOD_TYPE_ZSUPER: case VM_METHOD_TYPE_ZSUPER:
{ {
ci->defined_class = RCLASS_SUPER(ci->defined_class); ci->defined_class = RCLASS_SUPER(ci->defined_class);
@ -190,38 +181,40 @@ vm_call0_body(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv)
if (!ci->me->def) return Qnil; if (!ci->me->def) return Qnil;
goto again; goto again;
} }
case VM_METHOD_TYPE_MISSING: { case VM_METHOD_TYPE_MISSING:
VALUE new_args = rb_ary_new4(ci->argc, argv); {
VALUE new_args = rb_ary_new4(ci->argc, argv);
RB_GC_GUARD(new_args); RB_GC_GUARD(new_args);
rb_ary_unshift(new_args, ID2SYM(ci->mid)); rb_ary_unshift(new_args, ID2SYM(ci->mid));
th->passed_block = ci->blockptr; th->passed_block = ci->blockptr;
return rb_funcall2(ci->recv, idMethodMissing, ci->argc+1, RARRAY_PTR(new_args)); return rb_funcall2(ci->recv, idMethodMissing, ci->argc+1, RARRAY_PTR(new_args));
} }
case VM_METHOD_TYPE_OPTIMIZED: { case VM_METHOD_TYPE_OPTIMIZED:
switch (ci->me->def->body.optimize_type) { switch (ci->me->def->body.optimize_type) {
case OPTIMIZED_METHOD_TYPE_SEND: case OPTIMIZED_METHOD_TYPE_SEND:
val = send_internal(ci->argc, argv, ci->recv, CALL_FCALL); return send_internal(ci->argc, argv, ci->recv, CALL_FCALL);
break; case OPTIMIZED_METHOD_TYPE_CALL:
case OPTIMIZED_METHOD_TYPE_CALL: { {
rb_proc_t *proc; rb_proc_t *proc;
GetProcPtr(ci->recv, proc); GetProcPtr(ci->recv, proc);
val = rb_vm_invoke_proc(th, proc, ci->argc, argv, ci->blockptr); return rb_vm_invoke_proc(th, proc, ci->argc, argv, ci->blockptr);
break; }
}
default: default:
rb_bug("vm_call0: unsupported optimized method type (%d)", ci->me->def->body.optimize_type); rb_bug("vm_call0: unsupported optimized method type (%d)", ci->me->def->body.optimize_type);
val = Qundef;
break;
} }
break; break;
} case VM_METHOD_TYPE_CFUNC_FRAMELESS:
default: {
rb_bug("vm_call0: unsupported method type (%d)", ci->me->def->type); /* TODO: can optimize it */
val = Qundef; const rb_method_cfunc_t *cfunc = &ci->me->def->body.cfunc;
return cfunc->invoker(cfunc->func, ci, argv);
}
case VM_METHOD_TYPE_UNDEF:
break;
} }
RUBY_VM_CHECK_INTS(th); rb_bug("vm_call0: unsupported method type (%d)", ci->me->def->type);
return val; return Qundef;
} }
VALUE VALUE