MIPS/GAS/testsuite: Print instructions in hex in division tests

Add `--show-raw-insn' to division tests so as to verify branch offsets
without the need to know actual offsets into the text section individual
instructions have been assembled at.  Add `-z' where applicable to make
interlock NOP instructions appear in output so as to verify them without
the need to know the offsets too.  Replace individual offsets to match
against with generic patterns so that a change in the expansion of an
assembly macro does not affect code that follows.

21 files changed, 249 insertions, 241 deletions

diff --git a/gas/testsuite/gas/mips/allegrex@div-trap.d b/gas/testsuite/gas/mips/allegrex@div-trap.d
index 2000416..234fd99 100644
--- a/gas/testsuite/gas/mips/allegrex@div-trap.d
+++ b/gas/testsuite/gas/mips/allegrex@div-trap.d
@@ -1,5 +1,5 @@
 #as: -32 -trap
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS div with traps
 #source: div.s
 #dump: div.d
diff --git a/gas/testsuite/gas/mips/div.d b/gas/testsuite/gas/mips/div.d
index 465633d..2e57d10 100644
--- a/gas/testsuite/gas/mips/div.d
+++ b/gas/testsuite/gas/mips/div.d
@@ -1,90 +1,90 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS div
 
 # Test the div macro.
 
 .*: +file format .*mips.*
 
