diff options
Diffstat (limited to 'src/lj_emit_arm.h')
-rw-r--r-- | src/lj_emit_arm.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lj_emit_arm.h b/src/lj_emit_arm.h index b76a9a45..1a9a6852 100644 --- a/src/lj_emit_arm.h +++ b/src/lj_emit_arm.h | |||
@@ -308,30 +308,30 @@ static void emit_movrr(ASMState *as, IRIns *ir, Reg dst, Reg src) | |||
308 | emit_dm(as, ARMI_MOV, dst, src); | 308 | emit_dm(as, ARMI_MOV, dst, src); |
309 | } | 309 | } |
310 | 310 | ||
311 | /* Generic load of register from stack slot. */ | 311 | /* Generic load of register with base and (small) offset address. */ |
312 | static void emit_spload(ASMState *as, IRIns *ir, Reg r, int32_t ofs) | 312 | static void emit_loadofs(ASMState *as, IRIns *ir, Reg r, Reg base, int32_t ofs) |
313 | { | 313 | { |
314 | #if LJ_SOFTFP | 314 | #if LJ_SOFTFP |
315 | lua_assert(!irt_isnum(ir->t)); UNUSED(ir); | 315 | lua_assert(!irt_isnum(ir->t)); UNUSED(ir); |
316 | #else | 316 | #else |
317 | if (r >= RID_MAX_GPR) | 317 | if (r >= RID_MAX_GPR) |
318 | emit_vlso(as, irt_isnum(ir->t) ? ARMI_VLDR_D : ARMI_VLDR_S, r, RID_SP, ofs); | 318 | emit_vlso(as, irt_isnum(ir->t) ? ARMI_VLDR_D : ARMI_VLDR_S, r, base, ofs); |
319 | else | 319 | else |
320 | #endif | 320 | #endif |
321 | emit_lso(as, ARMI_LDR, r, RID_SP, ofs); | 321 | emit_lso(as, ARMI_LDR, r, base, ofs); |
322 | } | 322 | } |
323 | 323 | ||
324 | /* Generic store of register to stack slot. */ | 324 | /* Generic store of register with base and (small) offset address. */ |
325 | static void emit_spstore(ASMState *as, IRIns *ir, Reg r, int32_t ofs) | 325 | static void emit_storeofs(ASMState *as, IRIns *ir, Reg r, Reg base, int32_t ofs) |
326 | { | 326 | { |
327 | #if LJ_SOFTFP | 327 | #if LJ_SOFTFP |
328 | lua_assert(!irt_isnum(ir->t)); UNUSED(ir); | 328 | lua_assert(!irt_isnum(ir->t)); UNUSED(ir); |
329 | #else | 329 | #else |
330 | if (r >= RID_MAX_GPR) | 330 | if (r >= RID_MAX_GPR) |
331 | emit_vlso(as, irt_isnum(ir->t) ? ARMI_VSTR_D : ARMI_VSTR_S, r, RID_SP, ofs); | 331 | emit_vlso(as, irt_isnum(ir->t) ? ARMI_VSTR_D : ARMI_VSTR_S, r, base, ofs); |
332 | else | 332 | else |
333 | #endif | 333 | #endif |
334 | emit_lso(as, ARMI_STR, r, RID_SP, ofs); | 334 | emit_lso(as, ARMI_STR, r, base, ofs); |
335 | } | 335 | } |
336 | 336 | ||
337 | /* Emit an arithmetic/logic operation with a constant operand. */ | 337 | /* Emit an arithmetic/logic operation with a constant operand. */ |