diff options
author | Mike Pall <mike> | 2012-10-15 16:52:18 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2012-10-15 16:52:18 +0200 |
commit | 894d2d6ef4bf50a7c355e49e4508de5d07edad2d (patch) | |
tree | 4c8310c35e62d6774e41134a9b9e8d28be13368c /dynasm | |
parent | 1447ee6520a09b180a0eeffa97d8a36302c61ab9 (diff) | |
download | luajit2-894d2d6ef4bf50a7c355e49e4508de5d07edad2d.tar.gz |
DynASM/ARM: Fix conditional VFP instruction encoding.
Diffstat (limited to 'dynasm')
-rw-r--r-- | dynasm/dasm_arm.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dynasm/dasm_arm.lua b/dynasm/dasm_arm.lua index 11701691..8984aab2 100644 --- a/dynasm/dasm_arm.lua +++ b/dynasm/dasm_arm.lua @@ -1106,7 +1106,10 @@ function _M.mergemaps(map_coreop, map_def) local cv = map_cond[cc] if cv then local v = rawget(t, k1..k2) - if type(v) == "string" then return format("%x%s", cv, sub(v, 2)) end + if type(v) == "string" then + local scv = format("%x", cv) + return gsub(scv..sub(v, 2), "|e", "|"..scv) + end end end }) setmetatable(map_def, { __index = map_archdef }) |