gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix register mask for stack check in head of side trace.

Browse Source 
Analyzed by Sergey Kaplun. #1016
This commit is contained in:
Mike Pall 2023-07-08 19:36:24 +02:00
parent 4c35a42d9c
commit b7a8c7c184
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lj_asm.c
View File

@ -1365,6 +1365,7 @@ static void asm_head_side(ASMState *as)
IRRef1 sloadins[RID_MAX]; IRRef1 sloadins[RID_MAX];
RegSet allow = RSET_ALL; /* Inverse of all coalesced registers. */ RegSet allow = RSET_ALL; /* Inverse of all coalesced registers. */
RegSet live = RSET_EMPTY; /* Live parent registers. */ RegSet live = RSET_EMPTY; /* Live parent registers. */
RegSet pallow = RSET_GPR; /* Registers needed by the parent stack check. */
IRIns *irp = &as->parent->ir[REF_BASE]; /* Parent base. */ IRIns *irp = &as->parent->ir[REF_BASE]; /* Parent base. */
int32_t spadj, spdelta; int32_t spadj, spdelta;
int pass2 = 0; int pass2 = 0;
@ -1404,6 +1405,7 @@ static void asm_head_side(ASMState *as)
sloadins[rs] = (IRRef1)i; sloadins[rs] = (IRRef1)i;
rset_set(live, rs); /* Block live parent register. */ rset_set(live, rs); /* Block live parent register. */
} }
if (!ra_hasspill(regsp_spill(rs))) rset_clear(pallow, regsp_reg(rs));
} }
/* Calculate stack frame adjustment. */ /* Calculate stack frame adjustment. */
@ -1520,7 +1522,7 @@ static void asm_head_side(ASMState *as)
ExitNo exitno = as->J->exitno; ExitNo exitno = as->J->exitno;
#endif #endif
as->T->topslot = (uint8_t)as->topslot; /* Remember for child traces. */ as->T->topslot = (uint8_t)as->topslot; /* Remember for child traces. */
asm_stack_check(as, as->topslot, irp, allow & RSET_GPR, exitno); asm_stack_check(as, as->topslot, irp, pallow, exitno);
} }
} }