From: Mike Pall <mike>
Date: Wed, 25 Dec 2013 19:56:20 +0000 (+0100)
Subject: Show trailing NYI item for stitched trace with -jv.
X-Git-Tag: v2.1.0-beta1~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c41e65499cb66bb171f4f9c21ea4f5be3ee8aaaa;p=thirdparty%2FLuaJIT.git

Show trailing NYI item for stitched trace with -jv.
---

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)
       if ltype == "interpreter" then
 	out:write(format("[TRACE %3s %s%s -- fallback to interpreter]\n",
 	  tr, startex, startloc))
+      elseif ltype == "stitch" then
+	out:write(format("[TRACE %3s %s%s %s %s]\n",
+	  tr, startex, startloc, ltype, fmtfunc(func, pc)))
       elseif link == tr or link == 0 then
 	out:write(format("[TRACE %3s %s%s %s]\n",
 	  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)
   lj_vmevent_send(L, TRACE,
     setstrV(L, L->top++, lj_str_newlit(L, "stop"));
     setintV(L->top++, traceno);
+    setfuncV(L, L->top++, J->fn);
   );
 }