diff options
| author | Mike Pall <mike> | 2019-01-10 12:34:20 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2019-01-10 12:34:20 +0100 |
| commit | 617f53254250d28b25a58f243e51d0f3b4e9d97f (patch) | |
| tree | 73b670755e35e9d1c3cd0c59c748b91bd4245efc | |
| parent | 749e99ce2a88bf337bd2f6279940d6761ce5f616 (diff) | |
| parent | 5c911998a3c85d024a8006feafc68d0b4c962fd8 (diff) | |
| download | luajit-617f53254250d28b25a58f243e51d0f3b4e9d97f.tar.gz luajit-617f53254250d28b25a58f243e51d0f3b4e9d97f.tar.bz2 luajit-617f53254250d28b25a58f243e51d0f3b4e9d97f.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | dynasm/dasm_mips.lua | 6 | ||||
| -rw-r--r-- | dynasm/dasm_ppc.lua | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dynasm/dasm_mips.lua b/dynasm/dasm_mips.lua index 78a4e34a..bd2a2b43 100644 --- a/dynasm/dasm_mips.lua +++ b/dynasm/dasm_mips.lua | |||
| @@ -809,9 +809,9 @@ map_op[".template__"] = function(params, template, nparams) | |||
| 809 | elseif p == "X" then | 809 | elseif p == "X" then |
| 810 | op = op + parse_index(params[n]); n = n + 1 | 810 | op = op + parse_index(params[n]); n = n + 1 |
| 811 | elseif p == "B" or p == "J" then | 811 | elseif p == "B" or p == "J" then |
| 812 | local mode, n, s = parse_label(params[n], false) | 812 | local mode, m, s = parse_label(params[n], false) |
| 813 | if p == "B" then n = n + 2048 end | 813 | if p == "B" then m = m + 2048 end |
| 814 | waction("REL_"..mode, n, s, 1) | 814 | waction("REL_"..mode, m, s, 1) |
| 815 | n = n + 1 | 815 | n = n + 1 |
| 816 | elseif p == "A" then | 816 | elseif p == "A" then |
| 817 | op = op + parse_imm(params[n], 5, 6, 0, false); n = n + 1 | 817 | op = op + parse_imm(params[n], 5, 6, 0, false); n = n + 1 |
diff --git a/dynasm/dasm_ppc.lua b/dynasm/dasm_ppc.lua index f73974dd..216f9259 100644 --- a/dynasm/dasm_ppc.lua +++ b/dynasm/dasm_ppc.lua | |||
| @@ -1722,9 +1722,9 @@ op_template = function(params, template, nparams) | |||
| 1722 | elseif p == "M" then | 1722 | elseif p == "M" then |
| 1723 | op = op + parse_shiftmask(params[n], false); n = n + 1 | 1723 | op = op + parse_shiftmask(params[n], false); n = n + 1 |
| 1724 | elseif p == "J" or p == "K" then | 1724 | elseif p == "J" or p == "K" then |
| 1725 | local mode, n, s = parse_label(params[n], false) | 1725 | local mode, m, s = parse_label(params[n], false) |
| 1726 | if p == "K" then n = n + 2048 end | 1726 | if p == "K" then m = m + 2048 end |
| 1727 | waction("REL_"..mode, n, s, 1) | 1727 | waction("REL_"..mode, m, s, 1) |
| 1728 | n = n + 1 | 1728 | n = n + 1 |
| 1729 | elseif p == "0" then | 1729 | elseif p == "0" then |
| 1730 | if band(shr(op, rs), 31) == 0 then werror("cannot use r0") end | 1730 | if band(shr(op, rs), 31) == 0 then werror("cannot use r0") end |