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

th -> ec for vm_exec().

Browse Source 
* vm.c (vm_exec): accepts `ec` instead of `th`.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-10-28 10:35:55 +00:00
parent 662fb599b0
commit 796e1990be
2 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
vm.c
View File

@ -981,7 +981,7 @@ invoke_block(rb_execution_context_t *ec, const rb_iseq_t *iseq, VALUE self, cons
ec->cfp->sp + arg_size, ec->cfp->sp + arg_size,
iseq->body->local_table_size - arg_size, iseq->body->local_table_size - arg_size,
iseq->body->stack_max); iseq->body->stack_max);
return vm_exec(rb_ec_thread_ptr(ec)); return vm_exec(ec);
} }
static VALUE static VALUE
@ -1002,7 +1002,7 @@ invoke_bmethod(rb_execution_context_t *ec, const rb_iseq_t *iseq, VALUE self, co
RUBY_DTRACE_METHOD_ENTRY_HOOK(rb_ec_thread_ptr(ec), me->owner, me->def->original_id); RUBY_DTRACE_METHOD_ENTRY_HOOK(rb_ec_thread_ptr(ec), me->owner, me->def->original_id);
EXEC_EVENT_HOOK(rb_ec_thread_ptr(ec), RUBY_EVENT_CALL, self, me->def->original_id, me->called_id, me->owner, Qnil); EXEC_EVENT_HOOK(rb_ec_thread_ptr(ec), RUBY_EVENT_CALL, self, me->def->original_id, me->called_id, me->owner, Qnil);
VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH); VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH);
ret = vm_exec(rb_ec_thread_ptr(ec)); ret = vm_exec(ec);
EXEC_EVENT_HOOK(rb_ec_thread_ptr(ec), RUBY_EVENT_RETURN, self, me->def->original_id, me->called_id, me->owner, ret); EXEC_EVENT_HOOK(rb_ec_thread_ptr(ec), RUBY_EVENT_RETURN, self, me->def->original_id, me->called_id, me->owner, ret);
RUBY_DTRACE_METHOD_RETURN_HOOK(rb_ec_thread_ptr(ec), me->owner, me->def->original_id); RUBY_DTRACE_METHOD_RETURN_HOOK(rb_ec_thread_ptr(ec), me->owner, me->def->original_id);
return ret; return ret;
@ -1783,20 +1783,20 @@ hook_before_rewind(rb_thread_t *th, const rb_control_frame_t *cfp, int will_fini
*/ */
static VALUE static VALUE
vm_exec(rb_thread_t *th) vm_exec(rb_execution_context_t *ec)
{ {
enum ruby_tag_type state; enum ruby_tag_type state;
VALUE result; VALUE result;
VALUE initial = 0; VALUE initial = 0;
struct vm_throw_data *err; struct vm_throw_data *err;
EC_PUSH_TAG(th->ec); EC_PUSH_TAG(ec);
_tag.retval = Qnil; _tag.retval = Qnil;
if ((state = EXEC_TAG()) == TAG_NONE) { if ((state = EXEC_TAG()) == TAG_NONE) {
vm_loop_start: vm_loop_start:
result = vm_exec_core(th->ec, initial); result = vm_exec_core(ec, initial);
VM_ASSERT(th->ec->tag == &_tag); VM_ASSERT(ec->tag == &_tag);
if ((state = _tag.state) != TAG_NONE) { if ((state = _tag.state) != TAG_NONE) {
err = (struct vm_throw_data *)result; err = (struct vm_throw_data *)result;
_tag.state = TAG_NONE; _tag.state = TAG_NONE;
@ -1813,27 +1813,27 @@ vm_exec(rb_thread_t *th)
VALUE type; VALUE type;
const rb_control_frame_t *escape_cfp; const rb_control_frame_t *escape_cfp;
err = (struct vm_throw_data *)th->ec->errinfo; err = (struct vm_throw_data *)ec->errinfo;
rb_thread_raised_reset(th, RAISED_STACKOVERFLOW); rb_thread_raised_reset(rb_ec_thread_ptr(ec), RAISED_STACKOVERFLOW);
exception_handler: exception_handler:
cont_pc = cont_sp = 0; cont_pc = cont_sp = 0;
catch_iseq = NULL; catch_iseq = NULL;
while (th->ec->cfp->pc == 0 || th->ec->cfp->iseq == 0) { while (ec->cfp->pc == 0 || ec->cfp->iseq == 0) {
if (UNLIKELY(VM_FRAME_TYPE(th->ec->cfp) == VM_FRAME_MAGIC_CFUNC)) { if (UNLIKELY(VM_FRAME_TYPE(ec->cfp) == VM_FRAME_MAGIC_CFUNC)) {
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, th->ec->cfp->self, EXEC_EVENT_HOOK(rb_ec_thread_ptr(ec), RUBY_EVENT_C_RETURN, ec->cfp->self,
rb_vm_frame_method_entry(th->ec->cfp)->def->original_id, rb_vm_frame_method_entry(ec->cfp)->def->original_id,
rb_vm_frame_method_entry(th->ec->cfp)->called_id, rb_vm_frame_method_entry(ec->cfp)->called_id,
rb_vm_frame_method_entry(th->ec->cfp)->owner, Qnil); rb_vm_frame_method_entry(ec->cfp)->owner, Qnil);
RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, RUBY_DTRACE_CMETHOD_RETURN_HOOK(rb_ec_thread_ptr(ec),
rb_vm_frame_method_entry(th->ec->cfp)->owner, rb_vm_frame_method_entry(ec->cfp)->owner,
rb_vm_frame_method_entry(th->ec->cfp)->def->original_id); rb_vm_frame_method_entry(ec->cfp)->def->original_id);
} }
rb_vm_pop_frame(th->ec); rb_vm_pop_frame(ec);
} }
cfp = th->ec->cfp; cfp = ec->cfp;
epc = cfp->pc - cfp->iseq->body->iseq_encoded; epc = cfp->pc - cfp->iseq->body->iseq_encoded;
escape_cfp = NULL; escape_cfp = NULL;
@ -1860,11 +1860,11 @@ vm_exec(rb_thread_t *th)
} }
} }
if (catch_iseq == NULL) { if (catch_iseq == NULL) {
th->ec->errinfo = Qnil; ec->errinfo = Qnil;
result = THROW_DATA_VAL(err); result = THROW_DATA_VAL(err);
THROW_DATA_CATCH_FRAME_SET(err, cfp + 1); THROW_DATA_CATCH_FRAME_SET(err, cfp + 1);
hook_before_rewind(th, th->ec->cfp, TRUE, state, err); hook_before_rewind(rb_ec_thread_ptr(ec), ec->cfp, TRUE, state, err);
rb_vm_pop_frame(th->ec); rb_vm_pop_frame(ec);
goto finish_vme; goto finish_vme;
} }
} }
@ -1875,9 +1875,9 @@ vm_exec(rb_thread_t *th)
#if OPT_STACK_CACHING #if OPT_STACK_CACHING
initial = THROW_DATA_VAL(err); initial = THROW_DATA_VAL(err);
#else #else
*th->ec->cfp->sp++ = THROW_DATA_VAL(err); *ec->cfp->sp++ = THROW_DATA_VAL(err);
#endif #endif
th->ec->errinfo = Qnil; ec->errinfo = Qnil;
goto vm_loop_start; goto vm_loop_start;
} }
} }
@ -1916,7 +1916,7 @@ vm_exec(rb_thread_t *th)
escape_cfp = THROW_DATA_CATCH_FRAME(err); escape_cfp = THROW_DATA_CATCH_FRAME(err);
if (cfp == escape_cfp) { if (cfp == escape_cfp) {
cfp->pc = cfp->iseq->body->iseq_encoded + entry->cont; cfp->pc = cfp->iseq->body->iseq_encoded + entry->cont;
th->ec->errinfo = Qnil; ec->errinfo = Qnil;
goto vm_loop_start; goto vm_loop_start;
} }
} }
@ -1946,11 +1946,11 @@ vm_exec(rb_thread_t *th)
#if OPT_STACK_CACHING #if OPT_STACK_CACHING
initial = THROW_DATA_VAL(err); initial = THROW_DATA_VAL(err);
#else #else
*th->ec->cfp->sp++ = THROW_DATA_VAL(err); *ec->cfp->sp++ = THROW_DATA_VAL(err);
#endif #endif
} }
th->ec->errinfo = Qnil; ec->errinfo = Qnil;
VM_ASSERT(th->ec->tag->state == TAG_NONE); VM_ASSERT(ec->tag->state == TAG_NONE);
goto vm_loop_start; goto vm_loop_start;
} }
} }
@ -1990,7 +1990,7 @@ vm_exec(rb_thread_t *th)
/* push block frame */ /* push block frame */
cfp->sp[0] = (VALUE)err; cfp->sp[0] = (VALUE)err;
vm_push_frame(th->ec, catch_iseq, VM_FRAME_MAGIC_RESCUE, vm_push_frame(ec, catch_iseq, VM_FRAME_MAGIC_RESCUE,
cfp->self, cfp->self,
VM_GUARDED_PREV_EP(cfp->ep), VM_GUARDED_PREV_EP(cfp->ep),
0, /* cref or me */ 0, /* cref or me */
@ -2000,21 +2000,21 @@ vm_exec(rb_thread_t *th)
catch_iseq->body->stack_max); catch_iseq->body->stack_max);
state = 0; state = 0;
th->ec->tag->state = TAG_NONE; ec->tag->state = TAG_NONE;
th->ec->errinfo = Qnil; ec->errinfo = Qnil;
goto vm_loop_start; goto vm_loop_start;
} }
else { else {
hook_before_rewind(th, th->ec->cfp, FALSE, state, err); hook_before_rewind(rb_ec_thread_ptr(ec), ec->cfp, FALSE, state, err);
if (VM_FRAME_FINISHED_P(th->ec->cfp)) { if (VM_FRAME_FINISHED_P(ec->cfp)) {
rb_vm_pop_frame(th->ec); rb_vm_pop_frame(ec);
th->ec->errinfo = (VALUE)err; ec->errinfo = (VALUE)err;
EC_TMPPOP_TAG(); EC_TMPPOP_TAG();
EC_JUMP_TAG(th->ec, state); EC_JUMP_TAG(ec, state);
} }
else { else {
rb_vm_pop_frame(th->ec); rb_vm_pop_frame(ec);
goto exception_handler; goto exception_handler;
} }
} }
@ -2029,21 +2029,21 @@ vm_exec(rb_thread_t *th)
VALUE VALUE
rb_iseq_eval(const rb_iseq_t *iseq) rb_iseq_eval(const rb_iseq_t *iseq)
{ {
rb_thread_t *th = GET_THREAD(); rb_execution_context_t *ec = GET_EC();
VALUE val; VALUE val;
vm_set_top_stack(th->ec, iseq); vm_set_top_stack(ec, iseq);
val = vm_exec(th); val = vm_exec(ec);
return val; return val;
} }
VALUE VALUE
rb_iseq_eval_main(const rb_iseq_t *iseq) rb_iseq_eval_main(const rb_iseq_t *iseq)
{ {
rb_thread_t *th = GET_THREAD(); rb_execution_context_t *ec = GET_EC();
VALUE val; VALUE val;
vm_set_main_stack(th->ec, iseq); vm_set_main_stack(ec, iseq);
val = vm_exec(th); val = vm_exec(ec);
return val; return val;
} }

