From 20e4c529458fa42ef6651a0042e3955723ee20c2 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Thu, 10 Jan 2019 12:28:24 +0100 Subject: [PATCH 1/2] DynASM/PPC: Fix shadowed variable. Cleanup only, bug cannot trigger. Thanks to Domingo Alvarez Duarte. --- dynasm/dasm_ppc.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dynasm/dasm_ppc.lua b/dynasm/dasm_ppc.lua index 4e1656e3..77031fb2 100644 --- a/dynasm/dasm_ppc.lua +++ b/dynasm/dasm_ppc.lua @@ -1056,9 +1056,9 @@ map_op[".template__"] = function(params, template, nparams) elseif p == "M" then op = op + parse_shiftmask(params[n], false); n = n + 1 elseif p == "J" or p == "K" then - local mode, n, s = parse_label(params[n], false) - if p == "K" then n = n + 2048 end - waction("REL_"..mode, n, s, 1) + local mode, m, s = parse_label(params[n], false) + if p == "K" then m = m + 2048 end + waction("REL_"..mode, m, s, 1) n = n + 1 elseif p == "0" then if band(shr(op, rs), 31) == 0 then werror("cannot use r0") end From 5c911998a3c85d024a8006feafc68d0b4c962fd8 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Thu, 10 Jan 2019 12:32:08 +0100 Subject: [PATCH 2/2] DynASM/MIPS: Fix shadowed variable. Cleanup only, bug cannot trigger. Thanks to Domingo Alvarez Duarte. --- dynasm/dasm_mips.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dynasm/dasm_mips.lua b/dynasm/dasm_mips.lua index 8e250cef..af530427 100644 --- a/dynasm/dasm_mips.lua +++ b/dynasm/dasm_mips.lua @@ -757,9 +757,9 @@ map_op[".template__"] = function(params, template, nparams) elseif p == "X" then op = op + parse_index(params[n]); n = n + 1 elseif p == "B" or p == "J" then - local mode, n, s = parse_label(params[n], false) - if p == "B" then n = n + 2048 end - waction("REL_"..mode, n, s, 1) + local mode, m, s = parse_label(params[n], false) + if p == "B" then m = m + 2048 end + waction("REL_"..mode, m, s, 1) n = n + 1 elseif p == "A" then op = op + parse_imm(params[n], 5, 6, 0, false); n = n + 1