From 837fd5e494731d7d44786f29e7d6e8c27029806f Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 26 Oct 2017 08:32:49 +0000 Subject: 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 --- vm_insnhelper.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vm_insnhelper.h') diff --git a/vm_insnhelper.h b/vm_insnhelper.h index 065496912e..62df3ee11d 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -54,7 +54,7 @@ RUBY_SYMBOL_EXPORT_END #define VM_REG_EP (VM_REG_CFP->ep) #define RESTORE_REGS() do { \ - VM_REG_CFP = th->ec.cfp; \ + VM_REG_CFP = th->ec->cfp; \ } while (0) #define REG_A reg_a @@ -102,7 +102,7 @@ enum vm_regan_acttype { #define SET_SV(x) (*GET_SP() = (x)) /* set current stack value as x */ -#define GET_SP_COUNT() (VM_REG_SP - th->ec.vm_stack) +#define GET_SP_COUNT() (VM_REG_SP - th->ec->vm_stack) /* instruction sequence C struct */ #define GET_ISEQ() (GET_CFP()->iseq) -- cgit v1.2.3