-Disassembly of section .text:
-0+0000 <[^>]*> div	zero,a0,a1
-0+0004 <[^>]*> bnez	a1,0+0010 <foo\+0x10>
-0+0008 <[^>]*> div	zero,a0,a1
-0+000c <[^>]*> break	(0x0,0x7|0x7)
-0+0010 <[^>]*> li	at,-1
-0+0014 <[^>]*> bne	a1,at,0+0028 <foo\+0x28>
-0+0018 <[^>]*> lui	at,0x8000
-0+001c <[^>]*> bne	a0,at,0+0028 <foo\+0x28>
-0+0020 <[^>]*> nop
-0+0024 <[^>]*> break	(0x0,0x6|0x6)
-0+0028 <[^>]*> mflo	a0
-0+002c <[^>]*> bnez	a2,0+0038 <foo\+0x38>
-0+0030 <[^>]*> div	zero,a1,a2
-0+0034 <[^>]*> break	(0x0,0x7|0x7)
-0+0038 <[^>]*> li	at,-1
-0+003c <[^>]*> bne	a2,at,0+0050 <foo\+0x50>
-0+0040 <[^>]*> lui	at,0x8000
-0+0044 <[^>]*> bne	a1,at,0+0050 <foo\+0x50>
-0+0048 <[^>]*> nop
-0+004c <[^>]*> break	(0x0,0x6|0x6)
-0+0050 <[^>]*> mflo	a0
-0+0054 <[^>]*> move	a0,a0
-0+0058 <[^>]*> move	a0,a1
-0+005c <[^>]*> neg	a0,a0
-0+0060 <[^>]*> neg	a0,a1
-0+0064 <[^>]*> li	at,2
-0+0068 <[^>]*> div	zero,a0,at
-0+006c <[^>]*> mflo	a0
-0+0070 <[^>]*> li	at,2
-0+0074 <[^>]*> div	zero,a1,at
-0+0078 <[^>]*> mflo	a0
-0+007c <[^>]*> li	at,0x8000
-0+0080 <[^>]*> div	zero,a0,at
-0+0084 <[^>]*> mflo	a0
-0+0088 <[^>]*> li	at,0x8000
-0+008c <[^>]*> div	zero,a1,at
-0+0090 <[^>]*> mflo	a0
-0+0094 <[^>]*> li	at,-32768
-0+0098 <[^>]*> div	zero,a0,at
-0+009c <[^>]*> mflo	a0
-0+00a0 <[^>]*> li	at,-32768
-0+00a4 <[^>]*> div	zero,a1,at
-0+00a8 <[^>]*> mflo	a0
-0+00ac <[^>]*> lui	at,0x1
-0+00b0 <[^>]*> div	zero,a0,at
-0+00b4 <[^>]*> mflo	a0
-0+00b8 <[^>]*> lui	at,0x1
-0+00bc <[^>]*> div	zero,a1,at
-0+00c0 <[^>]*> mflo	a0
-0+00c4 <[^>]*> lui	at,0x1
-0+00c8 <[^>]*> ori	at,at,0xa5a5
-0+00cc <[^>]*> div	zero,a0,at
-0+00d0 <[^>]*> mflo	a0
-0+00d4 <[^>]*> lui	at,0x1
-0+00d8 <[^>]*> ori	at,at,0xa5a5
-0+00dc <[^>]*> div	zero,a1,at
-0+00e0 <[^>]*> mflo	a0
-0+00e4 <[^>]*> divu	zero,a0,a1
-0+00e8 <[^>]*> bnez	a1,0+0f4 <foo\+0xf4>
-0+00ec <[^>]*> divu	zero,a0,a1
-0+00f0 <[^>]*> break	(0x0,0x7|0x7)
-0+00f4 <[^>]*> mflo	a0
-0+00f8 <[^>]*> bnez	a2,0+0104 <foo\+0x104>
-0+00fc <[^>]*> divu	zero,a1,a2
-0+0100 <[^>]*> break	(0x0,0x7|0x7)
-0+0104 <[^>]*> mflo	a0
-0+0108 <[^>]*> move	a0,a0
-0+010c <[^>]*> bnez	a2,0+0118 <foo\+0x118>
-0+0110 <[^>]*> div	zero,a1,a2
-0+0114 <[^>]*> break	(0x0,0x7|0x7)
-0+0118 <[^>]*> li	at,-1
-0+011c <[^>]*> bne	a2,at,0+0130 <foo\+0x130>
-0+0120 <[^>]*> lui	at,0x8000
-0+0124 <[^>]*> bne	a1,at,0+0130 <foo\+0x130>
-0+0128 <[^>]*> nop
-0+012c <[^>]*> break	(0x0,0x6|0x6)
-0+0130 <[^>]*> mfhi	a0
-0+0134 <[^>]*> li	at,2
-0+0138 <[^>]*> divu	zero,a1,at
-0+013c <[^>]*> mfhi	a0
-	...
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> 0085001a 	div	zero,a0,a1
+[0-9a-f]+ <[^>]*> 14a00002 	bnez	a1,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 0085001a 	div	zero,a0,a1
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 2401ffff 	li	at,-1
+[0-9a-f]+ <[^>]*> 14a10004 	bne	a1,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 3c018000 	lui	at,0x8000
+[0-9a-f]+ <[^>]*> 14810002 	bne	a0,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0006000d 	break	0x6
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 14c00002 	bnez	a2,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00a6001a 	div	zero,a1,a2
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 2401ffff 	li	at,-1
+[0-9a-f]+ <[^>]*> 14c10004 	bne	a2,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 3c018000 	lui	at,0x8000
+[0-9a-f]+ <[^>]*> 14a10002 	bne	a1,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0006000d 	break	0x6
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 00802025 	move	a0,a0
+[0-9a-f]+ <[^>]*> 00a02025 	move	a0,a1
+[0-9a-f]+ <[^>]*> 00042022 	neg	a0,a0
+[0-9a-f]+ <[^>]*> 00052022 	neg	a0,a1
+[0-9a-f]+ <[^>]*> 24010002 	li	at,2
+[0-9a-f]+ <[^>]*> 0081001a 	div	zero,a0,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 24010002 	li	at,2
+[0-9a-f]+ <[^>]*> 00a1001a 	div	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 34018000 	li	at,0x8000
+[0-9a-f]+ <[^>]*> 0081001a 	div	zero,a0,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 34018000 	li	at,0x8000
+[0-9a-f]+ <[^>]*> 00a1001a 	div	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 24018000 	li	at,-32768
+[0-9a-f]+ <[^>]*> 0081001a 	div	zero,a0,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 24018000 	li	at,-32768
+[0-9a-f]+ <[^>]*> 00a1001a 	div	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 3c010001 	lui	at,0x1
+[0-9a-f]+ <[^>]*> 0081001a 	div	zero,a0,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 3c010001 	lui	at,0x1
+[0-9a-f]+ <[^>]*> 00a1001a 	div	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 3c010001 	lui	at,0x1
+[0-9a-f]+ <[^>]*> 3421a5a5 	ori	at,at,0xa5a5
+[0-9a-f]+ <[^>]*> 0081001a 	div	zero,a0,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 3c010001 	lui	at,0x1
+[0-9a-f]+ <[^>]*> 3421a5a5 	ori	at,at,0xa5a5
+[0-9a-f]+ <[^>]*> 00a1001a 	div	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 0085001b 	divu	zero,a0,a1
+[0-9a-f]+ <[^>]*> 14a00002 	bnez	a1,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 0085001b 	divu	zero,a0,a1
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 14c00002 	bnez	a2,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00a6001b 	divu	zero,a1,a2
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 00802025 	move	a0,a0
+[0-9a-f]+ <[^>]*> 14c00002 	bnez	a2,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00a6001a 	div	zero,a1,a2
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 2401ffff 	li	at,-1
+[0-9a-f]+ <[^>]*> 14c10004 	bne	a2,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 3c018000 	lui	at,0x8000
+[0-9a-f]+ <[^>]*> 14a10002 	bne	a1,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0006000d 	break	0x6
+[0-9a-f]+ <[^>]*> 00002010 	mfhi	a0
+[0-9a-f]+ <[^>]*> 24010002 	li	at,2
+[0-9a-f]+ <[^>]*> 00a1001b 	divu	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002010 	mfhi	a0
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/div64.d b/gas/testsuite/gas/mips/div64.d
index 3a02205..926cdb6 100644
--- a/gas/testsuite/gas/mips/div64.d
+++ b/gas/testsuite/gas/mips/div64.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS 64-bit div
 
 # Test the div macro.
