This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[committed] MIPS16/opcodes: Correct I64/SDRASP opcode's ISA membership
- From: "Maciej W. Rozycki" <macro at imgtec dot com>
- To: <binutils at sourceware dot org>
- Date: Tue, 20 Dec 2016 12:09:50 +0000
- Subject: [committed] MIPS16/opcodes: Correct I64/SDRASP opcode's ISA membership
- Authentication-results: sourceware.org; auth=none
Limit the `SD ra, offset(sp)' instruction (I64/SDRASP major/minor
opcode) to the MIPS III rather than MIPS I ISA. This is a 64-bit
instruction requiring a 64-bit ISA. This bug has been there since
forever.
opcodes/
* mips16-opc.c (mips16_opcodes): Set membership to I3 rather
than I1 for the SP-relative "sd"/$ra entry (SDRASP minor
opcode).
gas/
* testsuite/gas/mips/mips16-sdrasp.d: New test.
* testsuite/gas/mips/mips16-sdrasp.l: New stderr output.
* testsuite/gas/mips/mips16-sdrasp.s: New test source.
* testsuite/gas/mips/mips.exp: Run the new test.
---
binutils-mips16-opcodes-sdrasp-isa.diff
Index: binutils/gas/testsuite/gas/mips/mips.exp
===================================================================
--- binutils.orig/gas/testsuite/gas/mips/mips.exp 2016-12-19 21:39:18.105141761 +0000
+++ binutils/gas/testsuite/gas/mips/mips.exp 2016-12-19 21:39:59.127069698 +0000
@@ -1313,6 +1313,7 @@ if { [istarget mips*-*-vxworks*] } {
run_dump_test "mips16-intermix"
run_dump_test "mips16-extend"
run_dump_test "mips16-sprel-swap"
+ run_dump_test "mips16-sdrasp"
run_dump_test "mips16-branch-unextended-1"
run_dump_test "mips16-branch-unextended-2"
Index: binutils/gas/testsuite/gas/mips/mips16-sdrasp.d
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ binutils/gas/testsuite/gas/mips/mips16-sdrasp.d 2016-12-19 21:39:26.000000000 +0000
@@ -0,0 +1,3 @@
+#name: MIPS16 SDRASP opcode with 32-bit ISA
+#as: -32 -march=mips1
+#error-output: mips16-sdrasp.l
Index: binutils/gas/testsuite/gas/mips/mips16-sdrasp.l
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ binutils/gas/testsuite/gas/mips/mips16-sdrasp.l 2016-12-19 21:39:26.000000000 +0000
@@ -0,0 +1,2 @@
+.*: Assembler messages:
+.*:3: Error: opcode not supported on this processor: mips1 \(mips1\) `sd \$31,0\(\$29\)'
Index: binutils/gas/testsuite/gas/mips/mips16-sdrasp.s
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ binutils/gas/testsuite/gas/mips/mips16-sdrasp.s 2016-12-19 21:39:26.000000000 +0000
@@ -0,0 +1,7 @@
+ .set mips16
+foo:
+ sd $31, 0($29)
+
+# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
+ .align 4, 0
+ .space 16
Index: binutils/opcodes/mips16-opc.c
===================================================================
--- binutils.orig/opcodes/mips16-opc.c 2016-12-19 09:44:21.305849477 +0000
+++ binutils/opcodes/mips16-opc.c 2016-12-19 21:39:59.114838806 +0000
@@ -322,7 +322,7 @@ const struct mips_opcode mips16_opcodes[
{"sb", "y,5(x)", 0xc000, 0xf800, RD_1|RD_3, 0, I1, 0, 0 },
{"sd", "y,D(x)", 0x7800, 0xf800, RD_1|RD_3, 0, I3, 0, 0 },
{"sd", "y,D(S)", 0xf900, 0xff00, RD_1, RD_SP, I3, 0, 0 },
-{"sd", "R,C(S)", 0xfa00, 0xff00, 0, RD_31|RD_SP, I1, 0, 0 },
+{"sd", "R,C(S)", 0xfa00, 0xff00, 0, RD_31|RD_SP, I3, 0, 0 },
{"sh", "y,H(x)", 0xc800, 0xf800, RD_1|RD_3, 0, I1, 0, 0 },
{"sllv", "y,x", 0xe804, 0xf81f, MOD_1|RD_2, 0, I1, 0, 0 },
{"sll", "x,w,<", 0x3000, 0xf803, WR_1|RD_2, 0, I1, 0, 0 },