gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-08 15:34:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use real encoding names for extended mnemonics.

Browse Source
This commit is contained in:
Michael Munday 2017-01-31 15:30:54 -05:00
parent 60bc2fad2d
commit 7352e706fb
1 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dynasm/dasm_s390x.lua
View File

@ -1251,13 +1251,13 @@ for cond,c in pairs(map_cond) do
-- Extended mnemonics for branches. -- Extended mnemonics for branches.
-- TODO: replace 'B' with correct encoding. -- TODO: replace 'B' with correct encoding.
-- brc -- brc
map_op["j"..cond.."_1"] = "0000"..tohex(0xa7040000+shl(c, 20)).."w" map_op["j"..cond.."_1"] = "0000"..tohex(0xa7040000+shl(c, 20)).."RI-c"
-- brcl -- brcl
map_op["jg"..cond.."_1"] = tohex(0xc0040000+shl(c, 20)).."0000".."x" map_op["jg"..cond.."_1"] = tohex(0xc0040000+shl(c, 20)).."0000".."RIL-c"
-- bc -- bc
map_op["b"..cond.."_1"] = "0000"..tohex(0x47000000+shl(c, 20)).."y" map_op["b"..cond.."_1"] = "0000"..tohex(0x47000000+shl(c, 20)).."RX-b"
-- bcr -- bcr
map_op["b"..cond.."r_1"] = "0000"..tohex(0x0700+shl(c, 4)).."z" map_op["b"..cond.."r_1"] = "0000"..tohex(0x0700+shl(c, 4)).."RR"
end end
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- Handle opcodes defined with template strings. -- Handle opcodes defined with template strings.
@ -1271,7 +1271,10 @@ local function parse_template(params, template, nparams, pos)
-- Process each character. -- Process each character.
local p = sub(template, 13) local p = sub(template, 13)
if p == "RR" then if p == "RR" then
op2 = op2 + shl(parse_reg(params[1]),4) + parse_reg(params[2]) if #params > 1 then
op2 = op2 + shl(parse_reg(params[1]),4)
end
op2 = op2 + parse_reg(params[#params])
wputhw(op2) wputhw(op2)
elseif p == "RRE" then elseif p == "RRE" then
op2 = op2 + shl(parse_reg(params[1]),4) + parse_reg(params[2]) op2 = op2 + shl(parse_reg(params[1]),4) + parse_reg(params[2])
@ -1286,7 +1289,6 @@ local function parse_template(params, template, nparams, pos)
op2 = op2 + shl(b, 12) + d op2 = op2 + shl(b, 12) + d
wputhw(op1); wputhw(op2); wputhw(op1); wputhw(op2);
if a then a() end if a then a() end
elseif p == "RX-b" then
elseif p == "RXY-a" then elseif p == "RXY-a" then
local d, x, b, a = parse_mem_bxy(params[2]) local d, x, b, a = parse_mem_bxy(params[2])
op0 = op0 + shl(parse_reg(params[1]), 4) + x op0 = op0 + shl(parse_reg(params[1]), 4) + x
@ -1294,8 +1296,6 @@ local function parse_template(params, template, nparams, pos)
op2 = op2 + band(shr(d, 4), 0xff00) op2 = op2 + band(shr(d, 4), 0xff00)
wputhw(op0); wputhw(op1); wputhw(op2) wputhw(op0); wputhw(op1); wputhw(op2)
if a then a() end if a then a() end
elseif p == "m" then
elseif p == "RIL-a" then elseif p == "RIL-a" then
op0 = op0 + shl(parse_reg(params[1]), 4) op0 = op0 + shl(parse_reg(params[1]), 4)
wputhw(op0); wputhw(op0);
@ -1395,18 +1395,25 @@ local function parse_template(params, template, nparams, pos)
local mode, n, s = parse_label(params[2]) local mode, n, s = parse_label(params[2])
waction("REL_"..mode, n, s) waction("REL_"..mode, n, s)
elseif p == "RI-c" then elseif p == "RI-c" then
if #params > 1 then
op1 = op1 + shl(parse_num(params[1]), 4) op1 = op1 + shl(parse_num(params[1]), 4)
end
wputhw(op1) wputhw(op1)
local mode, n, s = parse_label(params[2]) local mode, n, s = parse_label(params[#params])
waction("REL_"..mode, n, s) waction("REL_"..mode, n, s)
elseif p == "RIL-c" then elseif p == "RIL-c" then
if #params > 1 then
op0 = op0 + shl(parse_num(params[1]), 4) op0 = op0 + shl(parse_num(params[1]), 4)
wputhhw(op0) end
local mode, n, s = parse_label(params[2]) wputhw(op0)
local mode, n, s = parse_label(params[#params])
waction("REL_"..mode, n, s) waction("REL_"..mode, n, s)
elseif p == "RX-b" then elseif p == "RX-b" then
local d, x, b, a = parse_mem_bx(params[2]) local d, x, b, a = parse_mem_bx(params[#params])
op1 = op1 + shl(parse_num(params[1]), 4) + x if #params > 1 then
op1 = op1 + shl(parse_num(params[1]), 4)
end
op1 = op1 + x
op2 = op2 + shl(b, 12) + d op2 = op2 + shl(b, 12) + d
wputhw(op1);wputhw(op2); wputhw(op1);wputhw(op2);
if a then a() end if a then a() end
@ -1442,23 +1449,6 @@ local function parse_template(params, template, nparams, pos)
wputhw(op1) wputhw(op1)
op2 = op2 + shl(parse_reg(params[1]),12) + shl(parse_reg(params[2]),4) + parse_reg(params[3]) op2 = op2 + shl(parse_reg(params[1]),12) + shl(parse_reg(params[2]),4) + parse_reg(params[3])
wputhw(op2) wputhw(op2)
elseif p == "w" then
local mode, n, s = parse_label(params[1])
wputhw(op1)
waction("REL_"..mode, n, s)
elseif p == "x" then
local mode, n, s = parse_label(params[1])
wputhw(op0)
waction("REL_"..mode, n, s)
elseif p == "y" then
local d, x, b, a = parse_mem_bx(params[1])
op1 = op1 + x
op2 = op2 + shl(b, 12) + d
wputhw(op1); wputhw(op2);
if a then a() end -- a() emits action.
elseif p == "z" then
op2 = op2 + parse_reg(params[1])
wputhw(op2)
elseif p == "RS-b" then elseif p == "RS-b" then
local m = parse_mask(params[2]) local m = parse_mask(params[2])
local d, b, a = parse_mem_b(params[3]) local d, b, a = parse_mem_b(params[3])