@@ -7,24 +7,24 @@
 .*: +file format .*mips.*
 
 Disassembly of section \.text:
-0+0000 <[^>]*> bnez	a2,0+000c <foo\+0xc>
-0+0004 <[^>]*> ddiv	zero,a1,a2
-0+0008 <[^>]*> break	(0x0,0x7|0x7)
-0+000c <[^>]*> (daddiu	at,zero,-1|li	at,-1)
-0+0010 <[^>]*> bne	a2,at,0+0028 <foo\+0x28>
-0+0014 <[^>]*> (daddiu	at,zero,1|li	at,1)
-0+0018 <[^>]*> dsll32	at,at,0x1f
-0+001c <[^>]*> bne	a1,at,0+0028 <foo\+0x28>
-0+0020 <[^>]*> nop
-0+0024 <[^>]*> break	(0x0,0x6|0x6)
-0+0028 <[^>]*> mflo	a0
-0+002c <[^>]*> li	at,2
-0+0030 <[^>]*> ddivu	zero,a1,at
-0+0034 <[^>]*> mflo	a0
-0+0038 <[^>]*> li	at,0x8000
-0+003c <[^>]*> ddiv	zero,a1,at
-0+0040 <[^>]*> mfhi	a0
-0+0044 <[^>]*> li	at,-32768
-0+0048 <[^>]*> ddivu	zero,a1,at
-0+004c <[^>]*> mfhi	a0
+[0-9a-f]+ <[^>]*> 14c00002 	bnez	a2,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00a6001e 	ddiv	zero,a1,a2
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 2401ffff 	li	at,-1
+[0-9a-f]+ <[^>]*> 14c10005 	bne	a2,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 24010001 	li	at,1
+[0-9a-f]+ <[^>]*> 00010ffc 	dsll32	at,at,0x1f
+[0-9a-f]+ <[^>]*> 14a10002 	bne	a1,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0006000d 	break	0x6
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 24010002 	li	at,2
+[0-9a-f]+ <[^>]*> 00a1001f 	ddivu	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 34018000 	li	at,0x8000
+[0-9a-f]+ <[^>]*> 00a1001e 	ddiv	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002010 	mfhi	a0
+[0-9a-f]+ <[^>]*> 24018000 	li	at,-32768
+[0-9a-f]+ <[^>]*> 00a1001f 	ddivu	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002010 	mfhi	a0
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/mips1@div-trap.d b/gas/testsuite/gas/mips/mips1@div-trap.d
index bca128d..43f5d0d 100644
--- a/gas/testsuite/gas/mips/mips1@div-trap.d
+++ b/gas/testsuite/gas/mips/mips1@div-trap.d
@@ -1,5 +1,5 @@
 #as: -32 -trap
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div with traps
 #source: div.s
 #dump: mips1@div.d
diff --git a/gas/testsuite/gas/mips/mips1@div.d b/gas/testsuite/gas/mips/mips1@div.d
index 72fd3e5..5bff140 100644
--- a/gas/testsuite/gas/mips/mips1@div.d
+++ b/gas/testsuite/gas/mips/mips1@div.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div
 #source: div.s
 
