aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2013-12-25 20:56:20 +0100
committerMike Pall <mike>2013-12-25 20:56:20 +0100
commitc41e65499cb66bb171f4f9c21ea4f5be3ee8aaaa (patch)
tree980bf3a2fe8e5633bd71295b84e1d1edaf0ef2c4
parentb5d741fa7e11a2a58df65f3c71489c58f8758f75 (diff)
downloadluajit-c41e65499cb66bb171f4f9c21ea4f5be3ee8aaaa.tar.gz
luajit-c41e65499cb66bb171f4f9c21ea4f5be3ee8aaaa.tar.bz2
luajit-c41e65499cb66bb171f4f9c21ea4f5be3ee8aaaa.zip
Show trailing NYI item for stitched trace with -jv.
-rw-r--r--src/jit/v.lua3
-rw-r--r--src/lj_trace.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/jit/v.lua b/src/jit/v.lua
index 22bee3ff..6dd7f179 100644
--- a/src/jit/v.lua
+++ b/src/jit/v.lua
@@ -116,6 +116,9 @@ local function dump_trace(what, tr, func, pc, otr, oex)
116 if ltype == "interpreter" then 116 if ltype == "interpreter" then
117 out:write(format("[TRACE %3s %s%s -- fallback to interpreter]\n", 117 out:write(format("[TRACE %3s %s%s -- fallback to interpreter]\n",
118 tr, startex, startloc)) 118 tr, startex, startloc))
119 elseif ltype == "stitch" then
120 out:write(format("[TRACE %3s %s%s %s %s]\n",
121 tr, startex, startloc, ltype, fmtfunc(func, pc)))
119 elseif link == tr or link == 0 then 122 elseif link == tr or link == 0 then
120 out:write(format("[TRACE %3s %s%s %s]\n", 123 out:write(format("[TRACE %3s %s%s %s]\n",
121 tr, startex, startloc, ltype)) 124 tr, startex, startloc, ltype))
diff --git a/src/lj_trace.c b/src/lj_trace.c
index fa15e23d..7cc9844e 100644
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -473,6 +473,7 @@ static void trace_stop(jit_State *J)
473 lj_vmevent_send(L, TRACE, 473 lj_vmevent_send(L, TRACE,
474 setstrV(L, L->top++, lj_str_newlit(L, "stop")); 474 setstrV(L, L->top++, lj_str_newlit(L, "stop"));
475 setintV(L->top++, traceno); 475 setintV(L->top++, traceno);
476 setfuncV(L, L->top++, J->fn);
476 ); 477 );
477} 478}
478 479