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

Updated the memory parsing

Browse Source 
The order matters here, so just moved displacement check to end
This commit is contained in:
niravthakkar 2017-01-05 14:48:09 +05:30 committed by GitHub
parent dcb1dd74ed
commit 206c650689
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dynasm/dasm_s390x.lua
View File

@ -329,11 +329,6 @@ local function split_memop(arg)
if b then if b then
return 0, parse_reg(x), parse_reg(b) return 0, parse_reg(x), parse_reg(b)
end end
-- Assuming that only displacement is passed, as either digit or label "45 or label1"
-- local d = match(arg,"[%w_]+")
-- if d then
-- return d, 0, 0
-- end
local reg, tailr = match(arg, "^([%w_:]+)%s*(.*)$") local reg, tailr = match(arg, "^([%w_:]+)%s*(.*)$")
if reg then if reg then
local r, tp = parse_reg(reg) local r, tp = parse_reg(reg)
@ -341,6 +336,11 @@ local function split_memop(arg)
return format(tp.ctypefmt, tailr), 0, r return format(tp.ctypefmt, tailr), 0, r
end end
end end
-- Assuming that only displacement is passed, as either digit or label "45 or label1"
local d = match(arg,"[%w_]+")
if d then
return d, 0, 0
end
-- TODO: handle values without registers? -- TODO: handle values without registers?
-- TODO: handle registers without a displacement? -- done, above ,needs to be tested -- TODO: handle registers without a displacement? -- done, above ,needs to be tested
werror("bad memory operand: "..arg) werror("bad memory operand: "..arg)