DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LJ_GC64: Add support for 64 bit GCobj constants in the IR.

Browse Source 
Contributed by Peter Cawley.
This commit is contained in:
Mike Pall
2016-05-23 00:34:05 +02:00
parent 9e99ccc360
commit f26679c719
3 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lj_asm.c
View File

@@ -704,6 +704,11 @@ static void ra_left(ASMState *as, Reg dest, IRRef lref)
} else if (ir->o == IR_KINT64) {
emit_loadk64(as, dest, ir);
return;
#if LJ_GC64
} else if (ir->o == IR_KGC || ir->o == IR_KPTR || ir->o == IR_KKPTR) {
emit_loadk64(as, dest, ir);
return;
#endif
#endif
} else if (ir->o != IR_KPRI) {
lua_assert(ir->o == IR_KINT || ir->o == IR_KGC ||
@@ -1933,7 +1938,7 @@ static void asm_tail_link(ASMState *as)
emit_addptr(as, RID_BASE, 8*(int32_t)baseslot);
if (as->J->ktrace) { /* Patch ktrace slot with the final GCtrace pointer. */
setgcref(IR(as->J->ktrace)->gcr, obj2gco(as->J->curfinal));
setgcref(IR(as->J->ktrace)[LJ_GC64].gcr, obj2gco(as->J->curfinal));
IR(as->J->ktrace)->o = IR_KGC;
}
@@ -1965,8 +1970,12 @@ static void asm_setup_regsp(ASMState *as)
for (ir = IR(T->nk), lastir = IR(REF_BASE); ir < lastir; ir++) {
ir->prev = REGSP_INIT;
if (irt_is64(ir->t) && ir->o != IR_KNULL) {
#if LJ_GC64
ir->i = 0; /* Will become non-zero only for RIP-relative addresses. */
#else
/* Make life easier for backends by putting address of constant in i. */
ir->i = (int32_t)(intptr_t)(ir+1);
#endif
ir++;
}
}