@@ -7,96 +7,104 @@
 
 .*: +file format .*mips.*
 
-Disassembly of section .text:
-0+0000 <[^>]*> div	zero,a0,a1
-0+0004 <[^>]*> bnez	a1,0+0010 <foo\+0x10>
-0+0008 <[^>]*> div	zero,a0,a1
-0+000c <[^>]*> break	(0x0,0x7|0x7)
-0+0010 <[^>]*> li	at,-1
-0+0014 <[^>]*> bne	a1,at,0+0028 <foo\+0x28>
-0+0018 <[^>]*> lui	at,0x8000
-0+001c <[^>]*> bne	a0,at,0+0028 <foo\+0x28>
-0+0020 <[^>]*> nop
-0+0024 <[^>]*> break	(0x0,0x6|0x6)
-0+0028 <[^>]*> mflo	a0
-0+002c <[^>]*> nop
-0+0030 <[^>]*> bnez	a2,0+003c <foo\+0x3c>
-0+0034 <[^>]*> div	zero,a1,a2
-0+0038 <[^>]*> break	(0x0,0x7|0x7)
-0+003c <[^>]*> li	at,-1
-0+0040 <[^>]*> bne	a2,at,0+0054 <foo\+0x54>
-0+0044 <[^>]*> lui	at,0x8000
-0+0048 <[^>]*> bne	a1,at,0+0054 <foo\+0x54>
-0+004c <[^>]*> nop
-0+0050 <[^>]*> break	(0x0,0x6|0x6)
-0+0054 <[^>]*> mflo	a0
-0+0058 <[^>]*> move	a0,a0
-0+005c <[^>]*> move	a0,a1
-0+0060 <[^>]*> neg	a0,a0
-0+0064 <[^>]*> neg	a0,a1
-0+0068 <[^>]*> li	at,2
-0+006c <[^>]*> div	zero,a0,at
-0+0070 <[^>]*> mflo	a0
-0+0074 <[^>]*> li	at,2
-0+0078 <[^>]*> nop
-0+007c <[^>]*> div	zero,a1,at
-0+0080 <[^>]*> mflo	a0
-0+0084 <[^>]*> li	at,0x8000
-0+0088 <[^>]*> nop
-0+008c <[^>]*> div	zero,a0,at
-0+0090 <[^>]*> mflo	a0
-0+0094 <[^>]*> li	at,0x8000
-0+0098 <[^>]*> nop
-0+009c <[^>]*> div	zero,a1,at
-0+00a0 <[^>]*> mflo	a0
-0+00a4 <[^>]*> li	at,-32768
-0+00a8 <[^>]*> nop
-0+00ac <[^>]*> div	zero,a0,at
-0+00b0 <[^>]*> mflo	a0
-0+00b4 <[^>]*> li	at,-32768
-0+00b8 <[^>]*> nop
-0+00bc <[^>]*> div	zero,a1,at
-0+00c0 <[^>]*> mflo	a0
-0+00c4 <[^>]*> lui	at,0x1
-0+00c8 <[^>]*> nop
-0+00cc <[^>]*> div	zero,a0,at
-0+00d0 <[^>]*> mflo	a0
-0+00d4 <[^>]*> lui	at,0x1
-0+00d8 <[^>]*> nop
-0+00dc <[^>]*> div	zero,a1,at
-0+00e0 <[^>]*> mflo	a0
-0+00e4 <[^>]*> lui	at,0x1
-0+00e8 <[^>]*> ori	at,at,0xa5a5
-0+00ec <[^>]*> div	zero,a0,at
-0+00f0 <[^>]*> mflo	a0
-0+00f4 <[^>]*> lui	at,0x1
-0+00f8 <[^>]*> ori	at,at,0xa5a5
-0+00fc <[^>]*> div	zero,a1,at
-0+0100 <[^>]*> mflo	a0
-	...
-0+010c <[^>]*> divu	zero,a0,a1
-0+0110 <[^>]*> bnez	a1,0+011c <foo\+0x11c>
-0+0114 <[^>]*> divu	zero,a0,a1
-0+0118 <[^>]*> break	(0x0,0x7|0x7)
-0+011c <[^>]*> mflo	a0
-0+0120 <[^>]*> nop
-0+0124 <[^>]*> bnez	a2,0+0130 <foo\+0x130>
-0+0128 <[^>]*> divu	zero,a1,a2
-0+012c <[^>]*> break	(0x0,0x7|0x7)
-0+0130 <[^>]*> mflo	a0
-0+0134 <[^>]*> move	a0,a0
-0+0138 <[^>]*> bnez	a2,0+0144 <foo\+0x144>
-0+013c <[^>]*> div	zero,a1,a2
-0+0140 <[^>]*> break	(0x0,0x7|0x7)
-0+0144 <[^>]*> li	at,-1
-0+0148 <[^>]*> bne	a2,at,0+015c <foo\+0x15c>
-0+014c <[^>]*> lui	at,0x8000
-0+0150 <[^>]*> bne	a1,at,0+015c <foo\+0x15c>
-0+0154 <[^>]*> nop
-0+0158 <[^>]*> break	(0x0,0x6|0x6)
-0+015c <[^>]*> mfhi	a0
-0+0160 <[^>]*> li	at,2
-0+0164 <[^>]*> nop
-0+0168 <[^>]*> divu	zero,a1,at
-0+016c <[^>]*> mfhi	a0
-	...
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> 0085001a 	div	zero,a0,a1
+[0-9a-f]+ <[^>]*> 14a00002 	bnez	a1,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 0085001a 	div	zero,a0,a1
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 2401ffff 	li	at,-1
+[0-9a-f]+ <[^>]*> 14a10004 	bne	a1,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 3c018000 	lui	at,0x8000
+[0-9a-f]+ <[^>]*> 14810002 	bne	a0,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0006000d 	break	0x6
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 14c00002 	bnez	a2,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00a6001a 	div	zero,a1,a2
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 2401ffff 	li	at,-1
+[0-9a-f]+ <[^>]*> 14c10004 	bne	a2,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 3c018000 	lui	at,0x8000
+[0-9a-f]+ <[^>]*> 14a10002 	bne	a1,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0006000d 	break	0x6
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 00802025 	move	a0,a0
+[0-9a-f]+ <[^>]*> 00a02025 	move	a0,a1
+[0-9a-f]+ <[^>]*> 00042022 	neg	a0,a0
+[0-9a-f]+ <[^>]*> 00052022 	neg	a0,a1
+[0-9a-f]+ <[^>]*> 24010002 	li	at,2
+[0-9a-f]+ <[^>]*> 0081001a 	div	zero,a0,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 24010002 	li	at,2
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00a1001a 	div	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 34018000 	li	at,0x8000
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0081001a 	div	zero,a0,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 34018000 	li	at,0x8000
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00a1001a 	div	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 24018000 	li	at,-32768
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0081001a 	div	zero,a0,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 24018000 	li	at,-32768
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00a1001a 	div	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 3c010001 	lui	at,0x1
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0081001a 	div	zero,a0,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 3c010001 	lui	at,0x1
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00a1001a 	div	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 3c010001 	lui	at,0x1
+[0-9a-f]+ <[^>]*> 3421a5a5 	ori	at,at,0xa5a5
+[0-9a-f]+ <[^>]*> 0081001a 	div	zero,a0,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 3c010001 	lui	at,0x1
+[0-9a-f]+ <[^>]*> 3421a5a5 	ori	at,at,0xa5a5
+[0-9a-f]+ <[^>]*> 00a1001a 	div	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0085001b 	divu	zero,a0,a1
+[0-9a-f]+ <[^>]*> 14a00002 	bnez	a1,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 0085001b 	divu	zero,a0,a1
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 14c00002 	bnez	a2,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00a6001b 	divu	zero,a1,a2
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 00802025 	move	a0,a0
+[0-9a-f]+ <[^>]*> 14c00002 	bnez	a2,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00a6001a 	div	zero,a1,a2
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 2401ffff 	li	at,-1
+[0-9a-f]+ <[^>]*> 14c10004 	bne	a2,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 3c018000 	lui	at,0x8000
+[0-9a-f]+ <[^>]*> 14a10002 	bne	a1,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0006000d 	break	0x6
+[0-9a-f]+ <[^>]*> 00002010 	mfhi	a0
+[0-9a-f]+ <[^>]*> 24010002 	li	at,2
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00a1001b 	divu	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002010 	mfhi	a0
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00000000 	nop
diff --git a/gas/testsuite/gas/mips/mips2@div-trap.d b/gas/testsuite/gas/mips/mips2@div-trap.d
index f5b411c..1ecf906 100644
--- a/gas/testsuite/gas/mips/mips2@div-trap.d
+++ b/gas/testsuite/gas/mips/mips2@div-trap.d
@@ -1,5 +1,5 @@
 #as: -32 -trap
