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

String buffers, part 3a: Add IR_TMPREF for passing TValues to helpers.

Browse Source 
Sponsored by fmad.io.
This commit is contained in:
Mike Pall 2021-07-19 16:23:12 +02:00
parent 71db0cf043
commit 6df650fe3f
12 changed files with 252 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jit/dump.lua
View File

@ -287,6 +287,7 @@ local litname = {
["FLOAD "] = vmdef.irfield, ["FLOAD "] = vmdef.irfield,
["FREF "] = vmdef.irfield, ["FREF "] = vmdef.irfield,
["FPMATH"] = vmdef.irfpm, ["FPMATH"] = vmdef.irfpm,
["TMPREF"] = { [0] = "", "IN", "OUT", "INOUT", "", "", "OUT2", "INOUT2" },
["BUFHDR"] = { [0] = "RESET", "APPEND" }, ["BUFHDR"] = { [0] = "RESET", "APPEND" },
["TOSTR "] = { [0] = "INT", "NUM", "CHAR" }, ["TOSTR "] = { [0] = "INT", "NUM", "CHAR" },
} }

19
src/lj_asm.c
View File

@ -1144,7 +1144,7 @@ static void asm_gcstep(ASMState *as, IRIns *ir)
/* -- Buffer operations --------------------------------------------------- */ /* -- Buffer operations --------------------------------------------------- */
static void asm_tvptr(ASMState *as, Reg dest, IRRef ref); static void asm_tvptr(ASMState *as, Reg dest, IRRef ref, MSize mode);
static void asm_bufhdr(ASMState *as, IRIns *ir) static void asm_bufhdr(ASMState *as, IRIns *ir)
{ {
@ -1218,7 +1218,7 @@ static void asm_bufput(ASMState *as, IRIns *ir)
if (args[1] == ASMREF_TMP1) { if (args[1] == ASMREF_TMP1) {
Reg tmp = ra_releasetmp(as, ASMREF_TMP1); Reg tmp = ra_releasetmp(as, ASMREF_TMP1);
if (kchar == -129) if (kchar == -129)
asm_tvptr(as, tmp, irs->op1); asm_tvptr(as, tmp, irs->op1, IRTMPREF_IN1);
else else
ra_allockreg(as, kchar, tmp); ra_allockreg(as, kchar, tmp);
} }
@ -1256,7 +1256,7 @@ static void asm_tostr(ASMState *as, IRIns *ir)
asm_setupresult(as, ir, ci); /* GCstr * */ asm_setupresult(as, ir, ci); /* GCstr * */
asm_gencall(as, ci, args); asm_gencall(as, ci, args);
if (ir->op2 == IRTOSTR_NUM) if (ir->op2 == IRTOSTR_NUM)
asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op1); asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op1, IRTMPREF_IN1);
} }
#if LJ_32 && LJ_HASFFI && !LJ_SOFTFP && !LJ_TARGET_X86 #if LJ_32 && LJ_HASFFI && !LJ_SOFTFP && !LJ_TARGET_X86
@ -1303,7 +1303,13 @@ static void asm_newref(ASMState *as, IRIns *ir)
args[2] = ASMREF_TMP1; /* cTValue *key */ args[2] = ASMREF_TMP1; /* cTValue *key */
asm_setupresult(as, ir, ci); /* TValue * */ asm_setupresult(as, ir, ci); /* TValue * */
asm_gencall(as, ci, args); asm_gencall(as, ci, args);
asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op2); asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op2, IRTMPREF_IN1);
}
static void asm_tmpref(ASMState *as, IRIns *ir)
{
Reg r = ra_dest(as, ir, RSET_GPR);
asm_tvptr(as, r, ir->op1, ir->op2);
} }
static void asm_lref(ASMState *as, IRIns *ir) static void asm_lref(ASMState *as, IRIns *ir)
@ -1785,6 +1791,7 @@ static void asm_ir(ASMState *as, IRIns *ir)
case IR_NEWREF: asm_newref(as, ir); break; case IR_NEWREF: asm_newref(as, ir); break;
case IR_UREFO: case IR_UREFC: asm_uref(as, ir); break; case IR_UREFO: case IR_UREFC: asm_uref(as, ir); break;
case IR_FREF: asm_fref(as, ir); break; case IR_FREF: asm_fref(as, ir); break;
case IR_TMPREF: asm_tmpref(as, ir); break;
case IR_STRREF: asm_strref(as, ir); break; case IR_STRREF: asm_strref(as, ir); break;
case IR_LREF: asm_lref(as, ir); break; case IR_LREF: asm_lref(as, ir); break;
@ -2192,6 +2199,10 @@ static void asm_setup_regsp(ASMState *as)
ir->prev = (uint16_t)REGSP_HINT((rload & 15)); ir->prev = (uint16_t)REGSP_HINT((rload & 15));
rload = lj_ror(rload, 4); rload = lj_ror(rload, 4);
continue; continue;
case IR_TMPREF:
if ((ir->op2 & IRTMPREF_OUT2) && as->evenspill < 4)
as->evenspill = 4; /* TMPREF OUT2 needs two TValues on the stack. */
break;
#endif #endif
case IR_CALLXS: { case IR_CALLXS: {
CCallInfo ci; CCallInfo ci;

69
src/lj_asm_arm.h
View File

@ -185,6 +185,9 @@ static Reg asm_fuseahuref(ASMState *as, IRRef ref, int32_t *ofsp, RegSet allow,
*ofsp = (ofs & 255); /* Mask out less bits to allow LDRD. */ *ofsp = (ofs & 255); /* Mask out less bits to allow LDRD. */
return ra_allock(as, (ofs & ~255), allow); return ra_allock(as, (ofs & ~255), allow);
} }
} else if (ir->o == IR_TMPREF) {
*ofsp = 0;
return RID_SP;
} }
} }
*ofsp = 0; *ofsp = 0;
@ -666,35 +669,55 @@ static void asm_strto(ASMState *as, IRIns *ir)
/* -- Memory references --------------------------------------------------- */ /* -- Memory references --------------------------------------------------- */
/* Get pointer to TValue. */ /* Get pointer to TValue. */
static void asm_tvptr(ASMState *as, Reg dest, IRRef ref) static void asm_tvptr(ASMState *as, Reg dest, IRRef ref, MSize mode)
{ {
IRIns *ir = IR(ref); if ((mode & IRTMPREF_IN1)) {
if (irt_isnum(ir->t)) { IRIns *ir = IR(ref);
if (irref_isk(ref)) { if (irt_isnum(ir->t)) {
/* Use the number constant itself as a TValue. */ if ((mode & IRTMPREF_OUT1)) {
ra_allockreg(as, i32ptr(ir_knum(ir)), dest);
} else {
#if LJ_SOFTFP #if LJ_SOFTFP
lj_assertA(0, "unsplit FP op"); lj_assertA(irref_isk(ref), "unsplit FP op");
emit_dm(as, ARMI_MOV, dest, RID_SP);
emit_lso(as, ARMI_STR,
ra_allock(as, (int32_t)ir_knum(ir)->u32.lo, RSET_GPR),
RID_SP, 0);
emit_lso(as, ARMI_STR,
ra_allock(as, (int32_t)ir_knum(ir)->u32.hi, RSET_GPR),
RID_SP, 4);
#else #else
/* Otherwise force a spill and use the spill slot. */ Reg src = ra_alloc1(as, ref, RSET_FPR);
emit_opk(as, ARMI_ADD, dest, RID_SP, ra_spill(as, ir), RSET_GPR); emit_dm(as, ARMI_MOV, dest, RID_SP);
emit_vlso(as, ARMI_VSTR_D, src, RID_SP, 0);
#endif #endif
} else if (irref_isk(ref)) {
/* Use the number constant itself as a TValue. */
ra_allockreg(as, i32ptr(ir_knum(ir)), dest);
} else {
#if LJ_SOFTFP
lj_assertA(0, "unsplit FP op");
#else
/* Otherwise force a spill and use the spill slot. */
emit_opk(as, ARMI_ADD, dest, RID_SP, ra_spill(as, ir), RSET_GPR);
#endif
}
} else {
/* Otherwise use [sp] and [sp+4] to hold the TValue.
** This assumes the following call has max. 4 args.
*/
Reg type;
emit_dm(as, ARMI_MOV, dest, RID_SP);
if (!irt_ispri(ir->t)) {
Reg src = ra_alloc1(as, ref, RSET_GPR);
emit_lso(as, ARMI_STR, src, RID_SP, 0);
}
if (LJ_SOFTFP && (ir+1)->o == IR_HIOP && !irt_isnil((ir+1)->t))
type = ra_alloc1(as, ref+1, RSET_GPR);
else
type = ra_allock(as, irt_toitype(ir->t), RSET_GPR);
emit_lso(as, ARMI_STR, type, RID_SP, 4);
} }
} else { } else {
/* Otherwise use [sp] and [sp+4] to hold the TValue. */
RegSet allow = rset_exclude(RSET_GPR, dest);
Reg type;
emit_dm(as, ARMI_MOV, dest, RID_SP); emit_dm(as, ARMI_MOV, dest, RID_SP);
if (!irt_ispri(ir->t)) {
Reg src = ra_alloc1(as, ref, allow);
emit_lso(as, ARMI_STR, src, RID_SP, 0);
}
if (LJ_SOFTFP && (ir+1)->o == IR_HIOP)
type = ra_alloc1(as, ref+1, allow);
else
type = ra_allock(as, irt_toitype(ir->t), allow);
emit_lso(as, ARMI_STR, type, RID_SP, 4);
} }
} }
@ -1909,7 +1932,7 @@ static void asm_hiop(ASMState *as, IRIns *ir)
ra_allocref(as, ir->op1, RID2RSET(RID_RETLO)); /* Mark lo op as used. */ ra_allocref(as, ir->op1, RID2RSET(RID_RETLO)); /* Mark lo op as used. */
break; break;
#if LJ_SOFTFP #if LJ_SOFTFP
case IR_ASTORE: case IR_HSTORE: case IR_USTORE: case IR_TOSTR: case IR_ASTORE: case IR_HSTORE: case IR_USTORE: case IR_TOSTR: case IR_TMPREF:
#endif #endif
case IR_CNEWI: case IR_CNEWI:
/* Nothing to do here. Handled by lo op itself. */ /* Nothing to do here. Handled by lo op itself. */

