diff options
Diffstat (limited to 'src/lj_asm_arm.h')
-rw-r--r-- | src/lj_asm_arm.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lj_asm_arm.h b/src/lj_asm_arm.h index 00d87aeb..497a5692 100644 --- a/src/lj_asm_arm.h +++ b/src/lj_asm_arm.h | |||
@@ -1944,7 +1944,7 @@ static void asm_stack_check(ASMState *as, BCReg topslot, | |||
1944 | emit_lso(as, ARMI_LDR, RID_TMP, RID_TMP, | 1944 | emit_lso(as, ARMI_LDR, RID_TMP, RID_TMP, |
1945 | (int32_t)offsetof(lua_State, maxstack)); | 1945 | (int32_t)offsetof(lua_State, maxstack)); |
1946 | if (irp) { /* Must not spill arbitrary registers in head of side trace. */ | 1946 | if (irp) { /* Must not spill arbitrary registers in head of side trace. */ |
1947 | int32_t i = i32ptr(&J2G(as->J)->jit_L); | 1947 | int32_t i = i32ptr(&J2G(as->J)->cur_L); |
1948 | if (ra_hasspill(irp->s)) | 1948 | if (ra_hasspill(irp->s)) |
1949 | emit_lso(as, ARMI_LDR, pbase, RID_SP, sps_scale(irp->s)); | 1949 | emit_lso(as, ARMI_LDR, pbase, RID_SP, sps_scale(irp->s)); |
1950 | emit_lso(as, ARMI_LDR, RID_TMP, RID_TMP, (i & 4095)); | 1950 | emit_lso(as, ARMI_LDR, RID_TMP, RID_TMP, (i & 4095)); |
@@ -1952,7 +1952,7 @@ static void asm_stack_check(ASMState *as, BCReg topslot, | |||
1952 | emit_lso(as, ARMI_STR, RID_RET, RID_SP, 0); /* Save temp. register. */ | 1952 | emit_lso(as, ARMI_STR, RID_RET, RID_SP, 0); /* Save temp. register. */ |
1953 | emit_loadi(as, RID_TMP, (i & ~4095)); | 1953 | emit_loadi(as, RID_TMP, (i & ~4095)); |
1954 | } else { | 1954 | } else { |
1955 | emit_getgl(as, RID_TMP, jit_L); | 1955 | emit_getgl(as, RID_TMP, cur_L); |
1956 | } | 1956 | } |
1957 | } | 1957 | } |
1958 | 1958 | ||
@@ -2061,13 +2061,13 @@ static void asm_loop_fixup(ASMState *as) | |||
2061 | 2061 | ||
2062 | /* -- Head of trace ------------------------------------------------------- */ | 2062 | /* -- Head of trace ------------------------------------------------------- */ |
2063 | 2063 | ||
2064 | /* Reload L register from g->jit_L. */ | 2064 | /* Reload L register from g->cur_L. */ |
2065 | static void asm_head_lreg(ASMState *as) | 2065 | static void asm_head_lreg(ASMState *as) |
2066 | { | 2066 | { |
2067 | IRIns *ir = IR(ASMREF_L); | 2067 | IRIns *ir = IR(ASMREF_L); |
2068 | if (ra_used(ir)) { | 2068 | if (ra_used(ir)) { |
2069 | Reg r = ra_dest(as, ir, RSET_GPR); | 2069 | Reg r = ra_dest(as, ir, RSET_GPR); |
2070 | emit_getgl(as, r, jit_L); | 2070 | emit_getgl(as, r, cur_L); |
2071 | ra_evictk(as); | 2071 | ra_evictk(as); |
2072 | } | 2072 | } |
2073 | } | 2073 | } |