diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-27 01:22:01 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-27 01:22:01 +0000 |
commit | 34ff953e37b9a96be57d73bb3c73d8c22c2ac98e (patch) | |
tree | 40fee8a826739702468e31fee63f81f415383dbb /vm_insnhelper.c | |
parent | 9d41e743987553183a6ef1df8913d3fc5423c2e0 (diff) | |
download | ruby-34ff953e37b9a96be57d73bb3c73d8c22c2ac98e.tar.gz |
Some functions accept `ec` instead of `th`.
* vm_insnhelper.c: The following functions accept `ec` instead of `th`.
* lep_svar
* lep_svar_write
* lep_svar_get
* lep_svar_set
* vm_getspecial
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r-- | vm_insnhelper.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 8210c9dac3..de5e4f48b1 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -387,15 +387,15 @@ vm_svar_valid_p(VALUE svar) #endif static inline struct vm_svar * -lep_svar(rb_thread_t *th, const VALUE *lep) +lep_svar(rb_execution_context_t *ec, const VALUE *lep) { VALUE svar; - if (lep && (th == NULL || th->ec->root_lep != lep)) { + if (lep && (ec == NULL || ec->root_lep != lep)) { svar = lep[VM_ENV_DATA_INDEX_ME_CREF]; } else { - svar = th->ec->root_svar; + svar = ec->root_svar; } VM_ASSERT(svar == Qfalse || vm_svar_valid_p(svar)); @@ -404,22 +404,22 @@ lep_svar(rb_thread_t *th, const VALUE *lep) } static inline void -lep_svar_write(rb_thread_t *th, const VALUE *lep, const struct vm_svar *svar) +lep_svar_write(rb_execution_context_t *ec, const VALUE *lep, const struct vm_svar *svar) { VM_ASSERT(vm_svar_valid_p((VALUE)svar)); - if (lep && (th == NULL || th->ec->root_lep != lep)) { + if (lep && (ec == NULL || ec->root_lep != lep)) { vm_env_write(lep, VM_ENV_DATA_INDEX_ME_CREF, (VALUE)svar); } else { - RB_OBJ_WRITE(th->self, &th->ec->root_svar, svar); + RB_OBJ_WRITE(rb_ec_thread_ptr(ec)->self, &ec->root_svar, svar); } } static VALUE -lep_svar_get(rb_thread_t *th, const VALUE *lep, rb_num_t key) +lep_svar_get(rb_execution_context_t *ec, const VALUE *lep, rb_num_t key) { - const struct vm_svar *svar = lep_svar(th, lep); + const struct vm_svar *svar = lep_svar(ec, lep); if ((VALUE)svar == Qfalse || imemo_type((VALUE)svar) != imemo_svar) return Qnil; @@ -448,12 +448,12 @@ svar_new(VALUE obj) } static void -lep_svar_set(rb_thread_t *th, const VALUE *lep, rb_num_t key, VALUE val) +lep_svar_set(rb_execution_context_t *ec, const VALUE *lep, rb_num_t key, VALUE val) { - struct vm_svar *svar = lep_svar(th, lep); + struct vm_svar *svar = lep_svar(ec, lep); if ((VALUE)svar == Qfalse || imemo_type((VALUE)svar) != imemo_svar) { - lep_svar_write(th, lep, svar = svar_new((VALUE)svar)); + lep_svar_write(ec, lep, svar = svar_new((VALUE)svar)); } switch (key) { @@ -475,15 +475,15 @@ lep_svar_set(rb_thread_t *th, const VALUE *lep, rb_num_t key, VALUE val) } static inline VALUE -vm_getspecial(rb_thread_t *th, const VALUE *lep, rb_num_t key, rb_num_t type) +vm_getspecial(rb_execution_context_t *ec, const VALUE *lep, rb_num_t key, rb_num_t type) { VALUE val; if (type == 0) { - val = lep_svar_get(th, lep, key); + val = lep_svar_get(ec, lep, key); } else { - VALUE backref = lep_svar_get(th, lep, VM_SVAR_BACKREF); + VALUE backref = lep_svar_get(ec, lep, VM_SVAR_BACKREF); if (type & 0x01) { switch (type >> 1) { @@ -2906,7 +2906,7 @@ vm_defined(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_num_t op_type, VALUE } break; case DEFINED_REF:{ - if (vm_getspecial(th, GET_LEP(), Qfalse, FIX2INT(obj)) != Qnil) { + if (vm_getspecial(th->ec, GET_LEP(), Qfalse, FIX2INT(obj)) != Qnil) { expr_type = DEFINED_GVAR; } break; |