28
src/lj_asm_arm64.h
View File

@ -198,6 +198,9 @@ static Reg asm_fuseahuref(ASMState *as, IRRef ref, int32_t *ofsp, RegSet allow,
return RID_GL; return RID_GL;
} }
} }
} else if (ir->o == IR_TMPREF) {
*ofsp = (int32_t)glofs(as, &J2G(as->J)->tmptv);
return RID_GL;
} }
} }
*ofsp = 0; *ofsp = 0;
@ -675,22 +678,23 @@ static void asm_tvstore64(ASMState *as, Reg base, int32_t ofs, IRRef ref)
} }
/* Get pointer to TValue. */ /* Get pointer to TValue. */
static void asm_tvptr(ASMState *as, Reg dest, IRRef ref) static void asm_tvptr(ASMState *as, Reg dest, IRRef ref, MSize mode)
{ {
IRIns *ir = IR(ref); if ((mode & IRTMPREF_IN1)) {
if (irt_isnum(ir->t)) { IRIns *ir = IR(ref);
if (irref_isk(ref)) { if (irt_isnum(ir->t)) {
/* Use the number constant itself as a TValue. */ if (irref_isk(ref) && !(mode & IRTMPREF_OUT1)) {
ra_allockreg(as, i64ptr(ir_knum(ir)), dest); /* Use the number constant itself as a TValue. */
ra_allockreg(as, i64ptr(ir_knum(ir)), dest);
return;
}
emit_lso(as, A64I_STRd, (ra_alloc1(as, ref, RSET_FPR) & 31), dest, 0);
} else { } else {
/* Otherwise force a spill and use the spill slot. */ asm_tvstore64(as, dest, 0, ref);
emit_opk(as, A64I_ADDx, dest, RID_SP, ra_spill(as, ir), RSET_GPR);
} }
} else {
/* Otherwise use g->tmptv to hold the TValue. */
asm_tvstore64(as, dest, 0, ref);
emit_dn(as, A64I_ADDx^emit_isk12(glofs(as, &J2G(as->J)->tmptv)), dest, RID_GL);
} }
/* g->tmptv holds the TValue(s). */
emit_dn(as, A64I_ADDx^emit_isk12(glofs(as, &J2G(as->J)->tmptv)), dest, RID_GL);
} }
static void asm_aref(ASMState *as, IRIns *ir) static void asm_aref(ASMState *as, IRIns *ir)

