make selftest() work

lib/luajit/src/jit/dump.lua

@@ -75,9 +75,6 @@ local bcline, disass
 -- Active flag, output file handle and dump mode.
 local active, out, dumpmode
 
--- Information about traces that is remembered for future reference.
-local info = {}
-
 ------------------------------------------------------------------------------
 
 local symtabmt = { __index = false }
@@ -553,7 +550,6 @@ local function dump_trace(what, tr, func, pc, otr, oex)
     if dumpmode.m then dump_mcode(tr) end
   end
   if what == "start" then
-    info[tr] = { func = func, pc = pc, otr = otr, oex = oex }
     if dumpmode.H then out:write('<pre class="ljdump">\n') end
     out:write("---- TRACE ", tr, " ", what)
     if otr then out:write(" ", otr, "/", oex) end
@@ -706,7 +702,6 @@ end
 return {
   on = dumpon,
   off = dumpoff,
-  start = dumpon, -- For -j command line option.
-  info = info
+  start = dumpon -- For -j command line option.
 }
 

lib/luajit/src/jit/p.lua

@@ -36,7 +36,6 @@
 --   G  Produce raw output suitable for graphical tools (e.g. flame graphs).
 --   m<number> Minimum sample percentage to be shown. Default: 3.
 --   i<number> Sampling interval in milliseconds. Default: 10.
---   S[<string>] Events source if performace events are enabled
 --
 ----------------------------------------------------------------------------
 
@@ -45,8 +44,6 @@ local jit = require("jit")
 assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
 local profile = require("jit.profile")
 local vmdef = require("jit.vmdef")
-local jutil = require("jit.util")
-local dump = require("jit.dump")
 local math = math
 local pairs, ipairs, tonumber, floor = pairs, ipairs, tonumber, math.floor
 local sort, format = table.sort, string.format
@@ -77,38 +74,7 @@ local function prof_cb(th, samples, vmmode)
   -- Collect keys for sample.
   if prof_states then
     if prof_states == "v" then
-      if map_vmmode[vmmode] then
-        key_state = map_vmmode[vmmode]
-      else
-         -- Sampling a trace: make an understandable one-line description.
-         local tr = tonumber(vmmode)
-         local info = jutil.traceinfo(tr)
-         local extra = dump.info[tr]
-         -- Show the parent of this trace (if this is a side trace)
-         local parent = ""
-         if extra and extra.otr and extra.oex then
-            parent = "("..extra.otr.."/"..extra.oex..")"
-         end
-         -- Show what the end of the trace links to (e.g. loop or other trace)
-         local lnk = ""
-         local link, ltype = info.link, info.linktype
-         if     link == tr or link == 0 then lnk = "->"..ltype
-         elseif ltype == "root"         then lnk = "->"..link
-         else                                lnk = "->"..link.." "..ltype end
-         -- Show the current zone (if zone profiling is enabled)
-         local z = ""
-         if zone and zone:get() then
-            z = (" %-16s"):format(zone:get())
-         end
-         -- Show the source location where the trace starts
-         local loc = ""
-         if extra and extra.func then
-            local fi = jutil.funcinfo(extra.func, extra.pc)
-            if fi.loc then loc = fi.loc end
-         end
-         local s = ("TRACE %3d %-8s %-10s%s %s"):format(vmmode, parent, lnk, z, loc)
-         key_state = map_vmmode[vmmode] or s
-      end
+      key_state = map_vmmode[vmmode] or vmmode
     else
       key_state = zone:get() or "(none)"
     end
@@ -277,18 +243,15 @@ end
 -- Start profiling.
 local function prof_start(mode)
   local interval = ""
-  mode = mode:gsub("i%d+", function(s) interval = s; return "" end)
+  mode = mode:gsub("i%d*", function(s) interval = s; return "" end)
   prof_min = 3
   mode = mode:gsub("m(%d+)", function(s) prof_min = tonumber(s); return "" end)
   prof_depth = 1
   mode = mode:gsub("%-?%d+", function(s) prof_depth = tonumber(s); return "" end)
-  local flavour = "S[vanilla]"
-  mode = mode:gsub("S%[.+%]", function(s) flavour = s; return "" end)
-
   local m = {}
   for c in mode:gmatch(".") do m[c] = c end
-  prof_states = m.v or m.z
-  if m.z == "z" then zone = require("jit.zone") end
+  prof_states = m.z or m.v
+  if prof_states == "z" then zone = require("jit.zone") end
   local scope = m.l or m.f or m.F or (prof_states and "" or "f")
   local flags = (m.p or "")
   prof_raw = m.r
@@ -322,7 +285,7 @@ local function prof_start(mode)
   prof_count1 = {}
   prof_count2 = {}
   prof_samples = 0
-  profile.start(scope:lower()..interval..flavour, prof_cb)
+  profile.start(scope:lower()..interval, prof_cb)
   prof_ud = newproxy(true)
   getmetatable(prof_ud).__gc = prof_finish
 end

lib/luajit/src/lib_jit.c

@@ -299,9 +299,6 @@ LJLIB_CF(jit_util_traceinfo)
     setintfield(L, t, "nk", REF_BIAS - (int32_t)T->nk);
     setintfield(L, t, "link", T->link);
     setintfield(L, t, "nexit", T->nsnap);
-    setintfield(L, t, "szmcode", T->szmcode);
-    setintfield(L, t, "mcode", (int32_t)(intptr_t)T->mcode);
-    setintfield(L, t, "mcloop", T->mcloop);
     setstrV(L, L->top++, lj_str_newz(L, jit_trlinkname[T->linktype]));
     lua_setfield(L, -2, "linktype");
     /* There are many more fields. Add them only when needed. */
@@ -558,10 +555,7 @@ static void jit_profile_callback(lua_State *L2, lua_State *L, int samples,
     setfuncV(L2, L2->top++, funcV(tv));
     setthreadV(L2, L2->top++, L);
     setintV(L2->top++, samples);
-    if (vmstate >= 256)
-      setintV(L2->top++, vmstate-256);
-    else
-      setstrV(L2, L2->top++, lj_str_new(L2, &vmst, 1));
+    setstrV(L2, L2->top++, lj_str_new(L2, &vmst, 1));
     status = lua_pcall(L2, 3, 0, 0);  /* callback(thread, samples, vmstate) */
     if (status) {
       if (G(L2)->panic) G(L2)->panic(L2);