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/dis_arm.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/dis_arm.lua')
| -rw-r--r-- | src/jit/dis_arm.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jit/dis_arm.lua b/src/jit/dis_arm.lua index 1296d816..5d2cdbda 100644 --- a/src/jit/dis_arm.lua +++ b/src/jit/dis_arm.lua | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | local type = type | 13 | local type = type |
| 14 | local sub, byte, format = string.sub, string.byte, string.format | 14 | local sub, byte, format = string.sub, string.byte, string.format |
| 15 | local match, gmatch, gsub = string.match, string.gmatch, string.gsub | 15 | local match, gmatch = string.match, string.gmatch |
| 16 | local concat = table.concat | 16 | local concat = table.concat |
| 17 | local bit = require("bit") | 17 | local bit = require("bit") |
| 18 | local band, bor, ror, tohex = bit.band, bit.bor, bit.ror, bit.tohex | 18 | local band, bor, ror, tohex = bit.band, bit.bor, bit.ror, bit.tohex |