From 33bab1f76c14f01a7ad97fd2312524511c1a39a3 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Mon, 4 Apr 2011 01:39:19 +0200
Subject: [PATCH] ARM: Don't conditionalize non-opcodes in DynASM.

---
 dynasm/dasm_arm.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
     local cv = map_cond[cc]
     if cv then
       local v = rawget(t, sub(k, 1, -5)..sub(k, -2))
-      if v then return format("%x%s", cv, sub(v, 2)) end
+      if type(v) == "string" then return format("%x%s", cv, sub(v, 2)) end
     end
   end })
   setmetatable(map_def, { __index = map_archdef })