From 0e3241180f4e5e54a45e147bbedfa022d4bccb58 Mon Sep 17 00:00:00 2001 From: Michael Munday Date: Tue, 29 Nov 2016 13:45:59 -0500 Subject: [PATCH] Various cleanup of dasm_s390x.lua - Fix syntax errors - Fix whitespace (use two-space indentation to match surrounding code) --- dynasm/dasm_s390x.lua | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dynasm/dasm_s390x.lua b/dynasm/dasm_s390x.lua index f1d492c1..2ae9e594 100644 --- a/dynasm/dasm_s390x.lua +++ b/dynasm/dasm_s390x.lua @@ -1225,29 +1225,28 @@ local function parse_template(params, template, nparams, pos) local n,rs = 1,26 parse_reg_type = false - -- Process each character. (if its RX-a==> 1st iteration gets R, 2nd==X and so on) + -- Process each character. for p in gmatch(sub(template, 17), ".") do local pr1,pr2,pr3 if p == "g" then - pr1,pr2=param[n],param[n+1] - op = op + shl(parse_reg(pr1),4) + parse_reg(pr2); n = n + 1 -- not sure if we will require n later, so keeping it as it is now + pr1,pr2=param[n],param[n+1] + op = op + shl(parse_reg(pr1),4) + parse_reg(pr2); n = n + 1 -- not sure if we will require n later, so keeping it as it is now elseif p == "h" then - pr1,pr2=param[n],param[n+1] - op = op + shl(parse_reg(pr1),4) + parse_reg(pr2) + pr1,pr2=param[n],param[n+1] + op = op + shl(parse_reg(pr1),4) + parse_reg(pr2) elseif p == "j" then - op = op + shl(parse_reg(param[1],24) + shl(parse_reg(param[2],20) + shl(parse_reg(param[3]),16) + parse_number(param[4]) - -- assuming that the parameters are passes in order (R1,X2,B2,D) --only RX-a is satisfied - + op = op + shl(parse_reg(param[1]),24) + shl(parse_reg(param[2]),20) + shl(parse_reg(param[3]),16) + parse_number(param[4]) + -- assuming that the parameters are passes in order (R1,X2,B2,D) --only RX-a is satisfied elseif p == "k" then - op = op + shl(parse_reg(param[1],40) + shl(parse_reg(param[2],36) + shl(parse_reg(param[3]),32) + parse_number(param[4]) parse_number(param[5]) - -- assuming params are passed as (R1,X2,B2,DL2,DH2) + op = op + shl(parse_reg(param[1]),40) + shl(parse_reg(param[2]),36) + shl(parse_reg(param[3]),32) + parse_number(param[4]) + parse_number(param[5]) + -- assuming params are passed as (R1,X2,B2,DL2,DH2) elseif p == "l" then elseif p == "m" then elseif p == "n" then - - end + + end end wputpos(pos, op) end