diff options
Diffstat (limited to 'src/jit/v.lua')
-rw-r--r-- | src/jit/v.lua | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/jit/v.lua b/src/jit/v.lua index 9696f67f..e37466c6 100644 --- a/src/jit/v.lua +++ b/src/jit/v.lua | |||
@@ -59,7 +59,7 @@ | |||
59 | 59 | ||
60 | -- Cache some library functions and objects. | 60 | -- Cache some library functions and objects. |
61 | local jit = require("jit") | 61 | local jit = require("jit") |
62 | assert(jit.version_num == 20005, "LuaJIT core/library version mismatch") | 62 | assert(jit.version_num == 20100, "LuaJIT core/library version mismatch") |
63 | local jutil = require("jit.util") | 63 | local jutil = require("jit.util") |
64 | local vmdef = require("jit.vmdef") | 64 | local vmdef = require("jit.vmdef") |
65 | local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo | 65 | local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo |
@@ -99,7 +99,7 @@ end | |||
99 | local function dump_trace(what, tr, func, pc, otr, oex) | 99 | local function dump_trace(what, tr, func, pc, otr, oex) |
100 | if what == "start" then | 100 | if what == "start" then |
101 | startloc = fmtfunc(func, pc) | 101 | startloc = fmtfunc(func, pc) |
102 | startex = otr and "("..otr.."/"..oex..") " or "" | 102 | startex = otr and "("..otr.."/"..(oex == -1 and "stitch" or oex)..") " or "" |
103 | else | 103 | else |
104 | if what == "abort" then | 104 | if what == "abort" then |
105 | local loc = fmtfunc(func, pc) | 105 | local loc = fmtfunc(func, pc) |
@@ -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)) |
@@ -159,9 +162,9 @@ local function dumpon(outfile) | |||
159 | end | 162 | end |
160 | 163 | ||
161 | -- Public module functions. | 164 | -- Public module functions. |
162 | module(...) | 165 | return { |
163 | 166 | on = dumpon, | |
164 | on = dumpon | 167 | off = dumpoff, |
165 | off = dumpoff | 168 | start = dumpon -- For -j command line option. |
166 | start = dumpon -- For -j command line option. | 169 | } |
167 | 170 | ||