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

Report parent of stitched trace.

Browse Source 
Thanks to Nick Zavaritsky.
This commit is contained in:
Mike Pall 2016-11-13 20:03:01 +01:00
parent 716f2daef8
commit 7a58a8fb3d
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jit/dump.lua
View File

@ -556,7 +556,7 @@ local function dump_trace(what, tr, func, pc, otr, oex)
if what == "start" then if what == "start" then
if dumpmode.H then out:write('<pre class="ljdump">\n') end if dumpmode.H then out:write('<pre class="ljdump">\n') end
out:write("---- TRACE ", tr, " ", what) out:write("---- TRACE ", tr, " ", what)
if otr then out:write(" ", otr, "/", oex) end if otr then out:write(" ", otr, "/", oex == -1 and "stitch" or oex) end
out:write(" ", fmtfunc(func, pc), "\n") out:write(" ", fmtfunc(func, pc), "\n")
elseif what == "stop" or what == "abort" then elseif what == "stop" or what == "abort" then
out:write("---- TRACE ", tr, " ", what) out:write("---- TRACE ", tr, " ", what)

2
src/jit/v.lua
View File

@ -99,7 +99,7 @@ end
local function dump_trace(what, tr, func, pc, otr, oex) local function dump_trace(what, tr, func, pc, otr, oex)
if what == "start" then if what == "start" then
startloc = fmtfunc(func, pc) startloc = fmtfunc(func, pc)
startex = otr and "("..otr.."/"..oex..") " or "" startex = otr and "("..otr.."/"..(oex == -1 and "stitch" or oex)..") " or ""
else else
if what == "abort" then if what == "abort" then
local loc = fmtfunc(func, pc) local loc = fmtfunc(func, pc)

6
src/lj_trace.c
View File

@ -446,6 +446,12 @@ static void trace_start(jit_State *J)
if (J->parent) { if (J->parent) {
setintV(L->top++, J->parent); setintV(L->top++, J->parent);
setintV(L->top++, J->exitno); setintV(L->top++, J->exitno);
} else {
BCOp op = bc_op(*J->pc);
if (op == BC_CALLM || op == BC_CALL || op == BC_ITERC) {
setintV(L->top++, J->exitno); /* Parent of stitched trace. */
setintV(L->top++, -1);
}
} }
); );
lj_record_setup(J); lj_record_setup(J);