kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

th -> ec for rb_insn_func_t.

Browse source 
* 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
This commit is contained in:
ko1 2017-10-27 19:08:31 +00:00
parent 5f50a56efc
commit baa849443f
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
insns.def
View file

@ -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) { if (reg_cfp == 0) {
VALUE err = ec->errinfo; VALUE err = ec->errinfo;

4
struct.c
View file

@ -279,7 +279,7 @@ new_struct(VALUE name, VALUE super)
static void static void
define_aref_method(VALUE nstr, VALUE name, VALUE off) 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); 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); 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 static void
define_aset_method(VALUE nstr, VALUE name, VALUE off) 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); 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); rb_add_method_iseq(nstr, SYM2ID(name), iseq, NULL, METHOD_VISI_PUBLIC);

2
vm_core.h
View file

@ -1000,7 +1000,7 @@ typedef VALUE CDHASH;
#endif #endif
typedef rb_control_frame_t * 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_SET(p, tag) ((VALUE)(p) | (tag))
#define VM_TAGGED_PTR_REF(v, mask) ((void *)((v) & ~mask)) #define VM_TAGGED_PTR_REF(v, mask) ((void *)((v) & ~mask))

4
vm_insnhelper.c
View file

@ -2765,14 +2765,14 @@ vm_once_clear(VALUE data)
} }
rb_control_frame_t * 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)); TOPN(0) = rb_struct_aref(GET_SELF(), TOPN(0));
return reg_cfp; return reg_cfp;
} }
rb_control_frame_t * 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)); rb_struct_aset(GET_SELF(), TOPN(0), TOPN(1));
return reg_cfp; return reg_cfp;