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

Generalize handling of stack checks indicated by highest exit + 1.

Browse Source
This commit is contained in:
Mike Pall 2011-10-24 16:02:37 +02:00
parent 84683405fb
commit a0d7827554
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lj_asm.c
View File

@ -1357,9 +1357,15 @@ static void asm_head_side(ASMState *as)
/* Inherit top stack slot already checked by parent trace. */ /* Inherit top stack slot already checked by parent trace. */
as->T->topslot = as->parent->topslot; as->T->topslot = as->parent->topslot;
if (as->topslot > as->T->topslot) { /* Need to check for higher slot? */ if (as->topslot > as->T->topslot) { /* Need to check for higher slot? */
as->T->topslot = (uint8_t)as->topslot; /* Remember for child traces. */ #ifdef EXITSTATE_CHECKEXIT
/* Highest exit + 1 indicates stack check. */
ExitNo exitno = as->T->nsnap;
#else
/* Reuse the parent exit in the context of the parent trace. */ /* Reuse the parent exit in the context of the parent trace. */
asm_stack_check(as, as->topslot, irp, allow & RSET_GPR, as->J->exitno); ExitNo exitno = as->J->exitno;
#endif
as->T->topslot = (uint8_t)as->topslot; /* Remember for child traces. */
asm_stack_check(as, as->topslot, irp, allow & RSET_GPR, exitno);
} }
} }

1
src/lj_asm_arm.h
View File

@ -1418,7 +1418,6 @@ static void asm_stack_check(ASMState *as, BCReg topslot,
Reg pbase; Reg pbase;
uint32_t k; uint32_t k;
if (irp) { if (irp) {
exitno = as->T->nsnap; /* Highest exit + 1 indicates stack check. */
if (ra_hasreg(irp->r)) { if (ra_hasreg(irp->r)) {
pbase = irp->r; pbase = irp->r;
} else if (allow) { } else if (allow) {

2
src/lj_target_arm.h
View File

@ -117,6 +117,8 @@ typedef struct {
/* PC after instruction that caused an exit. Used to find the trace number. */ /* PC after instruction that caused an exit. Used to find the trace number. */
#define EXITSTATE_PCREG RID_PC #define EXITSTATE_PCREG RID_PC
/* Highest exit + 1 indicates stack check. */
#define EXITSTATE_CHECKEXIT 1
#define EXITSTUB_SPACING 4 #define EXITSTUB_SPACING 4
#define EXITSTUBS_PER_GROUP 32 #define EXITSTUBS_PER_GROUP 32

21
src/lj_trace.c
View File

@ -727,15 +727,9 @@ static TraceNo trace_exit_find(jit_State *J, MCode *pc)
TraceNo traceno; TraceNo traceno;
for (traceno = 1; traceno < J->sizetrace; traceno++) { for (traceno = 1; traceno < J->sizetrace; traceno++) {
GCtrace *T = traceref(J, traceno); GCtrace *T = traceref(J, traceno);
if (T && pc >= T->mcode && pc < (MCode *)((char *)T->mcode + T->szmcode)) { if (T && pc >= T->mcode && pc < (MCode *)((char *)T->mcode + T->szmcode))
if (J->exitno == T->nsnap) { /* Treat stack check like a parent exit. */
lua_assert(T->root != 0);
traceno = T->ir[REF_BASE].op1;
J->exitno = T->ir[REF_BASE].op2;
}
return traceno; return traceno;
} }
}
lua_assert(0); lua_assert(0);
return 0; return 0;
} }
@ -751,11 +745,20 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
int errcode; int errcode;
const BCIns *pc; const BCIns *pc;
void *cf; void *cf;
GCtrace *T;
#ifdef EXITSTATE_PCREG #ifdef EXITSTATE_PCREG
J->parent = trace_exit_find(J, (MCode *)(intptr_t)ex->gpr[EXITSTATE_PCREG]); J->parent = trace_exit_find(J, (MCode *)(intptr_t)ex->gpr[EXITSTATE_PCREG]);
#endif #endif
lua_assert(traceref(J, J->parent) != NULL && T = traceref(J, J->parent); UNUSED(T);
J->exitno < traceref(J, J->parent)->nsnap); #ifdef EXITSTATE_CHECKEXIT
if (J->exitno == T->nsnap) { /* Treat stack check like a parent exit. */
lua_assert(T->root != 0);
J->exitno = T->ir[REF_BASE].op2;
J->parent = T->ir[REF_BASE].op1;
T = traceref(J, J->parent);
}
#endif
lua_assert(T != NULL && J->exitno < T->nsnap);
exd.J = J; exd.J = J;
exd.exptr = exptr; exd.exptr = exptr;
errcode = lj_vm_cpcall(L, NULL, &exd, trace_exit_cp); errcode = lj_vm_cpcall(L, NULL, &exd, trace_exit_cp);