84
src/lj_asm_mips.h
View File

@ -193,6 +193,9 @@ static Reg asm_fuseahuref(ASMState *as, IRRef ref, int32_t *ofsp, RegSet allow)
return ra_allock(as, ofs-(int16_t)ofs, allow); return ra_allock(as, ofs-(int16_t)ofs, allow);
} }
} }
} else if (ir->o == IR_TMPREF) {
*ofsp = (int32_t)(offsetof(global_State, tmptv)-32768);
return RID_JGL;
} }
} }
*ofsp = 0; *ofsp = 0;
@ -839,34 +842,63 @@ static void asm_tvstore64(ASMState *as, Reg base, int32_t ofs, IRRef ref)
#endif #endif
/* Get pointer to TValue. */ /* Get pointer to TValue. */
static void asm_tvptr(ASMState *as, Reg dest, IRRef ref) static void asm_tvptr(ASMState *as, Reg dest, IRRef ref, MSize mode)
{ {
IRIns *ir = IR(ref); int32_t tmpofs = (int32_t)(offsetof(global_State, tmptv)-32768);
if (irt_isnum(ir->t)) { if ((mode & IRTMPREF_IN1)) {
if (irref_isk(ref)) /* Use the number constant itself as a TValue. */ IRIns *ir = IR(ref);
ra_allockreg(as, igcptr(ir_knum(ir)), dest); if (irt_isnum(ir->t)) {
else /* Otherwise force a spill and use the spill slot. */ if ((mode & IRTMPREF_OUT1)) {
emit_tsi(as, MIPSI_AADDIU, dest, RID_SP, ra_spill(as, ir)); #if LJ_SOFTFP
} else { emit_tsi(as, MIPSI_AADDIU, dest, RID_JGL, tmpofs);
/* Otherwise use g->tmptv to hold the TValue. */ #if LJ_64
#if LJ_32 emit_setgl(as, ra_alloc1(as, ref, RSET_GPR), tmptv.u64);
RegSet allow = rset_exclude(RSET_GPR, dest);
Reg type;
emit_tsi(as, MIPSI_ADDIU, dest, RID_JGL, (int32_t)(offsetof(global_State, tmptv)-32768));
if (!irt_ispri(ir->t)) {
Reg src = ra_alloc1(as, ref, allow);
emit_setgl(as, src, tmptv.gcr);
}
if (LJ_SOFTFP && (ir+1)->o == IR_HIOP)
type = ra_alloc1(as, ref+1, allow);
else
type = ra_allock(as, (int32_t)irt_toitype(ir->t), allow);
emit_setgl(as, type, tmptv.it);
#else #else
asm_tvstore64(as, dest, 0, ref); lj_assertA(irref_isk(ref), "unsplit FP op");
emit_tsi(as, MIPSI_DADDIU, dest, RID_JGL, emit_setgl(as,
(int32_t)(offsetof(global_State, tmptv)-32768)); ra_allock(as, (int32_t)ir_knum(ir)->u32.lo, RSET_GPR),
tmptv.u32.lo);
emit_setgl(as,
ra_allock(as, (int32_t)ir_knum(ir)->u32.hi, RSET_GPR),
tmptv.u32.hi);
#endif #endif
#else
Reg src = ra_alloc1(as, ref, RSET_FPR);
emit_tsi(as, MIPSI_AADDIU, dest, RID_JGL, tmpofs);
emit_tsi(as, MIPSI_SDC1, (src & 31), RID_JGL, tmpofs);
#endif
} else if (irref_isk(ref)) {
/* Use the number constant itself as a TValue. */
ra_allockreg(as, igcptr(ir_knum(ir)), dest);
} else {
#if LJ_SOFTFP
lj_assertA(0, "unsplit FP op");
#else
/* Otherwise force a spill and use the spill slot. */
emit_tsi(as, MIPSI_AADDIU, dest, RID_SP, ra_spill(as, ir));
#endif
}
} else {
/* Otherwise use g->tmptv to hold the TValue. */
#if LJ_32
Reg type;
emit_tsi(as, MIPSI_ADDIU, dest, RID_JGL, tmpofs);
if (!irt_ispri(ir->t)) {
Reg src = ra_alloc1(as, ref, RSET_GPR);
emit_setgl(as, src, tmptv.gcr);
}
if (LJ_SOFTFP && (ir+1)->o == IR_HIOP && !irt_isnil((ir+1)->t))
type = ra_alloc1(as, ref+1, RSET_GPR);
else
type = ra_allock(as, (int32_t)irt_toitype(ir->t), RSET_GPR);
emit_setgl(as, type, tmptv.it);
#else
asm_tvstore64(as, dest, 0, ref);
emit_tsi(as, MIPSI_DADDIU, dest, RID_JGL, tmpofs);
#endif
}
} else {
emit_tsi(as, MIPSI_AADDIU, dest, RID_JGL, tmpofs);
} }
} }
@ -2415,7 +2447,7 @@ static void asm_hiop(ASMState *as, IRIns *ir)
ra_allocref(as, ir->op1, RID2RSET(RID_RETLO)); /* Mark lo op as used. */ ra_allocref(as, ir->op1, RID2RSET(RID_RETLO)); /* Mark lo op as used. */
break; break;
#if LJ_SOFTFP #if LJ_SOFTFP
case IR_ASTORE: case IR_HSTORE: case IR_USTORE: case IR_TOSTR: case IR_ASTORE: case IR_HSTORE: case IR_USTORE: case IR_TOSTR: case IR_TMPREF:
#endif #endif
case IR_CNEWI: case IR_CNEWI:
/* Nothing to do here. Handled by lo op itself. */ /* Nothing to do here. Handled by lo op itself. */

