gh-mirror/mikepaul-LuaJIT
1
0
Fork 1
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-12 17:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use own buffer for LOOP substitution table.

Browse Source 
Conflicted with the use of lj_buf_cat2str() in lj_opt_fold.c.
This commit is contained in:
Mike Pall 2014-02-01 20:44:46 +01:00
parent a2abf2e098
commit b20ff7a8ac
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lj_opt_loop.c
View File

@ -254,9 +254,16 @@ static void loop_subst_snap(jit_State *J, SnapShot *osnap,
J->cur.nsnapmap = (uint16_t)(nmap - J->cur.snapmap); J->cur.nsnapmap = (uint16_t)(nmap - J->cur.snapmap);
} }
typedef struct LoopState {
jit_State *J;
IRRef1 *subst;
MSize sizesubst;
} LoopState;
/* Unroll loop. */ /* Unroll loop. */
static void loop_unroll(jit_State *J) static void loop_unroll(LoopState *lps)
{ {
jit_State *J = lps->J;
IRRef1 phi[LJ_MAX_PHI]; IRRef1 phi[LJ_MAX_PHI];
uint32_t nphi = 0; uint32_t nphi = 0;
IRRef1 *subst; IRRef1 *subst;
@ -265,12 +272,13 @@ static void loop_unroll(jit_State *J)
SnapEntry *loopmap, *psentinel; SnapEntry *loopmap, *psentinel;
IRRef ins, invar; IRRef ins, invar;
/* Use temp buffer for substitution table. /* Allocate substitution table.
** Only non-constant refs in [REF_BIAS,invar) are valid indexes. ** Only non-constant refs in [REF_BIAS,invar) are valid indexes.
** Caveat: don't call into the VM or run the GC or the buffer may be gone.
*/ */
invar = J->cur.nins; invar = J->cur.nins;
subst = (IRRef1 *)lj_buf_tmp(J->L, (invar-REF_BIAS)*sizeof(IRRef1))-REF_BIAS; lps->sizesubst = invar - REF_BIAS;
lps->subst = lj_mem_newvec(J->L, lps->sizesubst, IRRef1);
subst = lps->subst - REF_BIAS;
subst[REF_BASE] = REF_BASE; subst[REF_BASE] = REF_BASE;
/* LOOP separates the pre-roll from the loop body. */ /* LOOP separates the pre-roll from the loop body. */
@ -395,7 +403,7 @@ static void loop_undo(jit_State *J, IRRef ins, SnapNo nsnap, MSize nsnapmap)
static TValue *cploop_opt(lua_State *L, lua_CFunction dummy, void *ud) static TValue *cploop_opt(lua_State *L, lua_CFunction dummy, void *ud)
{ {
UNUSED(L); UNUSED(dummy); UNUSED(L); UNUSED(dummy);
loop_unroll((jit_State *)ud); loop_unroll((LoopState *)ud);
return NULL; return NULL;
} }
@ -405,7 +413,13 @@ int lj_opt_loop(jit_State *J)
IRRef nins = J->cur.nins; IRRef nins = J->cur.nins;
SnapNo nsnap = J->cur.nsnap; SnapNo nsnap = J->cur.nsnap;
MSize nsnapmap = J->cur.nsnapmap; MSize nsnapmap = J->cur.nsnapmap;
int errcode = lj_vm_cpcall(J->L, NULL, J, cploop_opt); LoopState lps;
int errcode;
lps.J = J;
lps.subst = NULL;
lps.sizesubst = 0;
errcode = lj_vm_cpcall(J->L, NULL, &lps, cploop_opt);
lj_mem_freevec(J2G(J), lps.subst, lps.sizesubst, IRRef1);
if (LJ_UNLIKELY(errcode)) { if (LJ_UNLIKELY(errcode)) {
lua_State *L = J->L; lua_State *L = J->L;
if (errcode == LUA_ERRRUN && tvisnumber(L->top-1)) { /* Trace error? */ if (errcode == LUA_ERRRUN && tvisnumber(L->top-1)) { /* Trace error? */