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

Add lhi instruction and fix immediate parsing.

Browse Source 
We were reading immediate values as hexadecimal values, really we
want the default to be decimal unless the immediate has a '0x' prefix.
This commit is contained in:
Michael Munday 2016-12-12 14:38:55 -05:00
parent 1c7a727f4a
commit 361a298371
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dynasm/Examples/test_z_inst.c
View File

@ -190,8 +190,8 @@ static void save(dasm_State *state)
|.endmacro |.endmacro
| |
| saveregs | saveregs
| lgfi r7, 10 // 16 | lgfi r7, 0x10 // 16
| lgfi r8, 20 // 32 | lgfi r8, 0x20 // 32
| agr r2, r3 | agr r2, r3
| agr r7, r8 | agr r7, r8
| msgr r2, r7 | msgr r2, r7

31
dynasm/dasm_s390x.lua
View File

@ -459,28 +459,34 @@ local function parse_mem_l2b(arg,high_l)
return dval, lval, parse_reg(b), dact, lact return dval, lval, parse_reg(b), dact, lact
end end
local function parse_imm(arg) local function parse_imm32(imm)
local imm_val = tonumber(arg,16) local imm_val = tonumber(imm)
if imm_val then if imm_val then
if not is_int32(imm_val) then if not is_int32(imm_val) then
werror("Immediate value out of range: ", imm_val) werror("immediate value out of range: ", imm_val)
end end
wputhw(band(shr(imm_val, 16), 0xffff)); wputhw(band(shr(imm_val, 16), 0xffff))
wputhw(band(imm_val, 0xffff)); wputhw(band(imm_val, 0xffff))
elseif match(imm, "^[rfv]([1-3]?[0-9])$") or
match(imm, "^([%w_]+):(r1?[0-9])$") then
werror("expected immediate operand, got register")
else else
waction("IMM32", nil, arg) -- if we get label waction("IMM32", nil, imm) -- if we get label
end end
end end
local function parse_imm16(arg) local function parse_imm16(imm)
local imm_val = tonumber(arg,16) local imm_val = tonumber(imm)
if imm_val then if imm_val then
if not is_int16(imm_val) then if not is_int16(imm_val) then
werror("Immediate value out of range: ", imm_val) werror("immediate value out of range: ", imm_val)
end end
wputhw(imm_val) wputhw(band(imm_val, 0xffff))
elseif match(imm, "^[rfv]([1-3]?[0-9])$") or
match(imm, "^([%w_]+):(r1?[0-9])$") then
werror("expected immediate operand, got register")
else else
waction("IMM16", nil, arg) waction("IMM16", nil, imm)
end end
end end
@ -842,6 +848,7 @@ map_op = {
lgh_2 = "e30000000015l", lgh_2 = "e30000000015l",
lghr_2 = "0000b9070000h", lghr_2 = "0000b9070000h",
lhh_2 = "e300000000c4l", lhh_2 = "e300000000c4l",
lhi_2 = "0000a7080000i",
lhrl_2 = "c40500000000o", lhrl_2 = "c40500000000o",
lghrl_2 = "c40400000000o", lghrl_2 = "c40400000000o",
lfh_2 = "e300000000cal", lfh_2 = "e300000000cal",
@ -1161,7 +1168,7 @@ local function parse_template(params, template, nparams, pos)
elseif p == "n" then elseif p == "n" then
op0 = op0 + shl(parse_reg(params[1]), 4) op0 = op0 + shl(parse_reg(params[1]), 4)
wputhw(op0); wputhw(op0);
parse_imm(params[2]) parse_imm32(params[2])
elseif p == "o" then elseif p == "o" then
op0 = op0 + shl(parse_reg(params[1]), 4) op0 = op0 + shl(parse_reg(params[1]), 4)
wputhw(op0); wputhw(op0);