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

LJ_GC64: Various followup fixes.

Browse Source 
Contributed by Peter Cawley.
This commit is contained in:
Mike Pall 2016-10-20 20:55:12 +02:00
parent bdcaf4bfd9
commit 716f2daef8
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lj_asm_x86.h
View File

@ -1247,14 +1247,15 @@ static void asm_href(ASMState *as, IRIns *ir, IROp merge)
} else { } else {
emit_rr(as, XO_MOV, tmp, key); emit_rr(as, XO_MOV, tmp, key);
#if LJ_GC64 #if LJ_GC64
emit_gri(as, XG_ARITHi(XOg_XOR), dest, irt_toitype(kt) << 15); checkmclim(as);
if ((as->flags & JIT_F_BMI2)) { emit_gri(as, XG_ARITHi(XOg_XOR), dest, irt_toitype(kt) << 15);
emit_i8(as, 32); if ((as->flags & JIT_F_BMI2)) {
emit_mrm(as, XV_RORX|VEX_64, dest, key); emit_i8(as, 32);
} else { emit_mrm(as, XV_RORX|VEX_64, dest, key);
emit_shifti(as, XOg_SHR|REX_64, dest, 32); } else {
emit_rr(as, XO_MOV, dest|REX_64, key|REX_64); emit_shifti(as, XOg_SHR|REX_64, dest, 32);
} emit_rr(as, XO_MOV, dest|REX_64, key|REX_64);
}
#else #else
emit_rmro(as, XO_LEA, dest, key, HASH_BIAS); emit_rmro(as, XO_LEA, dest, key, HASH_BIAS);
#endif #endif

2
src/lj_record.c
View File

@ -2263,6 +2263,8 @@ void lj_record_ins(jit_State *J)
rc = lj_ir_kint(J, (int32_t)(int16_t)rc); rc = lj_ir_kint(J, (int32_t)(int16_t)rc);
break; break;
case BC_KNIL: case BC_KNIL:
if (LJ_FR2 && ra > J->maxslot)
J->base[ra-1] = 0;
while (ra <= rc) while (ra <= rc)
J->base[ra++] = TREF_NIL; J->base[ra++] = TREF_NIL;
if (rc >= J->maxslot) J->maxslot = rc+1; if (rc >= J->maxslot) J->maxslot = rc+1;