From 751eff9f97d5055fb3f64405771aeee2f34696c2 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Tue, 18 Jan 2011 21:08:23 +0100
Subject: Cleanup and fix trace flush logic.
---
src/lj_gdbjit.c | 3 +--
src/lj_jit.h | 3 ++-
src/lj_record.c | 1 +
src/lj_trace.c | 50 +++++++++++++++++++++++++-------------------------
4 files changed, 29 insertions(+), 28 deletions(-)
(limited to 'src')
diff --git a/src/lj_gdbjit.c b/src/lj_gdbjit.c
index 260796ea..513954c5 100644
--- a/src/lj_gdbjit.c
+++ b/src/lj_gdbjit.c
@@ -709,8 +709,7 @@ void lj_gdbjit_addtrace(jit_State *J, GCtrace *T)
GDBJITctx ctx;
GCproto *pt = &gcref(T->startpt)->pt;
TraceNo parent = T->ir[REF_BASE].op1;
- uintptr_t pcofs = (uintptr_t)(T->snap[0].mapofs+T->snap[0].nent);
- const BCIns *startpc = snap_pc(T->snapmap[pcofs]);
+ const BCIns *startpc = mref(T->startpc, const BCIns);
ctx.T = T;
ctx.mcaddr = (uintptr_t)T->mcode;
ctx.szmcode = T->szmcode;
diff --git a/src/lj_jit.h b/src/lj_jit.h
index 55d6d0df..34f37d02 100644
--- a/src/lj_jit.h
+++ b/src/lj_jit.h
@@ -172,9 +172,10 @@ typedef struct GCtrace {
SnapShot *snap; /* Snapshot array. */
SnapEntry *snapmap; /* Snapshot map. */
GCRef startpt; /* Starting prototype. */
+ MRef startpc; /* Bytecode PC of starting instruction. */
BCIns startins; /* Original bytecode of starting instruction. */
- MCode *mcode; /* Start of machine code. */
MSize szmcode; /* Size of machine code. */
+ MCode *mcode; /* Start of machine code. */
MSize mcloop; /* Offset of loop start in machine code. */
uint16_t nchild; /* Number of child traces (root trace only). */
uint16_t spadjust; /* Stack pointer adjustment (offset in bytes). */
diff --git a/src/lj_record.c b/src/lj_record.c
index c150e2e4..4939d3af 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -1996,6 +1996,7 @@ void lj_record_setup(jit_State *J)
J->cur.nk = REF_TRUE;
J->startpc = J->pc;
+ setmref(J->cur.startpc, J->pc);
if (J->parent) { /* Side trace. */
GCtrace *T = traceref(J, J->parent);
TraceNo root = T->root ? T->root : J->parent;
diff --git a/src/lj_trace.c b/src/lj_trace.c
index 421278e1..5ab6c852 100644
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -96,8 +96,7 @@ static void perftools_addtrace(GCtrace *T)
{
static FILE *fp;
GCproto *pt = &gcref(T->startpt)->pt;
- uintptr_t pcofs = (uintptr_t)(T->snap[0].mapofs+T->snap[0].nent);
- const BCIns *startpc = snap_pc(T->snapmap[pcofs]);
+ const BCIns *startpc = mref(T->startpc, const BCIns);
const char *name = strdata(proto_chunkname(pt));
BCLine lineno;
if (name[0] == '@' || name[0] == '=')
@@ -183,34 +182,35 @@ void lj_trace_reenableproto(GCproto *pt)
static void trace_unpatch(jit_State *J, GCtrace *T)
{
BCOp op = bc_op(T->startins);
- MSize pcofs = T->snap[0].mapofs + T->snap[0].nent;
- BCIns *pc = ((BCIns *)snap_pc(T->snapmap[pcofs])) - 1;
+ BCIns *pc = mref(T->startpc, BCIns);
UNUSED(J);
- switch (op) {
- case BC_FORL:
- lua_assert(bc_op(*pc) == BC_JFORI);
- setbc_op(pc, BC_FORI); /* Unpatch JFORI, too. */
+ if (op == BC_JMP)
+ return; /* No need to unpatch branches in parent traces (yet). */
+ switch (bc_op(*pc)) {
+ case BC_JFORI:
+ lua_assert(op == BC_FORL);
+ setbc_op(pc, BC_FORI);
pc += bc_j(*pc);
lua_assert(bc_op(*pc) == BC_JFORL && traceref(J, bc_d(*pc)) == T);
*pc = T->startins;
break;
- case BC_LOOP:
- lua_assert(bc_op(*pc) == BC_JLOOP && traceref(J, bc_d(*pc)) == T);
+ case BC_JLOOP:
+ lua_assert(op == BC_LOOP || bc_isret(op));
*pc = T->startins;
break;
- case BC_ITERL:
- lua_assert(bc_op(*pc) == BC_JMP);
+ case BC_JMP:
+ lua_assert(op == BC_ITERL);
pc += bc_j(*pc)+2;
- lua_assert(bc_op(*pc) == BC_JITERL && traceref(J, bc_d(*pc)) == T);
- *pc = T->startins;
+ if (bc_op(*pc) == BC_JITERL) {
+ lua_assert(traceref(J, bc_d(*pc)) == T);
+ *pc = T->startins;
+ }
break;
- case BC_FUNCF:
- lua_assert(bc_op(*pc) == BC_JFUNCF && traceref(J, bc_d(*pc)) == T);
+ case BC_JFUNCF:
+ lua_assert(op == BC_FUNCF);
*pc = T->startins;
break;
- case BC_JMP: /* No need to unpatch branches in parent traces (yet). */
- default:
- lua_assert(0);
+ default: /* Already unpatched. */
break;
}
}
@@ -227,11 +227,11 @@ static void trace_flushroot(jit_State *J, GCtrace *T)
pt->trace = T->nextroot;
} else { /* Otherwise search in chain of root traces. */
GCtrace *T2 = traceref(J, pt->trace);
- while (T2->nextroot != T->traceno) {
- lua_assert(T2->nextroot != 0);
- T2 = traceref(J, T2->nextroot);
- }
- T2->nextroot = T->nextroot; /* Unlink from chain. */
+ for (; T2->nextroot; T2 = traceref(J, T2->nextroot))
+ if (T2->nextroot == T->traceno) {
+ T2->nextroot = T->nextroot; /* Unlink from chain. */
+ break;
+ }
}
}
@@ -408,7 +408,7 @@ static void trace_start(jit_State *J)
/* Stop tracing. */
static void trace_stop(jit_State *J)
{
- BCIns *pc = (BCIns *)J->startpc; /* Not const here. */
+ BCIns *pc = mref(J->cur.startpc, BCIns);
BCOp op = bc_op(J->cur.startins);
GCproto *pt = &gcref(J->cur.startpt)->pt;
TraceNo traceno = J->cur.traceno;
--
cgit v1.2.3-55-g6feb