DynASM/ARM: Fix conditional VFP instruction encoding.

diff --git a/dynasm/dasm_arm.lua b/dynasm/dasm_arm.lua
index 11701691f111574ff34be4ee3d29cb8b45663d9f..8984aab2bca5681c332b475f3869aec9f9a7fb1b 100644 (file)
--- 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 })