* gas/mips/4010.s: Add 4010 tests.

        * gas/mips/4010.d: Expected output.
        * gas/mips/4100.s: Add 4010 tests.
        * gas/mips/4100.d: Expected output.
        * gas/mips/4650.s: Add 4010 tests.
        * gas/mips/4650.d: Expected output.
        * gas/mips/mips.exp: Run the new tests.
        * gas/mips/*.d: Pass the right processor model to objdump.
        Fix minor cases where expected output was wrong due to opcode
        conflicts.

16 files changed, 409 insertions, 26 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 240aeb5..87f80de 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+Tue Jan 27 21:55:44 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* gas/mips/4010.s: Add 4010 tests.
+	* gas/mips/4010.d: Expected output.
+	* gas/mips/4100.s: Add 4010 tests.
+	* gas/mips/4100.d: Expected output.
+	* gas/mips/4650.s: Add 4010 tests.
+	* gas/mips/4650.d: Expected output.
+	* gas/mips/mips.exp: Run the new tests.
+	* gas/mips/*.d: Pass the right processor model to objdump.
+	Fix minor cases where expected output was wrong due to opcode
+	conflicts.
+
 Tue Jan 27 05:35:02 1998  Richard Henderson  <rth@cygnus.com>
 
 	* gas/m68k/mri_moveml.[sd]: New testcase.
diff --git a/gas/testsuite/gas/mips/.Sanitize b/gas/testsuite/gas/mips/.Sanitize
index c5bd4b8..8640a867 100644
--- a/gas/testsuite/gas/mips/.Sanitize
+++ b/gas/testsuite/gas/mips/.Sanitize
@@ -134,6 +134,12 @@ mips16.d
 mips16.s
 mips4.d
 mips4.s
+mips4010.d
+mips4010.s
+mips4100.d
+mips4100.s
+mips4650.d
+mips4650.s
 mul-ilocks.d
 mul.d
 mul.s
diff --git a/gas/testsuite/gas/mips/jal-empic.d b/gas/testsuite/gas/mips/jal-empic.d
index 4ee4ba6..c46ccfa 100644
--- a/gas/testsuite/gas/mips/jal-empic.d
+++ b/gas/testsuite/gas/mips/jal-empic.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS jal-empic
 #as: -mips1 -membedded-pic
 #source: jal.s
diff --git a/gas/testsuite/gas/mips/la-empic.d b/gas/testsuite/gas/mips/la-empic.d
index 85103da..af29570 100644
--- a/gas/testsuite/gas/mips/la-empic.d
+++ b/gas/testsuite/gas/mips/la-empic.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS la-empic
 #as: -mips1 -membedded-pic
 
diff --git a/gas/testsuite/gas/mips/lb-empic.d b/gas/testsuite/gas/mips/lb-empic.d
index c013a40..9724a32 100644
--- a/gas/testsuite/gas/mips/lb-empic.d
+++ b/gas/testsuite/gas/mips/lb-empic.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lb-empic
 #as: -mips1 -membedded-pic
 #source: lb-pic.s
diff --git a/gas/testsuite/gas/mips/ld-empic.d b/gas/testsuite/gas/mips/ld-empic.d
index 99930e3..fa961f6 100644
--- a/gas/testsuite/gas/mips/ld-empic.d
+++ b/gas/testsuite/gas/mips/ld-empic.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ld-empic
 #as: -mips1 -membedded-pic --defsym EMPIC=1
 #source: ld-pic.s
diff --git a/gas/testsuite/gas/mips/ld-xgot.d b/gas/testsuite/gas/mips/ld-xgot.d
new file mode 100644
index 0000000..752749d
--- /dev/null
+++ b/gas/testsuite/gas/mips/ld-xgot.d
@@ -0,0 +1,273 @@
+#objdump: -dr --prefix-addresses -mmips:3000
+#name: MIPS ld-xgot
+#as: -mips1 -KPIC -xgot
+#source: ld-pic.s
+
+# Test the ld macro with -KPIC -xgot.
+
+.*: +file format .*mips.*
+
+Disassembly of section .text:
+0+0000 <[^>]*> lw	\$a0,0\(\$zero\)
+0+0004 <[^>]*> lw	\$a1,4\(\$zero\)
+0+0008 <[^>]*> lw	\$a0,1\(\$zero\)
+0+000c <[^>]*> lw	\$a1,5\(\$zero\)
+0+0010 <[^>]*> lui	\$at,0x1
+0+0014 <[^>]*> lw	\$a0,-32768\(\$at\)
+0+0018 <[^>]*> lw	\$a1,-32764\(\$at\)
+0+001c <[^>]*> lw	\$a0,-32768\(\$zero\)
+0+0020 <[^>]*> lw	\$a1,-32764\(\$zero\)
+0+0024 <[^>]*> lui	\$at,0x1
+0+0028 <[^>]*> lw	\$a0,0\(\$at\)
+0+002c <[^>]*> lw	\$a1,4\(\$at\)
+0+0030 <[^>]*> lui	\$at,0x2
+0+0034 <[^>]*> lw	\$a0,-23131\(\$at\)
+0+0038 <[^>]*> lw	\$a1,-23127\(\$at\)
+0+003c <[^>]*> nop
+0+0040 <[^>]*> lw	\$a0,0\(\$a1\)
+0+0044 <[^>]*> lw	\$a1,4\(\$a1\)
+0+0048 <[^>]*> nop
+0+004c <[^>]*> lw	\$a0,1\(\$a1\)
+0+0050 <[^>]*> lw	\$a1,5\(\$a1\)
+0+0054 <[^>]*> lui	\$at,0x1
+0+0058 <[^>]*> addu	\$at,\$a1,\$at
+0+005c <[^>]*> lw	\$a0,-32768\(\$at\)
+0+0060 <[^>]*> lw	\$a1,-32764\(\$at\)
+0+0064 <[^>]*> nop
+0+0068 <[^>]*> lw	\$a0,-32768\(\$a1\)
+0+006c <[^>]*> lw	\$a1,-32764\(\$a1\)
+0+0070 <[^>]*> lui	\$at,0x1
+0+0074 <[^>]*> addu	\$at,\$a1,\$at
+0+0078 <[^>]*> lw	\$a0,0\(\$at\)
+0+007c <[^>]*> lw	\$a1,4\(\$at\)
+0+0080 <[^>]*> lui	\$at,0x2
+0+0084 <[^>]*> addu	\$at,\$a1,\$at
+0+0088 <[^>]*> lw	\$a0,-23131\(\$at\)
+0+008c <[^>]*> lw	\$a1,-23127\(\$at\)
+0+0090 <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*90: R_MIPS_GOT16	.data
+0+0094 <[^>]*> nop
+0+0098 <[^>]*> lw	\$a0,0\(\$at\)
+[ 	]*98: R_MIPS_LO16	.data
+0+009c <[^>]*> lw	\$a1,4\(\$at\)
+[ 	]*9c: R_MIPS_LO16	.data
+0+00a0 <[^>]*> lui	\$at,0x0
+[ 	]*a0: R_MIPS_GOT_HI16	big_external_data_label
+0+00a4 <[^>]*> addu	\$at,\$at,\$gp
+0+00a8 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*a8: R_MIPS_GOT_LO16	big_external_data_label
+0+00ac <[^>]*> nop
+0+00b0 <[^>]*> lw	\$a0,0\(\$at\)
+0+00b4 <[^>]*> lw	\$a1,4\(\$at\)
+0+00b8 <[^>]*> lui	\$at,0x0
+[ 	]*b8: R_MIPS_GOT_HI16	small_external_data_label
+0+00bc <[^>]*> addu	\$at,\$at,\$gp
+0+00c0 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*c0: R_MIPS_GOT_LO16	small_external_data_label
+0+00c4 <[^>]*> nop
+0+00c8 <[^>]*> lw	\$a0,0\(\$at\)
+0+00cc <[^>]*> lw	\$a1,4\(\$at\)
+0+00d0 <[^>]*> lui	\$at,0x0
+[ 	]*d0: R_MIPS_GOT_HI16	big_external_common
+0+00d4 <[^>]*> addu	\$at,\$at,\$gp
+0+00d8 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*d8: R_MIPS_GOT_LO16	big_external_common
+0+00dc <[^>]*> nop
+0+00e0 <[^>]*> lw	\$a0,0\(\$at\)
+0+00e4 <[^>]*> lw	\$a1,4\(\$at\)
+0+00e8 <[^>]*> lui	\$at,0x0
+[ 	]*e8: R_MIPS_GOT_HI16	small_external_common
+0+00ec <[^>]*> addu	\$at,\$at,\$gp
+0+00f0 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*f0: R_MIPS_GOT_LO16	small_external_common
+0+00f4 <[^>]*> nop
+0+00f8 <[^>]*> lw	\$a0,0\(\$at\)
+0+00fc <[^>]*> lw	\$a1,4\(\$at\)
+0+0100 <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*100: R_MIPS_GOT16	.bss
+0+0104 <[^>]*> nop
+0+0108 <[^>]*> lw	\$a0,0\(\$at\)
+[ 	]*108: R_MIPS_LO16	.bss
+0+010c <[^>]*> lw	\$a1,4\(\$at\)
+[ 	]*10c: R_MIPS_LO16	.bss
+0+0110 <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*110: R_MIPS_GOT16	.bss
+0+0114 <[^>]*> nop
+0+0118 <[^>]*> lw	\$a0,1000\(\$at\)
+[ 	]*118: R_MIPS_LO16	.bss
+0+011c <[^>]*> lw	\$a1,1004\(\$at\)
+[ 	]*11c: R_MIPS_LO16	.bss
+0+0120 <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*120: R_MIPS_GOT16	.data
+0+0124 <[^>]*> nop
+0+0128 <[^>]*> lw	\$a0,1\(\$at\)
+[ 	]*128: R_MIPS_LO16	.data
+0+012c <[^>]*> lw	\$a1,5\(\$at\)
+[ 	]*12c: R_MIPS_LO16	.data
+0+0130 <[^>]*> lui	\$at,0x0
+[ 	]*130: R_MIPS_GOT_HI16	big_external_data_label
+0+0134 <[^>]*> addu	\$at,\$at,\$gp
+0+0138 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*138: R_MIPS_GOT_LO16	big_external_data_label
+0+013c <[^>]*> nop
+0+0140 <[^>]*> lw	\$a0,1\(\$at\)
+0+0144 <[^>]*> lw	\$a1,5\(\$at\)
+0+0148 <[^>]*> lui	\$at,0x0
+[ 	]*148: R_MIPS_GOT_HI16	small_external_data_label
+0+014c <[^>]*> addu	\$at,\$at,\$gp
+0+0150 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*150: R_MIPS_GOT_LO16	small_external_data_label
+0+0154 <[^>]*> nop
+0+0158 <[^>]*> lw	\$a0,1\(\$at\)
+0+015c <[^>]*> lw	\$a1,5\(\$at\)
+0+0160 <[^>]*> lui	\$at,0x0
+[ 	]*160: R_MIPS_GOT_HI16	big_external_common
+0+0164 <[^>]*> addu	\$at,\$at,\$gp
+0+0168 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*168: R_MIPS_GOT_LO16	big_external_common
+0+016c <[^>]*> nop
+0+0170 <[^>]*> lw	\$a0,1\(\$at\)
+0+0174 <[^>]*> lw	\$a1,5\(\$at\)
+0+0178 <[^>]*> lui	\$at,0x0
+[ 	]*178: R_MIPS_GOT_HI16	small_external_common
+0+017c <[^>]*> addu	\$at,\$at,\$gp
+0+0180 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*180: R_MIPS_GOT_LO16	small_external_common
+0+0184 <[^>]*> nop
+0+0188 <[^>]*> lw	\$a0,1\(\$at\)
+0+018c <[^>]*> lw	\$a1,5\(\$at\)
+0+0190 <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*190: R_MIPS_GOT16	.bss
+0+0194 <[^>]*> nop
+0+0198 <[^>]*> lw	\$a0,1\(\$at\)
+[ 	]*198: R_MIPS_LO16	.bss
+0+019c <[^>]*> lw	\$a1,5\(\$at\)
+[ 	]*19c: R_MIPS_LO16	.bss
+0+01a0 <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*1a0: R_MIPS_GOT16	.bss
+0+01a4 <[^>]*> nop
+0+01a8 <[^>]*> lw	\$a0,1001\(\$at\)
+[ 	]*1a8: R_MIPS_LO16	.bss
+0+01ac <[^>]*> lw	\$a1,1005\(\$at\)
+[ 	]*1ac: R_MIPS_LO16	.bss
+0+01b0 <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*1b0: R_MIPS_GOT16	.data
+0+01b4 <[^>]*> nop
+0+01b8 <[^>]*> addu	\$at,\$a1,\$at
+0+01bc <[^>]*> lw	\$a0,0\(\$at\)
+[ 	]*1bc: R_MIPS_LO16	.data
+0+01c0 <[^>]*> lw	\$a1,4\(\$at\)
+[ 	]*1c0: R_MIPS_LO16	.data
+0+01c4 <[^>]*> lui	\$at,0x0
+[ 	]*1c4: R_MIPS_GOT_HI16	big_external_data_label
+0+01c8 <[^>]*> addu	\$at,\$at,\$gp
+0+01cc <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*1cc: R_MIPS_GOT_LO16	big_external_data_label
+0+01d0 <[^>]*> nop
+0+01d4 <[^>]*> addu	\$at,\$a1,\$at
+0+01d8 <[^>]*> lw	\$a0,0\(\$at\)
+0+01dc <[^>]*> lw	\$a1,4\(\$at\)
+0+01e0 <[^>]*> lui	\$at,0x0
+[ 	]*1e0: R_MIPS_GOT_HI16	small_external_data_label
+0+01e4 <[^>]*> addu	\$at,\$at,\$gp
+0+01e8 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*1e8: R_MIPS_GOT_LO16	small_external_data_label
+0+01ec <[^>]*> nop
+0+01f0 <[^>]*> addu	\$at,\$a1,\$at
+0+01f4 <[^>]*> lw	\$a0,0\(\$at\)
+0+01f8 <[^>]*> lw	\$a1,4\(\$at\)
+0+01fc <[^>]*> lui	\$at,0x0
+[ 	]*1fc: R_MIPS_GOT_HI16	big_external_common
+0+0200 <[^>]*> addu	\$at,\$at,\$gp
+0+0204 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*204: R_MIPS_GOT_LO16	big_external_common
+0+0208 <[^>]*> nop
+0+020c <[^>]*> addu	\$at,\$a1,\$at
+0+0210 <[^>]*> lw	\$a0,0\(\$at\)
+0+0214 <[^>]*> lw	\$a1,4\(\$at\)
+0+0218 <[^>]*> lui	\$at,0x0
+[ 	]*218: R_MIPS_GOT_HI16	small_external_common
+0+021c <[^>]*> addu	\$at,\$at,\$gp
+0+0220 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*220: R_MIPS_GOT_LO16	small_external_common
+0+0224 <[^>]*> nop
+0+0228 <[^>]*> addu	\$at,\$a1,\$at
+0+022c <[^>]*> lw	\$a0,0\(\$at\)
+0+0230 <[^>]*> lw	\$a1,4\(\$at\)
+0+0234 <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*234: R_MIPS_GOT16	.bss
+0+0238 <[^>]*> nop
+0+023c <[^>]*> addu	\$at,\$a1,\$at
+0+0240 <[^>]*> lw	\$a0,0\(\$at\)
+[ 	]*240: R_MIPS_LO16	.bss
+0+0244 <[^>]*> lw	\$a1,4\(\$at\)
+[ 	]*244: R_MIPS_LO16	.bss
+0+0248 <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*248: R_MIPS_GOT16	.bss
+0+024c <[^>]*> nop
+0+0250 <[^>]*> addu	\$at,\$a1,\$at
+0+0254 <[^>]*> lw	\$a0,1000\(\$at\)
+[ 	]*254: R_MIPS_LO16	.bss
+0+0258 <[^>]*> lw	\$a1,1004\(\$at\)
+[ 	]*258: R_MIPS_LO16	.bss
+0+025c <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*25c: R_MIPS_GOT16	.data
+0+0260 <[^>]*> nop
+0+0264 <[^>]*> addu	\$at,\$a1,\$at
+0+0268 <[^>]*> lw	\$a0,1\(\$at\)
+[ 	]*268: R_MIPS_LO16	.data
+0+026c <[^>]*> lw	\$a1,5\(\$at\)
+[ 	]*26c: R_MIPS_LO16	.data
+0+0270 <[^>]*> lui	\$at,0x0
+[ 	]*270: R_MIPS_GOT_HI16	big_external_data_label
+0+0274 <[^>]*> addu	\$at,\$at,\$gp
+0+0278 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*278: R_MIPS_GOT_LO16	big_external_data_label
+0+027c <[^>]*> nop
+0+0280 <[^>]*> addu	\$at,\$a1,\$at
+0+0284 <[^>]*> lw	\$a0,1\(\$at\)
+0+0288 <[^>]*> lw	\$a1,5\(\$at\)
+0+028c <[^>]*> lui	\$at,0x0
+[ 	]*28c: R_MIPS_GOT_HI16	small_external_data_label
+0+0290 <[^>]*> addu	\$at,\$at,\$gp
+0+0294 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*294: R_MIPS_GOT_LO16	small_external_data_label
+0+0298 <[^>]*> nop
+0+029c <[^>]*> addu	\$at,\$a1,\$at
+0+02a0 <[^>]*> lw	\$a0,1\(\$at\)
+0+02a4 <[^>]*> lw	\$a1,5\(\$at\)
+0+02a8 <[^>]*> lui	\$at,0x0
+[ 	]*2a8: R_MIPS_GOT_HI16	big_external_common
+0+02ac <[^>]*> addu	\$at,\$at,\$gp
+0+02b0 <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*2b0: R_MIPS_GOT_LO16	big_external_common
+0+02b4 <[^>]*> nop
+0+02b8 <[^>]*> addu	\$at,\$a1,\$at
+0+02bc <[^>]*> lw	\$a0,1\(\$at\)
+0+02c0 <[^>]*> lw	\$a1,5\(\$at\)
+0+02c4 <[^>]*> lui	\$at,0x0
+[ 	]*2c4: R_MIPS_GOT_HI16	small_external_common
+0+02c8 <[^>]*> addu	\$at,\$at,\$gp
+0+02cc <[^>]*> lw	\$at,0\(\$at\)
+[ 	]*2cc: R_MIPS_GOT_LO16	small_external_common
+0+02d0 <[^>]*> nop
+0+02d4 <[^>]*> addu	\$at,\$a1,\$at
+0+02d8 <[^>]*> lw	\$a0,1\(\$at\)
+0+02dc <[^>]*> lw	\$a1,5\(\$at\)
+0+02e0 <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*2e0: R_MIPS_GOT16	.bss
+0+02e4 <[^>]*> nop
+0+02e8 <[^>]*> addu	\$at,\$a1,\$at
+0+02ec <[^>]*> lw	\$a0,1\(\$at\)
+[ 	]*2ec: R_MIPS_LO16	.bss
+0+02f0 <[^>]*> lw	\$a1,5\(\$at\)
+[ 	]*2f0: R_MIPS_LO16	.bss
+0+02f4 <[^>]*> lw	\$at,0\(\$gp\)
+[ 	]*2f4: R_MIPS_GOT16	.bss
+0+02f8 <[^>]*> nop
+0+02fc <[^>]*> addu	\$at,\$a1,\$at
+0+0300 <[^>]*> lw	\$a0,1001\(\$at\)
+[ 	]*300: R_MIPS_LO16	.bss
+0+0304 <[^>]*> lw	\$a1,1005\(\$at\)
+[ 	]*304: R_MIPS_LO16	.bss
+	...
diff --git a/gas/testsuite/gas/mips/lif-empic.d b/gas/testsuite/gas/mips/lif-empic.d
index 5b9e3f7..b80dca3 100644
--- a/gas/testsuite/gas/mips/lif-empic.d
+++ b/gas/testsuite/gas/mips/lif-empic.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lifloat-empic
 #as: -mips1 -membedded-pic --defsym EMPIC=1
 #source: lifloat.s
diff --git a/gas/testsuite/gas/mips/mips4010.d b/gas/testsuite/gas/mips/mips4010.d
new file mode 100644
index 0000000..f2e3a52
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips4010.d
@@ -0,0 +1,22 @@
+#objdump: -dr --prefix-addresses -mmips:4010
+#name: MIPS 4010
+#as: -mcpu=4010
+
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+0+0000 <stuff> flushi
+0+0004 <stuff\+0x4> flushd
+0+0008 <stuff\+0x8> flushid
+0+000c <stuff\+0xc> madd	\$a0,\$a1
+0+0010 <stuff\+0x10> maddu	\$a1,\$a2
+0+0014 <stuff\+0x14> ffc	\$a2,\$a3
+0+0018 <stuff\+0x18> ffs	\$a3,\$t0
+0+001c <stuff\+0x1c> msub	\$t0,\$t1
+0+0020 <stuff\+0x20> msubu	\$t1,\$t2
+0+0024 <stuff\+0x24> selsl	\$t2,\$t3,\$t4
+0+0028 <stuff\+0x28> selsr	\$t3,\$t4,\$t5
+0+002c <stuff\+0x2c> waiti
+0+0030 <stuff\+0x30> wb	16\(\$t6\)
+0+0034 <stuff\+0x34> addciu	\$t6,\$t7,16
diff --git a/gas/testsuite/gas/mips/mips4010.s b/gas/testsuite/gas/mips/mips4010.s
new file mode 100644
index 0000000..1247144
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips4010.s
@@ -0,0 +1,19 @@
+	.text
+
+stuff:
+	.ent stuff
+	flushi
+	flushd
+	flushid
+	madd $4,$5
+	maddu $5,$6
+	ffc $6,$7
+	ffs $7,$8
+	msub $8,$9
+	msubu $9,$10
+	selsl $10,$11,$12
+	selsr $11,$12,$13
+	waiti
+	wb 16($14)
+	addciu $14,$15,16
+
diff --git a/gas/testsuite/gas/mips/mips4100.d b/gas/testsuite/gas/mips/mips4100.d
new file mode 100644
index 0000000..9568661
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips4100.d
@@ -0,0 +1,14 @@
+#objdump: -dr --prefix-addresses -mmips:4100
+#name: MIPS 4100
+#as: -mcpu=4100
+
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+0+0000 <stuff> dmadd16	\$a0,\$a1
+	...
+0+000c <stuff\+0xc> madd16	\$a1,\$a2
+0+0010 <stuff\+0x10> hibernate
+0+0014 <stuff\+0x14> standby
+0+0018 <stuff\+0x18> suspend
diff --git a/gas/testsuite/gas/mips/mips4100.s b/gas/testsuite/gas/mips/mips4100.s
new file mode 100644
index 0000000..7d36918
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips4100.s
@@ -0,0 +1,9 @@
+	.text
+
+stuff:
+	.ent stuff
+	dmadd16 $4,$5
+	madd16 $5,$6
+	hibernate
+	standby
+	suspend
diff --git a/gas/testsuite/gas/mips/mips4650.d b/gas/testsuite/gas/mips/mips4650.d
new file mode 100644
index 0000000..a3087ad
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips4650.d
@@ -0,0 +1,13 @@
+#objdump: -dr --prefix-addresses -mmips:4650
+#name: MIPS 4650
+#as: -mcpu=4650
+
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+0+0000 <stuff> mad	\$a0,\$a1
+	...
+0+000c <stuff\+0xc> madu	\$a1,\$a2
+	...
+0+0018 <stuff\+0x18> mul	\$a2,\$a3,\$t0
diff --git a/gas/testsuite/gas/mips/mips4650.s b/gas/testsuite/gas/mips/mips4650.s
new file mode 100644
index 0000000..22d708a
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips4650.s
@@ -0,0 +1,7 @@
+	.text
+
+stuff:
+	.ent stuff
+	mad $4,$5
+	madu $5,$6
+	mul $6,$7,$8
diff --git a/gas/testsuite/gas/mips/r5900.d b/gas/testsuite/gas/mips/r5900.d
index 1fe66fa..e6ce0f0 100644
--- a/gas/testsuite/gas/mips/r5900.d
+++ b/gas/testsuite/gas/mips/r5900.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses -mmips:5900
 #name: MIPS R5900
 #as: -mcpu=r5900
 
@@ -7,22 +7,29 @@
 
 Disassembly of section \.text:
 0+0000 <stuff> di
-0+0004 <stuff\+4> ei
-0+0008 <stuff\+8> mfbpc	\$t2
-0+000c <stuff\+c> mfdab	\$t3
-0+0010 <stuff\+10> mfdabm	\$t4
-0+0014 <stuff\+14> mfdvb	\$t5
-0+0018 <stuff\+18> mfdvbm	\$t6
-0+001c <stuff\+1c> mfiab	\$t7
-0+0020 <stuff\+20> mfiabm	\$s0
-0+0024 <stuff\+24> mfpc	\$a0,\$1
-0+0028 <stuff\+28> mfps	\$a0,\$1
-0+002c <stuff\+2c> mtbpc	\$t2
-0+0030 <stuff\+30> mtdab	\$t3
-0+0034 <stuff\+34> mtdabm	\$t4
-0+0038 <stuff\+38> mtdvb	\$t5
-0+003c <stuff\+3c> mtdvbm	\$t6
-0+0040 <stuff\+40> mtiab	\$t7
-0+0044 <stuff\+44> mtiabm	\$s0
-0+0048 <stuff\+48> mtpc	\$a0,\$1
-0+004c <stuff\+4c> mtps	\$a0,\$1
+0+0004 <stuff\+(0x|)4> ei
+0+0008 <stuff\+(0x|)8> mfbpc	\$t2
+0+000c <stuff\+(0x|)c> mfdab	\$t3
+0+0010 <stuff\+(0x|)10> mfdabm	\$t4
+0+0014 <stuff\+(0x|)14> mfdvb	\$t5
+0+0018 <stuff\+(0x|)18> mfdvbm	\$t6
+0+001c <stuff\+(0x|)1c> mfiab	\$t7
+0+0020 <stuff\+(0x|)20> mfiabm	\$s0
+0+0024 <stuff\+(0x|)24> mfpc	\$a0,\$1
+0+0028 <stuff\+(0x|)28> mfps	\$a0,\$1
+0+002c <stuff\+(0x|)2c> mtbpc	\$t2
+0+0030 <stuff\+(0x|)30> mtdab	\$t3
+0+0034 <stuff\+(0x|)34> mtdabm	\$t4
+0+0038 <stuff\+(0x|)38> mtdvb	\$t5
+0+003c <stuff\+(0x|)3c> mtdvbm	\$t6
+0+0040 <stuff\+(0x|)40> mtiab	\$t7
+0+0044 <stuff\+(0x|)44> mtiabm	\$s0
+0+0048 <stuff\+(0x|)48> mtpc	\$a0,\$1
+0+004c <stuff\+(0x|)4c> mtps	\$a0,\$1
+0+0050 <stuff\+(0x|)50> adda.s	\$f12,\$f14
+0+0054 <stuff\+(0x|)54> suba.s	\$f10,\$f12
+0+0058 <stuff\+(0x|)58> msuba.s	\$f10,\$f12
+0+005c <stuff\+(0x|)5c> multa.s	\$f10,\$f12
+0+0060 <stuff\+(0x|)60> madda.s	\$f10,\$f12
+0+0064 <stuff\+(0x|)64> max.s	\$f10,\$f12,\$f14
+0+0068 <stuff\+(0x|)68> min.s	\$f10,\$f12,\$f14
diff --git a/gas/testsuite/gas/mips/ulh-empic.d b/gas/testsuite/gas/mips/ulh-empic.d
index 0a371b3..945f06b 100644
--- a/gas/testsuite/gas/mips/ulh-empic.d
+++ b/gas/testsuite/gas/mips/ulh-empic.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulh-empic
 #as: -mips1 -membedded-pic
 #source: ulh-pic.s