-#objdump: -drz --prefix-addresses --show-raw-insn
+#objdump: -drz --prefix-addresses --show-raw-insn --show-raw-insn
 #name: MIPS div with traps
 #source: div.s
 
diff --git a/gas/testsuite/gas/mips/mips2@div.d b/gas/testsuite/gas/mips/mips2@div.d
index f89764b..2780d2f 100644
--- a/gas/testsuite/gas/mips/mips2@div.d
+++ b/gas/testsuite/gas/mips/mips2@div.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div
 #source: div.s
 #dump: mips1@div.d
diff --git a/gas/testsuite/gas/mips/mips3@div.d b/gas/testsuite/gas/mips/mips3@div.d
index f89764b..2780d2f 100644
--- a/gas/testsuite/gas/mips/mips3@div.d
+++ b/gas/testsuite/gas/mips/mips3@div.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div
 #source: div.s
 #dump: mips1@div.d
diff --git a/gas/testsuite/gas/mips/mips3@div64.d b/gas/testsuite/gas/mips/mips3@div64.d
index 1ca95a3..cbb0af4 100644
--- a/gas/testsuite/gas/mips/mips3@div64.d
+++ b/gas/testsuite/gas/mips/mips3@div64.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS 64-bit div
 #source: div64.s
 
@@ -7,28 +7,28 @@
 
 .*: +file format .*mips.*
 