71
src/lj_asm_ppc.h
View File

@ -156,6 +156,9 @@ static Reg asm_fuseahuref(ASMState *as, IRRef ref, int32_t *ofsp, RegSet allow)
return ra_allock(as, ofs-(int16_t)ofs, allow); return ra_allock(as, ofs-(int16_t)ofs, allow);
} }
} }
} else if (ir->o == IR_TMPREF) {
*ofsp = (int32_t)(offsetof(global_State, tmptv)-32768);
return RID_JGL;
} }
} }
*ofsp = 0; *ofsp = 0;
@ -567,28 +570,54 @@ static void asm_strto(ASMState *as, IRIns *ir)
/* -- Memory references --------------------------------------------------- */ /* -- Memory references --------------------------------------------------- */
/* Get pointer to TValue. */ /* Get pointer to TValue. */
static void asm_tvptr(ASMState *as, Reg dest, IRRef ref) static void asm_tvptr(ASMState *as, Reg dest, IRRef ref, MSize mode)
{ {
IRIns *ir = IR(ref); int32_t tmpofs = (int32_t)(offsetof(global_State, tmptv)-32768);
if (irt_isnum(ir->t)) { if ((mode & IRTMPREF_IN1)) {
if (irref_isk(ref)) /* Use the number constant itself as a TValue. */ IRIns *ir = IR(ref);
ra_allockreg(as, i32ptr(ir_knum(ir)), dest); if (irt_isnum(ir->t)) {
else /* Otherwise force a spill and use the spill slot. */ if ((mode & IRTMPREF_OUT1)) {
emit_tai(as, PPCI_ADDI, dest, RID_SP, ra_spill(as, ir)); #if LJ_SOFTFP
} else { lj_assertA(irref_isk(ref), "unsplit FP op");
/* Otherwise use g->tmptv to hold the TValue. */ emit_tai(as, PPCI_ADDI, dest, RID_JGL, tmpofs);
RegSet allow = rset_exclude(RSET_GPR, dest); emit_setgl(as,
Reg type; ra_allock(as, (int32_t)ir_knum(ir)->u32.lo, RSET_GPR),
emit_tai(as, PPCI_ADDI, dest, RID_JGL, (int32_t)offsetof(global_State, tmptv)-32768); tmptv.u32.lo);
if (!irt_ispri(ir->t)) { emit_setgl(as,
Reg src = ra_alloc1(as, ref, allow); ra_allock(as, (int32_t)ir_knum(ir)->u32.hi, RSET_GPR),
emit_setgl(as, src, tmptv.gcr); tmptv.u32.hi);
#else
Reg src = ra_alloc1(as, ref, RSET_FPR);
emit_tai(as, PPCI_ADDI, dest, RID_JGL, tmpofs);
emit_fai(as, PPCI_STFD, src, RID_JGL, tmpofs);
#endif
} else if (irref_isk(ref)) {
/* Use the number constant itself as a TValue. */
ra_allockreg(as, i32ptr(ir_knum(ir)), dest);
} else {
#if LJ_SOFTFP
lj_assertA(0, "unsplit FP op");
#else
/* Otherwise force a spill and use the spill slot. */
emit_tai(as, PPCI_ADDI, dest, RID_SP, ra_spill(as, ir));
#endif
}
} else {
/* Otherwise use g->tmptv to hold the TValue. */
Reg type;
emit_tai(as, PPCI_ADDI, dest, RID_JGL, tmpofs);
if (!irt_ispri(ir->t)) {
Reg src = ra_alloc1(as, ref, RSET_GPR);
emit_setgl(as, src, tmptv.gcr);
}
if (LJ_SOFTFP && (ir+1)->o == IR_HIOP && !irt_isnil((ir+1)->t))
type = ra_alloc1(as, ref+1, RSET_GPR);
else
type = ra_allock(as, irt_toitype(ir->t), RSET_GPR);
emit_setgl(as, type, tmptv.it);
} }
if (LJ_SOFTFP && (ir+1)->o == IR_HIOP) } else {
type = ra_alloc1(as, ref+1, allow); emit_tai(as, PPCI_ADDI, dest, RID_JGL, tmpofs);
else
type = ra_allock(as, irt_toitype(ir->t), allow);
emit_setgl(as, type, tmptv.it);
} }
} }
@ -1958,7 +1987,7 @@ static void asm_hiop(ASMState *as, IRIns *ir)
ra_allocref(as, ir->op1, RID2RSET(RID_RETLO)); /* Mark lo op as used. */ ra_allocref(as, ir->op1, RID2RSET(RID_RETLO)); /* Mark lo op as used. */
break; break;
#if LJ_SOFTFP #if LJ_SOFTFP
case IR_ASTORE: case IR_HSTORE: case IR_USTORE: case IR_TOSTR: case IR_ASTORE: case IR_HSTORE: case IR_USTORE: case IR_TOSTR: case IR_TMPREF:
#endif #endif
case IR_CNEWI: case IR_CNEWI:
/* Nothing to do here. Handled by lo op itself. */ /* Nothing to do here. Handled by lo op itself. */

