diff options
author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-09 06:17:01 +0000 |
---|---|---|
committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-09 06:17:01 +0000 |
commit | 177f6d7839dfb64df19260d384cc28cab87c1077 (patch) | |
tree | c055b5a38b67290a3182126a4112d2a0099ea9c7 | |
parent | c2a5df6905c9b9afde2c2611a20128220bf1372a (diff) | |
download | ruby-177f6d7839dfb64df19260d384cc28cab87c1077.tar.gz |
fixup r58614 for raspi3 and maybe other systems with odd compile
[ruby-core:81048]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | vm.c | 4 | ||||
-rw-r--r-- | vm_insnhelper.c | 4 | ||||
-rw-r--r-- | vm_insnhelper.h | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -3266,7 +3266,7 @@ vm_analysis_operand(int insn, int n, VALUE op) HASH_ASET(ihash, INT2FIX(n), ophash); } /* intern */ - valstr = rb_insn_operand_intern(GET_THREAD()->cfp->iseq, insn, n, op, 0, 0, 0, 0); + valstr = rb_insn_operand_intern(GET_THREAD()->ec.cfp->iseq, insn, n, op, 0, 0, 0, 0); /* set count */ if ((cv = rb_hash_aref(ophash, valstr)) == Qnil) { @@ -3379,7 +3379,7 @@ vm_collect_usage_operand(int insn, int n, VALUE op) if (RUBY_DTRACE_INSN_OPERAND_ENABLED()) { VALUE valstr; - valstr = rb_insn_operand_intern(GET_THREAD()->cfp->iseq, insn, n, op, 0, 0, 0, 0); + valstr = rb_insn_operand_intern(GET_THREAD()->ec.cfp->iseq, insn, n, op, 0, 0, 0, 0); RUBY_DTRACE_INSN_OPERAND(RSTRING_PTR(valstr), rb_insns_name(insn)); RB_GC_GUARD(valstr); diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 31e9b5a93f..05aeefaa7d 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1428,8 +1428,8 @@ vm_base_ptr(const rb_control_frame_t *cfp) #if VM_DEBUG_BP_CHECK if (bp != cfp->bp_check) { fprintf(stderr, "bp_check: %ld, bp: %ld\n", - (long)(cfp->bp_check - GET_THREAD()->stack), - (long)(bp - GET_THREAD()->stack)); + (long)(cfp->bp_check - GET_THREAD()->ec.stack), + (long)(bp - GET_THREAD()->ec.stack)); rb_bug("vm_base_ptr: unreachable"); } #endif diff --git a/vm_insnhelper.h b/vm_insnhelper.h index e77ade15ee..8edeb28014 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -47,7 +47,7 @@ extern VALUE ruby_vm_const_missing_count; #define VM_REG_EP (VM_REG_CFP->ep) #define RESTORE_REGS() do { \ - VM_REG_CFP = th->cfp; \ + VM_REG_CFP = th->ec.cfp; \ } while (0) #define REG_A reg_a |