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

Correctly preserve snapshot #0 PC for root traces (insert NOP).

Browse Source
This commit is contained in:
Mike Pall 2012-06-08 19:22:59 +02:00
parent fad5382d21
commit 7266e27404
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lj_snap.c
View File

@ -24,6 +24,9 @@
/* Some local macros to save typing. Undef'd at the end. */ /* Some local macros to save typing. Undef'd at the end. */
#define IR(ref) (&J->cur.ir[(ref)]) #define IR(ref) (&J->cur.ir[(ref)])
/* Emit raw IR without passing through optimizations. */
#define emitir_raw(ot, a, b) (lj_ir_set(J, (ot), (a), (b)), lj_ir_emit(J))
/* -- Snapshot buffer allocation ------------------------------------------ */ /* -- Snapshot buffer allocation ------------------------------------------ */
/* Grow snapshot buffer. */ /* Grow snapshot buffer. */
@ -138,11 +141,12 @@ void lj_snap_add(jit_State *J)
(nsnap > 0 && J->cur.snap[nsnap-1].ref == J->cur.nins)) { (nsnap > 0 && J->cur.snap[nsnap-1].ref == J->cur.nins)) {
if (nsnap == 1 && J->parent == 0) { if (nsnap == 1 && J->parent == 0) {
/* But preserve snap #0 PC for root traces. */ /* But preserve snap #0 PC for root traces. */
J->mergesnap = 0; emitir_raw(IRT(IR_NOP, IRT_NIL), 0, 0);
return; goto nomerge;
} }
nsnapmap = J->cur.snap[--nsnap].mapofs; nsnapmap = J->cur.snap[--nsnap].mapofs;
} else { } else {
nomerge:
lj_snap_grow_buf(J, nsnap+1); lj_snap_grow_buf(J, nsnap+1);
J->cur.nsnap = (uint16_t)(nsnap+1); J->cur.nsnap = (uint16_t)(nsnap+1);
} }
@ -447,5 +451,6 @@ const BCIns *lj_snap_restore(jit_State *J, void *exptr)
} }
#undef IR #undef IR
#undef emitir_raw
#endif #endif