83
src/lj_asm_x86.h
View File

@ -216,6 +216,16 @@ static void asm_fuseahuref(ASMState *as, IRRef ref, RegSet allow)
#endif #endif
} }
break; break;
case IR_TMPREF:
#if LJ_GC64
as->mrm.ofs = (int32_t)dispofs(as, &J2G(as->J)->tmptv);
as->mrm.base = RID_DISPATCH;
as->mrm.idx = RID_NONE;
#else
as->mrm.ofs = igcptr(&J2G(as->J)->tmptv);
as->mrm.base = as->mrm.idx = RID_NONE;
#endif
return;
default: default:
lj_assertA(ir->o == IR_HREF || ir->o == IR_NEWREF || ir->o == IR_UREFO || lj_assertA(ir->o == IR_HREF || ir->o == IR_NEWREF || ir->o == IR_UREFO ||
ir->o == IR_KKPTR, ir->o == IR_KKPTR,
@ -1050,47 +1060,48 @@ static void asm_strto(ASMState *as, IRIns *ir)
/* -- Memory references --------------------------------------------------- */ /* -- Memory references --------------------------------------------------- */
/* Get pointer to TValue. */ /* Get pointer to TValue. */
static void asm_tvptr(ASMState *as, Reg dest, IRRef ref) static void asm_tvptr(ASMState *as, Reg dest, IRRef ref, MSize mode)
{ {
IRIns *ir = IR(ref); if ((mode & IRTMPREF_IN1)) {
if (irt_isnum(ir->t)) { IRIns *ir = IR(ref);
/* For numbers use the constant itself or a spill slot as a TValue. */ if (irt_isnum(ir->t)) {
if (irref_isk(ref)) if (irref_isk(ref) && !(mode & IRTMPREF_OUT1)) {
emit_loada(as, dest, ir_knum(ir)); /* Use the number constant itself as a TValue. */
else emit_loada(as, dest, ir_knum(ir));
emit_rmro(as, XO_LEA, dest|REX_64, RID_ESP, ra_spill(as, ir)); return;
} else { }
/* Otherwise use g->tmptv to hold the TValue. */ emit_rmro(as, XO_MOVSDto, ra_alloc1(as, ref, RSET_FPR), dest, 0);
#if LJ_GC64 } else {
if (irref_isk(ref)) { #if LJ_GC64
TValue k; if (irref_isk(ref)) {
lj_ir_kvalue(as->J->L, &k, ir); TValue k;
emit_movmroi(as, dest, 4, k.u32.hi); lj_ir_kvalue(as->J->L, &k, ir);
emit_movmroi(as, dest, 0, k.u32.lo); emit_movmroi(as, dest, 4, k.u32.hi);
} else { emit_movmroi(as, dest, 0, k.u32.lo);
/* TODO: 64 bit store + 32 bit load-modify-store is suboptimal. */ } else {
Reg src = ra_alloc1(as, ref, rset_exclude(RSET_GPR, dest)); /* TODO: 64 bit store + 32 bit load-modify-store is suboptimal. */
if (irt_is64(ir->t)) { Reg src = ra_alloc1(as, ref, rset_exclude(RSET_GPR, dest));
emit_u32(as, irt_toitype(ir->t) << 15); if (irt_is64(ir->t)) {
emit_rmro(as, XO_ARITHi, XOg_OR, dest, 4); emit_u32(as, irt_toitype(ir->t) << 15);
} else { emit_rmro(as, XO_ARITHi, XOg_OR, dest, 4);
/* Currently, no caller passes integers that might end up here. */ } else {
emit_movmroi(as, dest, 4, (irt_toitype(ir->t) << 15)); emit_movmroi(as, dest, 4, (irt_toitype(ir->t) << 15));
}
emit_movtomro(as, REX_64IR(ir, src), dest, 0);
} }
emit_movtomro(as, REX_64IR(ir, src), dest, 0);
}
#else #else
if (!irref_isk(ref)) { if (!irref_isk(ref)) {
Reg src = ra_alloc1(as, ref, rset_exclude(RSET_GPR, dest)); Reg src = ra_alloc1(as, ref, rset_exclude(RSET_GPR, dest));
emit_movtomro(as, REX_64IR(ir, src), dest, 0); emit_movtomro(as, REX_64IR(ir, src), dest, 0);
} else if (!irt_ispri(ir->t)) { } else if (!irt_ispri(ir->t)) {
emit_movmroi(as, dest, 0, ir->i); emit_movmroi(as, dest, 0, ir->i);
} }
if (!(LJ_64 && irt_islightud(ir->t))) if (!(LJ_64 && irt_islightud(ir->t)))
emit_movmroi(as, dest, 4, irt_toitype(ir->t)); emit_movmroi(as, dest, 4, irt_toitype(ir->t));
#endif #endif
emit_loada(as, dest, &J2G(as->J)->tmptv); }
} }
emit_loada(as, dest, &J2G(as->J)->tmptv); /* g->tmptv holds the TValue(s). */
} }
static void asm_aref(ASMState *as, IRIns *ir) static void asm_aref(ASMState *as, IRIns *ir)

6
src/lj_ir.h
View File

@ -95,6 +95,7 @@
_(UREFO, LW, ref, lit) \ _(UREFO, LW, ref, lit) \
_(UREFC, LW, ref, lit) \ _(UREFC, LW, ref, lit) \
_(FREF, R , ref, lit) \ _(FREF, R , ref, lit) \
_(TMPREF, S , ref, lit) \
_(STRREF, N , ref, ref) \ _(STRREF, N , ref, ref) \
_(LREF, L , ___, ___) \ _(LREF, L , ___, ___) \
\ \
@ -218,6 +219,11 @@ IRFLDEF(FLENUM)
IRFL__MAX IRFL__MAX
} IRFieldID; } IRFieldID;
/* TMPREF mode bits, stored in op2. */
#define IRTMPREF_IN1 0x01 /* First input value. */
#define IRTMPREF_OUT1 0x02 /* First output value. */
#define IRTMPREF_OUT2 0x04 /* Second output value. */
/* SLOAD mode bits, stored in op2. */ /* SLOAD mode bits, stored in op2. */
#define IRSLOAD_PARENT 0x01 /* Coalesce with parent trace. */ #define IRSLOAD_PARENT 0x01 /* Coalesce with parent trace. */
#define IRSLOAD_FRAME 0x02 /* Load 32 bits of ftsz. */ #define IRSLOAD_FRAME 0x02 /* Load 32 bits of ftsz. */

