From: Mike Pall <mike>
Date: Mon, 15 Oct 2012 14:52:18 +0000 (+0200)
Subject: DynASM/ARM: Fix conditional VFP instruction encoding.
X-Git-Tag: v2.0.0-beta11~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=894d2d6ef4bf50a7c355e49e4508de5d07edad2d;p=thirdparty%2FLuaJIT.git

DynASM/ARM: Fix conditional VFP instruction encoding.
---

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 })