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

x64/LJ_GC64: Fix assembly of CNEWI with 64 bit constant pointer.

Browse Source 
Tracked down by Luke Gorrie.
This commit is contained in:
Mike Pall 2017-03-21 00:58:02 +01:00
parent 779a1eb8e6
commit fa126c5f97
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lj_asm_x86.h
View File

@ -1791,8 +1791,9 @@ static void asm_cnew(ASMState *as, IRIns *ir)
Reg r64 = sz == 8 ? REX_64 : 0; Reg r64 = sz == 8 ? REX_64 : 0;
if (irref_isk(ir->op2)) { if (irref_isk(ir->op2)) {
IRIns *irk = IR(ir->op2); IRIns *irk = IR(ir->op2);
uint64_t k = irk->o == IR_KINT64 ? ir_k64(irk)->u64 : uint64_t k = (irk->o == IR_KINT64 ||
(uint64_t)(uint32_t)irk->i; (LJ_GC64 && (irk->o == IR_KPTR || irk->o == IR_KKPTR))) ?
ir_k64(irk)->u64 : (uint64_t)(uint32_t)irk->i;
if (sz == 4 || checki32((int64_t)k)) { if (sz == 4 || checki32((int64_t)k)) {
emit_i32(as, (int32_t)k); emit_i32(as, (int32_t)k);
emit_rmro(as, XO_MOVmi, r64, RID_RET, sizeof(GCcdata)); emit_rmro(as, XO_MOVmi, r64, RID_RET, sizeof(GCcdata));