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

fixup r58614 for raspi3 and maybe other systems with odd compile

Browse source 
[ruby-core:81048]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2017-05-09 06:17:01 +00:00
parent 9d09240d9e
commit 7469699dce
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vm.c
View file

@ -3266,7 +3266,7 @@ vm_analysis_operand(int insn, int n, VALUE op)
HASH_ASET(ihash, INT2FIX(n), ophash); HASH_ASET(ihash, INT2FIX(n), ophash);
} }
/* intern */ /* 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 */ /* set count */
if ((cv = rb_hash_aref(ophash, valstr)) == Qnil) { 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()) { if (RUBY_DTRACE_INSN_OPERAND_ENABLED()) {
VALUE valstr; 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)); RUBY_DTRACE_INSN_OPERAND(RSTRING_PTR(valstr), rb_insns_name(insn));
RB_GC_GUARD(valstr); RB_GC_GUARD(valstr);

4
vm_insnhelper.c
View file

@ -1428,8 +1428,8 @@ vm_base_ptr(const rb_control_frame_t *cfp)
#if VM_DEBUG_BP_CHECK #if VM_DEBUG_BP_CHECK
if (bp != cfp->bp_check) { if (bp != cfp->bp_check) {
fprintf(stderr, "bp_check: %ld, bp: %ld\n", fprintf(stderr, "bp_check: %ld, bp: %ld\n",
(long)(cfp->bp_check - GET_THREAD()->stack), (long)(cfp->bp_check - GET_THREAD()->ec.stack),
(long)(bp - GET_THREAD()->stack)); (long)(bp - GET_THREAD()->ec.stack));
rb_bug("vm_base_ptr: unreachable"); rb_bug("vm_base_ptr: unreachable");
} }
#endif #endif

2
vm_insnhelper.h
View file

@ -47,7 +47,7 @@ extern VALUE ruby_vm_const_missing_count;
#define VM_REG_EP (VM_REG_CFP->ep) #define VM_REG_EP (VM_REG_CFP->ep)
#define RESTORE_REGS() do { \ #define RESTORE_REGS() do { \
VM_REG_CFP = th->cfp; \ VM_REG_CFP = th->ec.cfp; \
} while (0) } while (0)
#define REG_A reg_a #define REG_A reg_a