kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* vm.c (invoke_block_from_c): split this function into several

Browse source 
functions.
* vm_insnhelper.c (vm_yield_callee_setup_arg): remove this function
  beacuse it is only delegation function.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2015-10-10 20:32:07 +00:00
parent d8736ecff2
commit cb223b7533
4 changed files with 92 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sun Oct 11 05:29:51 2015 Koichi Sasada <ko1@atdot.net>
* vm.c (invoke_block_from_c): split this function into several
functions.
* vm_insnhelper.c (vm_yield_callee_setup_arg): remove this function
beacuse it is only delegation function.
Sun Oct 11 03:48:46 2015 Koichi Sasada <ko1@atdot.net> Sun Oct 11 03:48:46 2015 Koichi Sasada <ko1@atdot.net>
* gc.c (newobj_of_slowpass): fix typo (pass -> path). * gc.c (newobj_of_slowpass): fix typo (pass -> path).

129
vm.c
View file

@ -803,98 +803,127 @@ rb_binding_add_dynavars(rb_binding_t *bind, int dyncount, const ID *dynvars)
/* C -> Ruby: block */ /* C -> Ruby: block */
static inline VALUE static inline VALUE
invoke_block_from_c(rb_thread_t *th, const rb_block_t *block, invoke_block(rb_thread_t *th, const rb_iseq_t *iseq, VALUE self, const rb_block_t *block, const rb_cref_t *cref, int type, int opt_pc)
VALUE self, int argc, const VALUE *argv,
const rb_block_t *blockptr, const rb_cref_t *cref,
int splattable)
{ {
if (SPECIAL_CONST_P(block->iseq)) { int arg_size = iseq->body->param.size;
return Qnil;
}
else if (!RUBY_VM_IFUNC_P(block->iseq)) {
VALUE ret;
const rb_iseq_t *iseq = block->iseq;
const rb_control_frame_t *cfp;
int i, opt_pc, arg_size = iseq->body->param.size;
int type = block_proc_is_lambda(block->proc) ? VM_FRAME_MAGIC_LAMBDA : VM_FRAME_MAGIC_BLOCK;
const rb_callable_method_entry_t *me = th->passed_bmethod_me;
th->passed_bmethod_me = NULL;
cfp = th->cfp;
for (i=0; i<argc; i++) {
cfp->sp[i] = argv[i];
}
opt_pc = vm_yield_setup_args(th, iseq, argc, cfp->sp, blockptr,
(type == VM_FRAME_MAGIC_LAMBDA ? (splattable ? arg_setup_lambda : arg_setup_method) : arg_setup_block));
if (me != 0) {
/* bmethod */
vm_push_frame(th, iseq, type | VM_FRAME_FLAG_FINISH | VM_FRAME_FLAG_BMETHOD, self,
VM_ENVVAL_PREV_EP_PTR(block->ep),
(VALUE)me, /* cref or method (TODO: can we ignore cref?) */
iseq->body->iseq_encoded + opt_pc,
cfp->sp + arg_size, iseq->body->local_size - arg_size,
iseq->body->stack_max);
RUBY_DTRACE_METHOD_ENTRY_HOOK(th, me->owner, me->called_id);
EXEC_EVENT_HOOK(th, RUBY_EVENT_CALL, self, me->called_id, me->owner, Qnil);
}
else {
vm_push_frame(th, iseq, type | VM_FRAME_FLAG_FINISH, self, vm_push_frame(th, iseq, type | VM_FRAME_FLAG_FINISH, self,
VM_ENVVAL_PREV_EP_PTR(block->ep), VM_ENVVAL_PREV_EP_PTR(block->ep),
(VALUE)cref, /* cref or method */ (VALUE)cref, /* cref or method */
iseq->body->iseq_encoded + opt_pc, iseq->body->iseq_encoded + opt_pc,
cfp->sp + arg_size, iseq->body->local_size - arg_size, th->cfp->sp + arg_size, iseq->body->local_size - arg_size,
iseq->body->stack_max); iseq->body->stack_max);
return vm_exec(th);
} }
ret = vm_exec(th); static VALUE
invoke_bmethod(rb_thread_t *th, const rb_iseq_t *iseq, VALUE self, const rb_block_t *block, int type, int opt_pc)
if (me) { {
/* bmethod */ /* bmethod */
int arg_size = iseq->body->param.size;
const rb_callable_method_entry_t *me = th->passed_bmethod_me;
VALUE ret;
th->passed_bmethod_me = NULL;
vm_push_frame(th, iseq, type | VM_FRAME_FLAG_FINISH | VM_FRAME_FLAG_BMETHOD, self,
VM_ENVVAL_PREV_EP_PTR(block->ep),
(VALUE)me, /* cref or method (TODO: can we ignore cref?) */
iseq->body->iseq_encoded + opt_pc,
th->cfp->sp + arg_size, iseq->body->local_size - arg_size,
iseq->body->stack_max);
RUBY_DTRACE_METHOD_ENTRY_HOOK(th, me->owner, me->called_id);
EXEC_EVENT_HOOK(th, RUBY_EVENT_CALL, self, me->called_id, me->owner, Qnil);
ret = vm_exec(th);
EXEC_EVENT_HOOK(th, RUBY_EVENT_RETURN, self, me->called_id, me->owner, ret); EXEC_EVENT_HOOK(th, RUBY_EVENT_RETURN, self, me->called_id, me->owner, ret);
RUBY_DTRACE_METHOD_RETURN_HOOK(th, me->owner, me->called_id); RUBY_DTRACE_METHOD_RETURN_HOOK(th, me->owner, me->called_id);
return ret;
}
static inline VALUE
invoke_block_from_c_0(rb_thread_t *th, const rb_block_t *block,
VALUE self, int argc, const VALUE *argv, const rb_block_t *blockptr,
const rb_cref_t *cref, const int splattable)
{
if (UNLIKELY(SPECIAL_CONST_P(block->iseq))) {
return Qnil;
}
else if (LIKELY(RUBY_VM_NORMAL_ISEQ_P(block->iseq))) {
const rb_iseq_t *iseq = block->iseq;
int i, opt_pc;
int type = block_proc_is_lambda(block->proc) ? VM_FRAME_MAGIC_LAMBDA : VM_FRAME_MAGIC_BLOCK;
VALUE *sp = th->cfp->sp;
for (i=0; i<argc; i++) {
sp[i] = argv[i];
}
opt_pc = vm_yield_setup_args(th, iseq, argc, sp, blockptr,
(type == VM_FRAME_MAGIC_LAMBDA ? (splattable ? arg_setup_lambda : arg_setup_method) : arg_setup_block));
if (th->passed_bmethod_me == NULL) {
return invoke_block(th, iseq, self, block, cref, type, opt_pc);
}
else {
return invoke_bmethod(th, iseq, self, block, type, opt_pc);
} }
return ret;
} }
else { else {
return vm_yield_with_cfunc(th, block, self, argc, argv, blockptr); return vm_yield_with_cfunc(th, block, self, argc, argv, blockptr);
} }
} }
static VALUE
invoke_block_from_c_splattable(rb_thread_t *th, const rb_block_t *block,
VALUE self, int argc, const VALUE *argv,
const rb_block_t *blockptr, const rb_cref_t *cref)
{
return invoke_block_from_c_0(th, block, self, argc, argv, blockptr, cref, TRUE);
}
static VALUE
invoke_block_from_c_unsplattable(rb_thread_t *th, const rb_block_t *block,
VALUE self, int argc, const VALUE *argv,
const rb_block_t *blockptr, const rb_cref_t *cref)
{
return invoke_block_from_c_0(th, block, self, argc, argv, blockptr, cref, FALSE);
}
static inline const rb_block_t * static inline const rb_block_t *
check_block(rb_thread_t *th) check_block(rb_thread_t *th)
{ {
const rb_block_t *blockptr = VM_CF_BLOCK_PTR(th->cfp); const rb_block_t *blockptr = VM_CF_BLOCK_PTR(th->cfp);
if (blockptr == 0) { if (UNLIKELY(blockptr == 0)) {
rb_vm_localjump_error("no block given", Qnil, 0); rb_vm_localjump_error("no block given", Qnil, 0);
} }
return blockptr; return blockptr;
} }
static inline VALUE static VALUE
vm_yield_with_cref(rb_thread_t *th, int argc, const VALUE *argv, const rb_cref_t *cref) vm_yield_with_cref(rb_thread_t *th, int argc, const VALUE *argv, const rb_cref_t *cref)
{ {
const rb_block_t *blockptr = check_block(th); const rb_block_t *blockptr = check_block(th);
return invoke_block_from_c(th, blockptr, blockptr->self, argc, argv, 0, cref, 1); return invoke_block_from_c_splattable(th, blockptr, blockptr->self, argc, argv, NULL, cref);
} }
static inline VALUE static VALUE
vm_yield(rb_thread_t *th, int argc, const VALUE *argv) vm_yield(rb_thread_t *th, int argc, const VALUE *argv)
{ {
const rb_block_t *blockptr = check_block(th); const rb_block_t *blockptr = check_block(th);
return invoke_block_from_c(th, blockptr, blockptr->self, argc, argv, 0, 0, 1); return invoke_block_from_c_splattable(th, blockptr, blockptr->self, argc, argv, NULL, NULL);
} }
static inline VALUE static VALUE
vm_yield_with_block(rb_thread_t *th, int argc, const VALUE *argv, const rb_block_t *blockargptr) vm_yield_with_block(rb_thread_t *th, int argc, const VALUE *argv, const rb_block_t *blockargptr)
{ {
const rb_block_t *blockptr = check_block(th); const rb_block_t *blockptr = check_block(th);
return invoke_block_from_c(th, blockptr, blockptr->self, argc, argv, blockargptr, 0, 1); return invoke_block_from_c_splattable(th, blockptr, blockptr->self, argc, argv, blockargptr, NULL);
} }
static VALUE static VALUE
@ -908,7 +937,7 @@ vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self,
TH_PUSH_TAG(th); TH_PUSH_TAG(th);
if ((state = EXEC_TAG()) == 0) { if ((state = EXEC_TAG()) == 0) {
th->safe_level = proc->safe_level; th->safe_level = proc->safe_level;
val = invoke_block_from_c(th, &proc->block, self, argc, argv, blockptr, 0, 0); val = invoke_block_from_c_unsplattable(th, &proc->block, self, argc, argv, blockptr, NULL);
} }
TH_POP_TAG(); TH_POP_TAG();
@ -924,7 +953,7 @@ static VALUE
vm_invoke_bmethod(rb_thread_t *th, rb_proc_t *proc, VALUE self, vm_invoke_bmethod(rb_thread_t *th, rb_proc_t *proc, VALUE self,
int argc, const VALUE *argv, const rb_block_t *blockptr) int argc, const VALUE *argv, const rb_block_t *blockptr)
{ {
return invoke_block_from_c(th, &proc->block, self, argc, argv, blockptr, 0, 0); return invoke_block_from_c_unsplattable(th, &proc->block, self, argc, argv, blockptr, NULL);
} }
VALUE VALUE

