diff options
| author | Mike Pall <mike> | 2011-04-04 01:39:19 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2011-04-04 01:39:19 +0200 |
| commit | 33bab1f76c14f01a7ad97fd2312524511c1a39a3 (patch) | |
| tree | c0746746229ce353368c0afff6f7126f455dfb04 | |
| parent | 2138df2662795b64065c62c66c867f2a06e780db (diff) | |
| download | luajit-33bab1f76c14f01a7ad97fd2312524511c1a39a3.tar.gz luajit-33bab1f76c14f01a7ad97fd2312524511c1a39a3.tar.bz2 luajit-33bab1f76c14f01a7ad97fd2312524511c1a39a3.zip | |
ARM: Don't conditionalize non-opcodes in DynASM.
| -rw-r--r-- | dynasm/dasm_arm.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dynasm/dasm_arm.lua b/dynasm/dasm_arm.lua index 780cb29c..243cfe90 100644 --- a/dynasm/dasm_arm.lua +++ b/dynasm/dasm_arm.lua | |||
| @@ -924,7 +924,7 @@ function _M.mergemaps(map_coreop, map_def) | |||
| 924 | local cv = map_cond[cc] | 924 | local cv = map_cond[cc] |
| 925 | if cv then | 925 | if cv then |
| 926 | local v = rawget(t, sub(k, 1, -5)..sub(k, -2)) | 926 | local v = rawget(t, sub(k, 1, -5)..sub(k, -2)) |
| 927 | if v then return format("%x%s", cv, sub(v, 2)) end | 927 | if type(v) == "string" then return format("%x%s", cv, sub(v, 2)) end |
| 928 | end | 928 | end |
| 929 | end }) | 929 | end }) |
| 930 | setmetatable(map_def, { __index = map_archdef }) | 930 | setmetatable(map_def, { __index = map_archdef }) |