diff options
| author | Mike Pall <mike> | 2014-02-28 14:10:30 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-02-28 14:10:30 +0100 |
| commit | fd3354a9dd3c8614ed4c5d7db048feb3ec89bd7b (patch) | |
| tree | ff147bd8135c2c9c8e4aec70687d4724a7de99a0 /src/jit | |
| parent | b342b7a0ebe9ba52d7c9a148809e75e797459eae (diff) | |
| parent | e94150877da95140db47a4e58e14cc9000be273c (diff) | |
| download | luajit-fd3354a9dd3c8614ed4c5d7db048feb3ec89bd7b.tar.gz luajit-fd3354a9dd3c8614ed4c5d7db048feb3ec89bd7b.tar.bz2 luajit-fd3354a9dd3c8614ed4c5d7db048feb3ec89bd7b.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/jit')
| -rw-r--r-- | src/jit/dump.lua | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/jit/dump.lua b/src/jit/dump.lua index be6a3bcb..c9016ce5 100644 --- a/src/jit/dump.lua +++ b/src/jit/dump.lua | |||
| @@ -554,10 +554,8 @@ local function dump_trace(what, tr, func, pc, otr, oex) | |||
| 554 | out:write("---- TRACE ", tr, " ", what) | 554 | out:write("---- TRACE ", tr, " ", what) |
| 555 | if otr then out:write(" ", otr, "/", oex) end | 555 | if otr then out:write(" ", otr, "/", oex) end |
| 556 | out:write(" ", fmtfunc(func, pc), "\n") | 556 | out:write(" ", fmtfunc(func, pc), "\n") |
| 557 | recprefix = "" | ||
| 558 | elseif what == "stop" or what == "abort" then | 557 | elseif what == "stop" or what == "abort" then |
| 559 | out:write("---- TRACE ", tr, " ", what) | 558 | out:write("---- TRACE ", tr, " ", what) |
| 560 | recprefix = nil | ||
| 561 | if what == "abort" then | 559 | if what == "abort" then |
| 562 | out:write(" ", fmtfunc(func, pc), " -- ", fmterr(otr, oex), "\n") | 560 | out:write(" ", fmtfunc(func, pc), " -- ", fmterr(otr, oex), "\n") |
| 563 | else | 561 | else |