2
vm_eval.c
View file

@ -1054,7 +1054,7 @@ rb_yield_splat(VALUE values)
VALUE VALUE
rb_yield_block(VALUE val, VALUE arg, int argc, const VALUE *argv, VALUE blockarg) rb_yield_block(VALUE val, VALUE arg, int argc, const VALUE *argv, VALUE blockarg)
{ {
const rb_block_t *blockptr = 0; const rb_block_t *blockptr = NULL;
if (!NIL_P(blockarg)) { if (!NIL_P(blockarg)) {
rb_proc_t *blockproc; rb_proc_t *blockproc;
GetProcPtr(blockarg, blockproc); GetProcPtr(blockarg, blockproc);

17
vm_insnhelper.c
View file

@ -2275,7 +2275,7 @@ block_proc_is_lambda(const VALUE procval)
} }
} }
static inline VALUE static VALUE
vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, VALUE self, vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, VALUE self,
int argc, const VALUE *argv, int argc, const VALUE *argv,
const rb_block_t *blockargptr) const rb_block_t *blockargptr)
@ -2317,14 +2317,6 @@ vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, VALUE self,
return val; return val;
} }
static int
vm_yield_callee_setup_arg(rb_thread_t *th, struct rb_calling_info *calling,
const struct rb_call_info *ci, const rb_iseq_t *iseq,
VALUE *argv, enum arg_setup_type arg_setup_type)
{
return vm_callee_setup_block_arg(th, calling, ci, iseq, argv, arg_setup_type);
}
static int static int
vm_yield_setup_args(rb_thread_t *th, const rb_iseq_t *iseq, const int argc, VALUE *argv, const rb_block_t *blockptr, enum arg_setup_type arg_setup_type) vm_yield_setup_args(rb_thread_t *th, const rb_iseq_t *iseq, const int argc, VALUE *argv, const rb_block_t *blockptr, enum arg_setup_type arg_setup_type)
{ {
@ -2338,10 +2330,11 @@ vm_yield_setup_args(rb_thread_t *th, const rb_iseq_t *iseq, const int argc, VALU
ci_entry.flag = 0; ci_entry.flag = 0;
ci = &ci_entry; ci = &ci_entry;
return vm_yield_callee_setup_arg(th, calling, ci, iseq, argv, arg_setup_type); return vm_callee_setup_block_arg(th, calling, ci, iseq, argv, arg_setup_type);
} }
/* ruby iseq -> ruby block iseq */ /* ruby iseq -> ruby block iseq */
static VALUE static VALUE
vm_invoke_block(rb_thread_t *th, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, const struct rb_call_info *ci) vm_invoke_block(rb_thread_t *th, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, const struct rb_call_info *ci)
{ {
@ -2354,11 +2347,11 @@ vm_invoke_block(rb_thread_t *th, rb_control_frame_t *reg_cfp, struct rb_calling_
} }
iseq = block->iseq; iseq = block->iseq;
if (!RUBY_VM_IFUNC_P(iseq)) { if (RUBY_VM_NORMAL_ISEQ_P(iseq)) {
const int arg_size = iseq->body->param.size; const int arg_size = iseq->body->param.size;
int is_lambda = block_proc_is_lambda(block->proc); int is_lambda = block_proc_is_lambda(block->proc);
VALUE * const rsp = GET_SP() - calling->argc; VALUE * const rsp = GET_SP() - calling->argc;
int opt_pc = vm_yield_callee_setup_arg(th, calling, ci, iseq, rsp, is_lambda ? arg_setup_lambda : arg_setup_block); int opt_pc = vm_callee_setup_block_arg(th, calling, ci, iseq, rsp, is_lambda ? arg_setup_lambda : arg_setup_block);
SET_SP(rsp); SET_SP(rsp);