-Disassembly of section .text:
-0+0000 <[^>]*> bnez	a2,0+000c <foo\+0xc>
-0+0004 <[^>]*> ddiv	zero,a1,a2
-0+0008 <[^>]*> break	(0x0,0x7|0x7)
-0+000c <[^>]*> (daddiu	at,zero,-1|li	at,-1)
-0+0010 <[^>]*> bne	a2,at,0+0028 <foo\+0x28>
-0+0014 <[^>]*> (daddiu	at,zero,1|li	at,1)
-0+0018 <[^>]*> dsll32	at,at,0x1f
-0+001c <[^>]*> bne	a1,at,0+0028 <foo\+0x28>
-0+0020 <[^>]*> nop
-0+0024 <[^>]*> break	(0x0,0x6|0x6)
-0+0028 <[^>]*> mflo	a0
-0+002c <[^>]*> li	at,2
-0+0030 <[^>]*> nop
-0+0034 <[^>]*> ddivu	zero,a1,at
-0+0038 <[^>]*> mflo	a0
-0+003c <[^>]*> li	at,0x8000
-0+0040 <[^>]*> nop
-0+0044 <[^>]*> ddiv	zero,a1,at
-0+0048 <[^>]*> mfhi	a0
-0+004c <[^>]*> li	at,-32768
-0+0050 <[^>]*> nop
-0+0054 <[^>]*> ddivu	zero,a1,at
-0+0058 <[^>]*> mfhi	a0
-	...
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> 14c00002 	bnez	a2,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00a6001e 	ddiv	zero,a1,a2
+[0-9a-f]+ <[^>]*> 0007000d 	break	0x7
+[0-9a-f]+ <[^>]*> 2401ffff 	li	at,-1
+[0-9a-f]+ <[^>]*> 14c10005 	bne	a2,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 24010001 	li	at,1
+[0-9a-f]+ <[^>]*> 00010ffc 	dsll32	at,at,0x1f
+[0-9a-f]+ <[^>]*> 14a10002 	bne	a1,at,[0-9a-f]+ <[^>]*>
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0006000d 	break	0x6
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 24010002 	li	at,2
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00a1001f 	ddivu	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002012 	mflo	a0
+[0-9a-f]+ <[^>]*> 34018000 	li	at,0x8000
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00a1001e 	ddiv	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002010 	mfhi	a0
+[0-9a-f]+ <[^>]*> 24018000 	li	at,-32768
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 00a1001f 	ddivu	zero,a1,at
+[0-9a-f]+ <[^>]*> 00002010 	mfhi	a0
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/mips4@div.d b/gas/testsuite/gas/mips/mips4@div.d
index f89764b..2780d2f 100644
--- a/gas/testsuite/gas/mips/mips4@div.d
+++ b/gas/testsuite/gas/mips/mips4@div.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div
 #source: div.s
 #dump: mips1@div.d
