diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-27 19:08:31 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-27 19:08:31 +0000 |
commit | baa849443f6e1cd91ab48f17d5967e4a60bfc93f (patch) | |
tree | 79d7b38d83a4e0875daa881c028b5007d86bae7d | |
parent | 5f50a56efcff722192fd30c3f11c2c36768a101b (diff) |
`th` -> `ec` for `rb_insn_func_t`.
* vm_core.h (rb_insn_func_t): accepts `ec` instead of `th`.
* vm_insnhelper.c (rb_vm_opt_struct_aref): ditto.
* vm_insnhelper.c (rb_vm_opt_struct_aset): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60492 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | insns.def | 2 | ||||
-rw-r--r-- | struct.c | 4 | ||||
-rw-r--r-- | vm_core.h | 2 | ||||
-rw-r--r-- | vm_insnhelper.c | 4 |
4 files changed, 6 insertions, 6 deletions
@@ -1675,7 +1675,7 @@ opt_call_c_function () () { - reg_cfp = (funcptr)(rb_ec_thread_ptr(ec), reg_cfp); + reg_cfp = (funcptr)(ec, reg_cfp); if (reg_cfp == 0) { VALUE err = ec->errinfo; @@ -279,7 +279,7 @@ new_struct(VALUE name, VALUE super) static void define_aref_method(VALUE nstr, VALUE name, VALUE off) { - rb_control_frame_t *FUNC_FASTCALL(rb_vm_opt_struct_aref)(rb_thread_t *, rb_control_frame_t *); + rb_control_frame_t *FUNC_FASTCALL(rb_vm_opt_struct_aref)(rb_execution_context_t *, rb_control_frame_t *); const rb_iseq_t *iseq = rb_method_for_self_aref(name, off, rb_vm_opt_struct_aref); rb_add_method_iseq(nstr, SYM2ID(name), iseq, NULL, METHOD_VISI_PUBLIC); @@ -288,7 +288,7 @@ define_aref_method(VALUE nstr, VALUE name, VALUE off) static void define_aset_method(VALUE nstr, VALUE name, VALUE off) { - rb_control_frame_t *FUNC_FASTCALL(rb_vm_opt_struct_aset)(rb_thread_t *, rb_control_frame_t *); + rb_control_frame_t *FUNC_FASTCALL(rb_vm_opt_struct_aset)(rb_execution_context_t *, rb_control_frame_t *); const rb_iseq_t *iseq = rb_method_for_self_aset(name, off, rb_vm_opt_struct_aset); rb_add_method_iseq(nstr, SYM2ID(name), iseq, NULL, METHOD_VISI_PUBLIC); @@ -1000,7 +1000,7 @@ typedef VALUE CDHASH; #endif typedef rb_control_frame_t * - (FUNC_FASTCALL(*rb_insn_func_t))(rb_thread_t *, rb_control_frame_t *); + (FUNC_FASTCALL(*rb_insn_func_t))(rb_execution_context_t *, rb_control_frame_t *); #define VM_TAGGED_PTR_SET(p, tag) ((VALUE)(p) | (tag)) #define VM_TAGGED_PTR_REF(v, mask) ((void *)((v) & ~mask)) diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 248e717615..c532640348 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2765,14 +2765,14 @@ vm_once_clear(VALUE data) } rb_control_frame_t * -FUNC_FASTCALL(rb_vm_opt_struct_aref)(rb_thread_t *th, rb_control_frame_t *reg_cfp) +FUNC_FASTCALL(rb_vm_opt_struct_aref)(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp) { TOPN(0) = rb_struct_aref(GET_SELF(), TOPN(0)); return reg_cfp; } rb_control_frame_t * -FUNC_FASTCALL(rb_vm_opt_struct_aset)(rb_thread_t *th, rb_control_frame_t *reg_cfp) +FUNC_FASTCALL(rb_vm_opt_struct_aset)(rb_execution_context_t *th, rb_control_frame_t *reg_cfp) { rb_struct_aset(GET_SELF(), TOPN(0), TOPN(1)); return reg_cfp; |