aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-mips.c4
-rw-r--r--gas/testsuite/ChangeLog5
-rw-r--r--gas/testsuite/gas/mips/mips.exp1
-rw-r--r--gas/testsuite/gas/mips/rm7000.d14
-rw-r--r--gas/testsuite/gas/mips/rm7000.s5
6 files changed, 33 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1f02072..be60c80 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-15 Richard Sandiford <rsandifo@redhat.com>
+
+ * config/tc-mips.c (hilo_interlocks): True for CPU_RM7000.
+ (mips_cpu_info_table): Add rm7000 and rm9000 entries.
+
2003-07-15 Alan Modra <amodra@bigpond.net.au>
* config/tc-v850.c (md_assemble): When no reloc, create pcrel fixups
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 0aef575..0aa5a2a 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -336,6 +336,7 @@ static int mips_32bitmode = 0;
#define hilo_interlocks (mips_opts.arch == CPU_R4010 \
|| mips_opts.arch == CPU_VR5500 \
+ || mips_opts.arch == CPU_RM7000 \
|| mips_opts.arch == CPU_SB1 \
)
@@ -14289,7 +14290,8 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
{ "rm5231", 0, ISA_MIPS4, CPU_R5000 },
{ "rm5261", 0, ISA_MIPS4, CPU_R5000 },
{ "rm5721", 0, ISA_MIPS4, CPU_R5000 },
- { "r7000", 0, ISA_MIPS4, CPU_R5000 },
+ { "rm7000", 0, ISA_MIPS4, CPU_RM7000 },
+ { "rm9000", 0, ISA_MIPS4, CPU_RM7000 },
/* MIPS 32 */
{ "4kc", 0, ISA_MIPS32, CPU_MIPS32 },
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index f747024..17d0d3d 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-15 Richard Sandiford <rsandifo@redhat.com>
+
+ * gas/mips/rm7000.[sd]: New test.
+ * gas/mips/mips.exp: Run it.
+
2003-07-10 Jakub Jelinek <jakub@redhat.com>
* gas/cfi/cfi-ppc-1.s: New test.
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 25cfdf6..89af998 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -552,6 +552,7 @@ if { [istarget mips*-*-*] } then {
run_dump_test "vr4122"
run_dump_test "vr5400"
run_dump_test "vr5500"
+ run_dump_test "rm7000"
run_dump_test "perfcount"
run_dump_test "lineno"
run_dump_test "sync"
diff --git a/gas/testsuite/gas/mips/rm7000.d b/gas/testsuite/gas/mips/rm7000.d
new file mode 100644
index 0000000..05df9c8
--- /dev/null
+++ b/gas/testsuite/gas/mips/rm7000.d
@@ -0,0 +1,14 @@
+#objdump: -dr -M gpr-names=numeric -m mips:7000
+#name: MIPS RM7000
+#as: -march=rm7000
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+
+0+000 <\.text>:
+ * 0: 70a62002 * mul \$4,\$5,\$6
+ * 4: 70850000 * mad \$4,\$5
+ * 8: 70a60001 * madu \$5,\$6
+ * c: 00003812 * mflo \$7
+ *10: 01000011 * mthi \$8
diff --git a/gas/testsuite/gas/mips/rm7000.s b/gas/testsuite/gas/mips/rm7000.s
new file mode 100644
index 0000000..39de9d5
--- /dev/null
+++ b/gas/testsuite/gas/mips/rm7000.s
@@ -0,0 +1,5 @@
+ mul $4,$5,$6
+ mad $4,$5
+ madu $5,$6
+ mflo $7
+ mthi $8 # No delay needed