diff --git a/gas/testsuite/gas/mips/mips4@div64.d b/gas/testsuite/gas/mips/mips4@div64.d
index 9849e85..a83979a 100644
--- a/gas/testsuite/gas/mips/mips4@div64.d
+++ b/gas/testsuite/gas/mips/mips4@div64.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS 64-bit div
 #source: div64.s
 #dump: mips3@div64.d
diff --git a/gas/testsuite/gas/mips/mips5@div.d b/gas/testsuite/gas/mips/mips5@div.d
index f89764b..2780d2f 100644
--- a/gas/testsuite/gas/mips/mips5@div.d
+++ b/gas/testsuite/gas/mips/mips5@div.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div
 #source: div.s
 #dump: mips1@div.d
diff --git a/gas/testsuite/gas/mips/mips5@div64.d b/gas/testsuite/gas/mips/mips5@div64.d
index 9849e85..a83979a 100644
--- a/gas/testsuite/gas/mips/mips5@div64.d
+++ b/gas/testsuite/gas/mips/mips5@div64.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS 64-bit div
 #source: div64.s
 #dump: mips3@div64.d
diff --git a/gas/testsuite/gas/mips/r3000@div-trap.d b/gas/testsuite/gas/mips/r3000@div-trap.d
index bca128d..43f5d0d 100644
--- a/gas/testsuite/gas/mips/r3000@div-trap.d
+++ b/gas/testsuite/gas/mips/r3000@div-trap.d
@@ -1,5 +1,5 @@
 #as: -32 -trap
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div with traps
 #source: div.s
 #dump: mips1@div.d
diff --git a/gas/testsuite/gas/mips/r3000@div.d b/gas/testsuite/gas/mips/r3000@div.d
index f89764b..2780d2f 100644
--- a/gas/testsuite/gas/mips/r3000@div.d
+++ b/gas/testsuite/gas/mips/r3000@div.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div
 #source: div.s
 #dump: mips1@div.d
diff --git a/gas/testsuite/gas/mips/r3900@div-trap.d b/gas/testsuite/gas/mips/r3900@div-trap.d
index bca128d..43f5d0d 100644
--- a/gas/testsuite/gas/mips/r3900@div-trap.d
+++ b/gas/testsuite/gas/mips/r3900@div-trap.d
@@ -1,5 +1,5 @@
 #as: -32 -trap
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div with traps
 #source: div.s
 #dump: mips1@div.d
diff --git a/gas/testsuite/gas/mips/r3900@div.d b/gas/testsuite/gas/mips/r3900@div.d
index f89764b..2780d2f 100644
--- a/gas/testsuite/gas/mips/r3900@div.d
+++ b/gas/testsuite/gas/mips/r3900@div.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div
 #source: div.s
 #dump: mips1@div.d
diff --git a/gas/testsuite/gas/mips/r4000@div.d b/gas/testsuite/gas/mips/r4000@div.d
index f89764b..2780d2f 100644
--- a/gas/testsuite/gas/mips/r4000@div.d
+++ b/gas/testsuite/gas/mips/r4000@div.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div
 #source: div.s
 #dump: mips1@div.d
diff --git a/gas/testsuite/gas/mips/r4000@div64.d b/gas/testsuite/gas/mips/r4000@div64.d
index 9849e85..a83979a 100644
--- a/gas/testsuite/gas/mips/r4000@div64.d
+++ b/gas/testsuite/gas/mips/r4000@div64.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS 64-bit div
 #source: div64.s
 #dump: mips3@div64.d
diff --git a/gas/testsuite/gas/mips/vr5400@div.d b/gas/testsuite/gas/mips/vr5400@div.d
index f89764b..2780d2f 100644
--- a/gas/testsuite/gas/mips/vr5400@div.d
+++ b/gas/testsuite/gas/mips/vr5400@div.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -drz --prefix-addresses --show-raw-insn
 #name: MIPS div
 #source: div.s
 #dump: mips1@div.d
diff --git a/gas/testsuite/gas/mips/vr5400@div64.d b/gas/testsuite/gas/mips/vr5400@div64.d
index 9849e85..a83979a 100644
--- a/gas/testsuite/gas/mips/vr5400@div64.d
+++ b/gas/testsuite/gas/mips/vr5400@div64.d
@@ -1,5 +1,5 @@
 #as: -32
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS 64-bit div
 #source: div64.s
 #dump: mips3@div64.d