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

Properly clean up state before restart of trace assembly.

Browse Source
This commit is contained in:
Mike Pall 2016-06-27 15:46:09 +02:00
parent ce30766b67
commit 01e4754962
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lj_asm.c
View File

@ -1993,12 +1993,6 @@ static void asm_setup_regsp(ASMState *as)
/* REF_BASE is used for implicit references to the BASE register. */ /* REF_BASE is used for implicit references to the BASE register. */
lastir->prev = REGSP_HINT(RID_BASE); lastir->prev = REGSP_HINT(RID_BASE);
ir = IR(nins-1);
if (ir->o == IR_RENAME) {
/* Remove any renames left over from ASM restart due to LJ_TRERR_MCODELM. */
do { ir--; nins--; } while (ir->o == IR_RENAME);
T->nins = nins;
}
as->snaprename = nins; as->snaprename = nins;
as->snapref = nins; as->snapref = nins;
as->snapno = T->nsnap; as->snapno = T->nsnap;
@ -2230,6 +2224,16 @@ void lj_asm_trace(jit_State *J, GCtrace *T)
ASMState *as = &as_; ASMState *as = &as_;
MCode *origtop; MCode *origtop;
/* Remove nops/renames left over from ASM restart due to LJ_TRERR_MCODELM. */
{
IRRef nins = T->nins;
IRIns *ir = &T->ir[nins-1];
if (ir->o == IR_NOP || ir->o == IR_RENAME) {
do { ir--; nins--; } while (ir->o == IR_NOP || ir->o == IR_RENAME);
T->nins = nins;
}
}
/* Ensure an initialized instruction beyond the last one for HIOP checks. */ /* Ensure an initialized instruction beyond the last one for HIOP checks. */
/* This also allows one RENAME to be added without reallocating curfinal. */ /* This also allows one RENAME to be added without reallocating curfinal. */
as->orignins = lj_ir_nextins(J); as->orignins = lj_ir_nextins(J);