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

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2019-01-10 12:34:20 +01:00
commit 617f532542
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dynasm/dasm_mips.lua
View File

@ -809,9 +809,9 @@ map_op[".template__"] = function(params, template, nparams)
elseif p == "X" then elseif p == "X" then
op = op + parse_index(params[n]); n = n + 1 op = op + parse_index(params[n]); n = n + 1
elseif p == "B" or p == "J" then elseif p == "B" or p == "J" then
local mode, n, s = parse_label(params[n], false) local mode, m, s = parse_label(params[n], false)
if p == "B" then n = n + 2048 end if p == "B" then m = m + 2048 end
waction("REL_"..mode, n, s, 1) waction("REL_"..mode, m, s, 1)
n = n + 1 n = n + 1
elseif p == "A" then elseif p == "A" then
op = op + parse_imm(params[n], 5, 6, 0, false); n = n + 1 op = op + parse_imm(params[n], 5, 6, 0, false); n = n + 1

6
dynasm/dasm_ppc.lua
View File

@ -1722,9 +1722,9 @@ op_template = function(params, template, nparams)
elseif p == "M" then elseif p == "M" then
op = op + parse_shiftmask(params[n], false); n = n + 1 op = op + parse_shiftmask(params[n], false); n = n + 1
elseif p == "J" or p == "K" then elseif p == "J" or p == "K" then
local mode, n, s = parse_label(params[n], false) local mode, m, s = parse_label(params[n], false)
if p == "K" then n = n + 2048 end if p == "K" then m = m + 2048 end
waction("REL_"..mode, n, s, 1) waction("REL_"..mode, m, s, 1)
n = n + 1 n = n + 1
elseif p == "0" then elseif p == "0" then
if band(shr(op, rs), 31) == 0 then werror("cannot use r0") end if band(shr(op, rs), 31) == 0 then werror("cannot use r0") end