diff options
| author | Mike Pall <mike> | 2016-07-17 14:38:26 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-07-17 14:38:26 +0200 |
| commit | 37b377dedf000cb78730feff1035d439d04ce09e (patch) | |
| tree | 65f110c3396e0e7bc607287a54ff9b3f90d308a6 /src/jit/dump.lua | |
| parent | 01e4754962130dc85802a9738707d7fdb76c879c (diff) | |
| parent | 1914de71c7dc10c502ecf033c63665eb6d3e6433 (diff) | |
| download | luajit-37b377dedf000cb78730feff1035d439d04ce09e.tar.gz luajit-37b377dedf000cb78730feff1035d439d04ce09e.tar.bz2 luajit-37b377dedf000cb78730feff1035d439d04ce09e.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/jit/dump.lua')
| -rw-r--r-- | src/jit/dump.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/jit/dump.lua b/src/jit/dump.lua index a635af10..1eca12a8 100644 --- a/src/jit/dump.lua +++ b/src/jit/dump.lua | |||
| @@ -63,9 +63,9 @@ local traceinfo, traceir, tracek = jutil.traceinfo, jutil.traceir, jutil.tracek | |||
| 63 | local tracemc, tracesnap = jutil.tracemc, jutil.tracesnap | 63 | local tracemc, tracesnap = jutil.tracemc, jutil.tracesnap |
| 64 | local traceexitstub, ircalladdr = jutil.traceexitstub, jutil.ircalladdr | 64 | local traceexitstub, ircalladdr = jutil.traceexitstub, jutil.ircalladdr |
| 65 | local bit = require("bit") | 65 | local bit = require("bit") |
| 66 | local band, shl, shr, tohex = bit.band, bit.lshift, bit.rshift, bit.tohex | 66 | local band, shr, tohex = bit.band, bit.rshift, bit.tohex |
| 67 | local sub, gsub, format = string.sub, string.gsub, string.format | 67 | local sub, gsub, format = string.sub, string.gsub, string.format |
| 68 | local byte, char, rep = string.byte, string.char, string.rep | 68 | local byte, rep = string.byte, string.rep |
| 69 | local type, tostring = type, tostring | 69 | local type, tostring = type, tostring |
| 70 | local stdout, stderr = io.stdout, io.stderr | 70 | local stdout, stderr = io.stdout, io.stderr |
| 71 | 71 | ||
| @@ -213,7 +213,7 @@ local colortype_ansi = { | |||
| 213 | "\027[35m%s\027[m", | 213 | "\027[35m%s\027[m", |
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | local function colorize_text(s, t) | 216 | local function colorize_text(s) |
| 217 | return s | 217 | return s |
| 218 | end | 218 | end |
| 219 | 219 | ||
