summaryrefslogtreecommitdiff
path: root/vm_exec.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-26 08:32:49 (GMT)
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-26 08:32:49 (GMT)
commit837fd5e494731d7d44786f29e7d6e8c27029806f (patch)
tree7ccbb6b6733ccb07c28b7df28e3e2a6b604cc731 /vm_exec.c
parent07f04f468d729b399b794198c61516f2e8ac0a89 (diff)
Use rb_execution_context_t instead of rb_thread_t
to represent execution context [Feature #14038] * vm_core.h (rb_thread_t): rb_thread_t::ec is now a pointer. There are many code using `th` to represent execution context (such as cfp, VM stack and so on). To access `ec`, they need to use `th->ec->...` (adding one indirection) so that we need to replace them by passing `ec` instead of `th`. * vm_core.h (GET_EC()): introduced to access current ec. Also remove `ruby_current_thread` global variable. * cont.c (rb_context_t): introduce rb_context_t::thread_ptr instead of rb_context_t::thread_value. * cont.c (ec_set_vm_stack): added to update vm_stack explicitly. * cont.c (ec_switch): added to switch ec explicitly. * cont.c (rb_fiber_close): added to terminate fibers explicitly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_exec.c')
-rw-r--r--vm_exec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/vm_exec.c b/vm_exec.c
index 9537687..004265f 100644
--- a/vm_exec.c
+++ b/vm_exec.c
@@ -84,7 +84,7 @@ vm_exec_core(rb_thread_t *th, VALUE initial)
#undef RESTORE_REGS
#define RESTORE_REGS() \
{ \
- VM_REG_CFP = th->ec.cfp; \
+ VM_REG_CFP = th->ec->cfp; \
reg_pc = reg_cfp->pc; \
}
@@ -102,7 +102,7 @@ vm_exec_core(rb_thread_t *th, VALUE initial)
return (VALUE)insns_address_table;
}
#endif
- reg_cfp = th->ec.cfp;
+ reg_cfp = th->ec->cfp;
reg_pc = reg_cfp->pc;
#if OPT_STACK_CACHING
@@ -142,7 +142,7 @@ rb_vm_get_insns_address_table(void)
static VALUE
vm_exec_core(rb_thread_t *th, VALUE initial)
{
- register rb_control_frame_t *reg_cfp = th->ec.cfp;
+ register rb_control_frame_t *reg_cfp = th->ec->cfp;
while (1) {
reg_cfp = ((rb_insn_func_t) (*GET_PC()))(th, reg_cfp);
@@ -158,8 +158,8 @@ vm_exec_core(rb_thread_t *th, VALUE initial)
return ret;
}
else {
- VALUE err = th->ec.errinfo;
- th->ec.errinfo = Qnil;
+ VALUE err = th->ec->errinfo;
+ th->ec->errinfo = Qnil;
return err;
}
}