1
src/lj_opt_fold.c
View File

@ -2421,6 +2421,7 @@ LJFOLD(XSTORE any any)
LJFOLDX(lj_opt_dse_xstore) LJFOLDX(lj_opt_dse_xstore)
LJFOLD(NEWREF any any) /* Treated like a store. */ LJFOLD(NEWREF any any) /* Treated like a store. */
LJFOLD(TMPREF any any)
LJFOLD(CALLA any any) LJFOLD(CALLA any any)
LJFOLD(CALLL any any) /* Safeguard fallback. */ LJFOLD(CALLL any any) /* Safeguard fallback. */
LJFOLD(CALLS any any) LJFOLD(CALLS any any)

2
src/lj_opt_split.c
View File

@ -645,7 +645,7 @@ static void split_ir(jit_State *J)
tmp = split_emit(J, IRT(IR_CARG, IRT_NIL), hisubst[op1], oir[op1].prev); tmp = split_emit(J, IRT(IR_CARG, IRT_NIL), hisubst[op1], oir[op1].prev);
#endif #endif
ir->prev = split_emit(J, IRTI(IR_CALLN), tmp, IRCALL_lj_vm_tobit); ir->prev = split_emit(J, IRTI(IR_CALLN), tmp, IRCALL_lj_vm_tobit);
} else if (ir->o == IR_TOSTR) { } else if (ir->o == IR_TOSTR || ir->o == IR_TMPREF) {
if (hisubst[ir->op1]) { if (hisubst[ir->op1]) {
if (irref_isk(ir->op1)) if (irref_isk(ir->op1))
nir->op1 = ir->op1; nir->op1 = ir->op1;

15
src/lj_record.c
View File

@ -259,6 +259,14 @@ TRef lj_record_constify(jit_State *J, cTValue *o)
return 0; /* Can't represent lightuserdata (pointless). */ return 0; /* Can't represent lightuserdata (pointless). */
} }
/* Emit a VLOAD with the correct type. */
TRef lj_record_vload(jit_State *J, TRef ref, IRType t)
{
TRef tr = emitir(IRTG(IR_VLOAD, t), ref, 0);
if (irtype_ispri(t)) tr = TREF_PRI(t); /* Canonicalize primitives. */
return tr;
}
/* -- Record loop ops ----------------------------------------------------- */ /* -- Record loop ops ----------------------------------------------------- */
/* Loop event. */ /* Loop event. */
@ -1832,9 +1840,7 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults)
IRType t = itype2irt(&J->L->base[i-1-LJ_FR2-nvararg]); IRType t = itype2irt(&J->L->base[i-1-LJ_FR2-nvararg]);
TRef aref = emitir(IRT(IR_AREF, IRT_PGC), TRef aref = emitir(IRT(IR_AREF, IRT_PGC),
vbase, lj_ir_kint(J, (int32_t)i)); vbase, lj_ir_kint(J, (int32_t)i));
TRef tr = emitir(IRTG(IR_VLOAD, t), aref, 0); J->base[dst+i] = lj_record_vload(J, aref, t);
if (irtype_ispri(t)) tr = TREF_PRI(t); /* Canonicalize primitives. */
J->base[dst+i] = tr;
} }
} else { } else {
emitir(IRTGI(IR_LE), fr, lj_ir_kint(J, frofs)); emitir(IRTGI(IR_LE), fr, lj_ir_kint(J, frofs));
@ -1881,8 +1887,7 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults)
lj_ir_kint(J, frofs-(8<<LJ_FR2))); lj_ir_kint(J, frofs-(8<<LJ_FR2)));
t = itype2irt(&J->L->base[idx-2-LJ_FR2-nvararg]); t = itype2irt(&J->L->base[idx-2-LJ_FR2-nvararg]);
aref = emitir(IRT(IR_AREF, IRT_PGC), vbase, tridx); aref = emitir(IRT(IR_AREF, IRT_PGC), vbase, tridx);
tr = emitir(IRTG(IR_VLOAD, t), aref, 0); tr = lj_record_vload(J, aref, t);
if (irtype_ispri(t)) tr = TREF_PRI(t); /* Canonicalize primitives. */
} }
J->base[dst-2-LJ_FR2] = tr; J->base[dst-2-LJ_FR2] = tr;
J->maxslot = dst-1-LJ_FR2; J->maxslot = dst-1-LJ_FR2;

1
src/lj_record.h
View File

@ -30,6 +30,7 @@ LJ_FUNC int lj_record_objcmp(jit_State *J, TRef a, TRef b,
cTValue *av, cTValue *bv); cTValue *av, cTValue *bv);
LJ_FUNC void lj_record_stop(jit_State *J, TraceLink linktype, TraceNo lnk); LJ_FUNC void lj_record_stop(jit_State *J, TraceLink linktype, TraceNo lnk);
LJ_FUNC TRef lj_record_constify(jit_State *J, cTValue *o); LJ_FUNC TRef lj_record_constify(jit_State *J, cTValue *o);
LJ_FUNC TRef lj_record_vload(jit_State *J, TRef ref, IRType t);
LJ_FUNC void lj_record_call(jit_State *J, BCReg func, ptrdiff_t nargs); LJ_FUNC void lj_record_call(jit_State *J, BCReg func, ptrdiff_t nargs);
LJ_FUNC void lj_record_tailcall(jit_State *J, BCReg func, ptrdiff_t nargs); LJ_FUNC void lj_record_tailcall(jit_State *J, BCReg func, ptrdiff_t nargs);