aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dynasm/dasm_arm.lua2
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 })