8
vm_eval.c
View File

@ -20,7 +20,7 @@ static inline VALUE vm_yield_with_cref(rb_execution_context_t *ec, int argc, con
static inline VALUE vm_yield(rb_execution_context_t *ec, int argc, const VALUE *argv); static inline VALUE vm_yield(rb_execution_context_t *ec, int argc, const VALUE *argv);
static inline VALUE vm_yield_with_block(rb_execution_context_t *ec, int argc, const VALUE *argv, VALUE block_handler); static inline VALUE vm_yield_with_block(rb_execution_context_t *ec, int argc, const VALUE *argv, VALUE block_handler);
static inline VALUE vm_yield_force_blockarg(rb_execution_context_t *ec, VALUE args); static inline VALUE vm_yield_force_blockarg(rb_execution_context_t *ec, VALUE args);
static VALUE vm_exec(rb_thread_t *th); static VALUE vm_exec(rb_execution_context_t *ec);
static void vm_set_eval_stack(rb_execution_context_t * th, const rb_iseq_t *iseq, const rb_cref_t *cref, const struct rb_block *base_block); static void vm_set_eval_stack(rb_execution_context_t * th, const rb_iseq_t *iseq, const rb_cref_t *cref, const struct rb_block *base_block);
static int vm_collect_local_variables_in_heap(const VALUE *dfp, const struct local_var_list *vars); static int vm_collect_local_variables_in_heap(const VALUE *dfp, const struct local_var_list *vars);
@ -124,7 +124,7 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, const
vm_call_iseq_setup(ec, reg_cfp, calling, ci, cc); vm_call_iseq_setup(ec, reg_cfp, calling, ci, cc);
VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH); VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH);
return vm_exec(rb_ec_thread_ptr(ec)); /* CHECK_INTS in this function */ return vm_exec(ec); /* CHECK_INTS in this function */
} }
case VM_METHOD_TYPE_NOTIMPLEMENTED: case VM_METHOD_TYPE_NOTIMPLEMENTED:
case VM_METHOD_TYPE_CFUNC: case VM_METHOD_TYPE_CFUNC:
@ -1344,12 +1344,12 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, rb_cref_t *const cref_
if (file != Qundef) { if (file != Qundef) {
/* kick */ /* kick */
return vm_exec(rb_ec_thread_ptr(ec)); return vm_exec(ec);
} }
EC_PUSH_TAG(ec); EC_PUSH_TAG(ec);
if ((state = EC_EXEC_TAG()) == TAG_NONE) { if ((state = EC_EXEC_TAG()) == TAG_NONE) {
result = vm_exec(rb_ec_thread_ptr(ec)); result = vm_exec(ec);
} }
EC_POP_TAG(); EC_POP_TAG();