diff options
-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) | |||
1106 | local cv = map_cond[cc] | 1106 | local cv = map_cond[cc] |
1107 | if cv then | 1107 | if cv then |
1108 | local v = rawget(t, k1..k2) | 1108 | local v = rawget(t, k1..k2) |
1109 | if type(v) == "string" then return format("%x%s", cv, sub(v, 2)) end | 1109 | if type(v) == "string" then |
1110 | local scv = format("%x", cv) | ||
1111 | return gsub(scv..sub(v, 2), "|e", "|"..scv) | ||
1112 | end | ||
1110 | end | 1113 | end |
1111 | end }) | 1114 | end }) |
1112 | setmetatable(map_def, { __index = map_archdef }) | 1115 | setmetatable(map_def, { __index = map_archdef }) |