gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM64: Fix assembly of HREFK.

Browse Source 
Reported by Jason Teplitz.
This commit is contained in:
Mike Pall 2017-11-08 12:53:48 +01:00
parent 4b17a6a2ff
commit 06cd9fce7d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lj_asm_arm64.h
View File

@ -869,14 +869,12 @@ static void asm_hrefk(ASMState *as, IRIns *ir)
int32_t ofs = (int32_t)(kslot->op2 * sizeof(Node)); int32_t ofs = (int32_t)(kslot->op2 * sizeof(Node));
int32_t kofs = ofs + (int32_t)offsetof(Node, key); int32_t kofs = ofs + (int32_t)offsetof(Node, key);
int bigofs = !emit_checkofs(A64I_LDRx, ofs); int bigofs = !emit_checkofs(A64I_LDRx, ofs);
RegSet allow = RSET_GPR;
Reg dest = (ra_used(ir) || bigofs) ? ra_dest(as, ir, RSET_GPR) : RID_NONE; Reg dest = (ra_used(ir) || bigofs) ? ra_dest(as, ir, RSET_GPR) : RID_NONE;
Reg node = ra_alloc1(as, ir->op1, allow); Reg node = ra_alloc1(as, ir->op1, RSET_GPR);
Reg key = ra_scratch(as, rset_clear(allow, node)); Reg key, idx = node;
Reg idx = node; RegSet allow = rset_exclude(RSET_GPR, node);
uint64_t k; uint64_t k;
lua_assert(ofs % sizeof(Node) == 0); lua_assert(ofs % sizeof(Node) == 0);
rset_clear(allow, key);
if (bigofs) { if (bigofs) {
idx = dest; idx = dest;
rset_clear(allow, dest); rset_clear(allow, dest);
@ -892,7 +890,8 @@ static void asm_hrefk(ASMState *as, IRIns *ir)
} else { } else {
k = ((uint64_t)irt_toitype(irkey->t) << 47) | (uint64_t)ir_kgc(irkey); k = ((uint64_t)irt_toitype(irkey->t) << 47) | (uint64_t)ir_kgc(irkey);
} }
emit_nm(as, A64I_CMPx, key, ra_allock(as, k, allow)); key = ra_scratch(as, allow);
emit_nm(as, A64I_CMPx, key, ra_allock(as, k, rset_exclude(allow, key)));
emit_lso(as, A64I_LDRx, key, idx, kofs); emit_lso(as, A64I_LDRx, key, idx, kofs);
if (bigofs) if (bigofs)
emit_opk(as, A64I_ADDx, dest, node, ofs, RSET_GPR); emit_opk(as, A64I_ADDx, dest, node, ofs, RSET_GPR);