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

Show name of NYI bytecode in -jv and -jdump.

Browse Source 
Suggested by Sergey Kaplun. #1176 #567
This commit is contained in:
Mike Pall 2024-04-19 00:12:22 +02:00
parent b8b49bf395
commit d2fe2a6d46
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jit/dump.lua
View File

@ -552,7 +552,12 @@ local recdepth = 0
local function fmterr(err, info) local function fmterr(err, info)
if type(err) == "number" then if type(err) == "number" then
if type(info) == "function" then info = fmtfunc(info) end if type(info) == "function" then info = fmtfunc(info) end
err = format(vmdef.traceerr[err], info) local fmt = vmdef.traceerr[err]
if fmt == "NYI: bytecode %s" then
local oidx = 6 * info
info = sub(vmdef.bcnames, oidx+1, oidx+6)
end
err = format(fmt, info)
end end
return err return err
end end

9
src/jit/v.lua
View File

@ -62,7 +62,7 @@ local jit = require("jit")
local jutil = require("jit.util") local jutil = require("jit.util")
local vmdef = require("jit.vmdef") local vmdef = require("jit.vmdef")
local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo
local type, format = type, string.format local type, sub, format = type, string.sub, string.format
local stdout, stderr = io.stdout, io.stderr local stdout, stderr = io.stdout, io.stderr
-- Active flag and output file handle. -- Active flag and output file handle.
@ -89,7 +89,12 @@ end
local function fmterr(err, info) local function fmterr(err, info)
if type(err) == "number" then if type(err) == "number" then
if type(info) == "function" then info = fmtfunc(info) end if type(info) == "function" then info = fmtfunc(info) end
err = format(vmdef.traceerr[err], info) local fmt = vmdef.traceerr[err]
if fmt == "NYI: bytecode %s" then
local oidx = 6 * info
info = sub(vmdef.bcnames, oidx+1, oidx+6)
end
err = format(fmt, info)
end end
return err return err
end end

2
src/lj_traceerr.h
View File

@ -13,7 +13,7 @@ TREDEF(STACKOV, "trace too deep")
TREDEF(SNAPOV, "too many snapshots") TREDEF(SNAPOV, "too many snapshots")
TREDEF(BLACKL, "blacklisted") TREDEF(BLACKL, "blacklisted")
TREDEF(RETRY, "retry recording") TREDEF(RETRY, "retry recording")
TREDEF(NYIBC, "NYI: bytecode %d") TREDEF(NYIBC, "NYI: bytecode %s")
/* Recording loop ops. */ /* Recording loop ops. */
TREDEF(LLEAVE, "leaving loop in root trace") TREDEF(LLEAVE, "leaving loop in root trace")