Fix for PR 280 - remove duplicated raw insn output fron h8300/h8500 disassemblers

6 files changed, 139 insertions, 111 deletions

diff --git a/ld/testsuite/ld-h8300/relax-3-coff.d b/ld/testsuite/ld-h8300/relax-3-coff.d
index 49a68cf..0384398 100644
--- a/ld/testsuite/ld-h8300/relax-3-coff.d
+++ b/ld/testsuite/ld-h8300/relax-3-coff.d
@@ -1,7 +1,7 @@
-# name: H8300 Relaxation Test 3
+# name: H8300 Relaxation Test 3 (for COFF)
 # source: relax-3.s
 # ld: --relax -m h8300s
-# objdump: -d --no-show-raw-insn
+# objdump: -d
 
 .*:     file format .*-h8300
 
@@ -11,22 +11,26 @@ Disassembly of section .text:
 #
 # Relaxation of aa:16
 #
-.*:	6a 08 00 00 * mov.b	@0x0:16,r0l
-.*:	6a 08 7f ff * mov.b	@0x7fff:16,r0l
-.*:	6a 08 80 00 * mov.b	@0x8000:16,r0l
-.*:	6a 08 fe ff * mov.b	@0xfeff:16,r0l
-.*:	28 00       * mov.b	@0x0:8,r0l
-.*:	28 ff       * mov.b	@0xff:8,r0l
+.*:	6a 08 00 00.*mov.b	@0x0:16,r0l
+.*:	6a 08 7f ff.*mov.b	@0x7fff:16,r0l
+.*:	6a 08 80 00.*mov.b	@0x8000:16,r0l
+.*:	6a 08 fe ff.*mov.b	@0xfeff:16,r0l
+.*:	28 00      .*mov.b	@0x0:8,r0l
+.*:	28 ff      .*mov.b	@0xff:8,r0l
 #
 # Relaxation of aa:32
 #
-.*:	6a 08 00 00 * mov.b	@0x0:16,r0l
-.*:	6a 08 7f ff * mov.b	@0x7fff:16,r0l
-.*:	6a 28 00 00 80 00 * mov.b	@0x8000:32,r0l
-.*:	6a 28 00 00 ff 00 * mov.b	@0xff00:32,r0l
-.*:	6a 28 00 ff ff 00 * mov.b	@0xffff00:32,r0l
-.*:	6a 28 ff ff 7f ff * mov.b	@0xffff7fff:32,r0l
-.*:	6a 08 80 00 * mov.b	@0x8000:16,r0l
-.*:	6a 08 fe ff * mov.b	@0xfeff:16,r0l
-.*:	28 00       * mov.b	@0x0:8,r0l
-.*:	28 ff       * mov.b	@0xff:8,r0l
+.*:	6a 08 00 00.*mov.b	@0x0:16,r0l
+.*:	6a 08 7f ff.*mov.b	@0x7fff:16,r0l
+.*:	6a 28 00 00.*mov.b	@0x8000:32,r0l
+.*:	80 00 
+.*:	6a 28 00 00.*mov.b	@0xff00:32,r0l
+.*:	ff 00 
+.*:	6a 28 00 ff.*mov.b	@0xffff00:32,r0l
+.*:	ff 00 
+.*:	6a 28 ff ff.*mov.b	@0xffff7fff:32,r0l
+.*:	7f ff 
+.*:	6a 08 80 00.*mov.b	@0x8000:16,r0l
+.*:	6a 08 fe ff.*mov.b	@0xfeff:16,r0l
+.*:	28 00      .*mov.b	@0x0:8,r0l
+.*:	28 ff      .*mov.b	@0xff:8,r0l
diff --git a/ld/testsuite/ld-h8300/relax-3.d b/ld/testsuite/ld-h8300/relax-3.d
index eb14f6e..c2d6503 100644
--- a/ld/testsuite/ld-h8300/relax-3.d
+++ b/ld/testsuite/ld-h8300/relax-3.d
@@ -1,6 +1,6 @@
 # name: H8300 Relaxation Test 3
 # ld: --relax -m h8300self
-# objdump: -d --no-show-raw-insn
+# objdump: -d
 
 .*:     file format .*-h8300
 
diff --git a/ld/testsuite/ld-h8300/relax-4-coff.d b/ld/testsuite/ld-h8300/relax-4-coff.d
index fccccbc..d6417ac 100644
--- a/ld/testsuite/ld-h8300/relax-4-coff.d
+++ b/ld/testsuite/ld-h8300/relax-4-coff.d
@@ -1,52 +1,76 @@
-# name: H8300 Relaxation Test 4
+# name: H8300 Relaxation Test 4 (for COFF)
 # source: relax-4.s
 # ld: --relax -m h8300s
-# objdump: -d --no-show-raw-insn
+# objdump: -d
 
 .*:     file format .*-h8300
 
 Disassembly of section .text:
 
 00000100 <_start>:
- 100:	f8 03             mov.b	#0x3,r0l
- 102:	fa 05             mov.b	#0x5,r2l
- 104:	7f ff 60 80       bset	r0l,@0xff:8
- 108:	7f 00 60 a0       bset	r2l,@0x0:8
- 10c:	7e ff 63 a0       btst	r2l,@0xff:8
- 110:	7e 00 63 80       btst	r0l,@0x0:8
- 114:	6a 18 00 00 70 50 bset	#0x5,@0x0:16
- 11a:	6a 18 7f ff 70 50 bset	#0x5,@0x7fff:16
- 120:	6a 18 80 00 70 50 bset	#0x5,@0x8000:16
- 126:	6a 18 fe ff 70 50 bset	#0x5,@0xfeff:16
- 12c:	7f 00 70 50       bset	#0x5,@0x0:8
- 130:	7f ff 70 50       bset	#0x5,@0xff:8
- 134:	6a 10 00 00 76 50 band	#0x5,@0x0:16
- 13a:	6a 10 7f ff 76 50 band	#0x5,@0x7fff:16
- 140:	6a 10 80 00 76 50 band	#0x5,@0x8000:16
- 146:	6a 10 fe ff 76 50 band	#0x5,@0xfeff:16
- 14c:	7e 00 76 50       band	#0x5,@0x0:8
- 150:	7e ff 76 50       band	#0x5,@0xff:8
- 154:	7f ff 60 a0       bset	r2l,@0xff:8
- 158:	7f 00 60 80       bset	r0l,@0x0:8
- 15c:	7e ff 63 80       btst	r0l,@0xff:8
- 160:	7e 00 63 a0       btst	r2l,@0x0:8
- 164:	6a 18 00 00 70 60 bset	#0x6,@0x0:16
- 16a:	6a 18 7f ff 70 60 bset	#0x6,@0x7fff:16
- 170:	6a 38 00 00 80 00 70 60 bset	#0x6,@0x8000:32
- 178:	6a 38 00 00 ff 00 70 60 bset	#0x6,@0xff00:32
- 180:	6a 38 00 ff ff 00 70 60 bset	#0x6,@0xffff00:32
- 188:	6a 38 ff ff 7f ff 70 60 bset	#0x6,@0xffff7fff:32
- 190:	6a 18 80 00 70 60 bset	#0x6,@0x8000:16
- 196:	6a 18 fe ff 70 60 bset	#0x6,@0xfeff:16
- 19c:	7f 00 70 60       bset	#0x6,@0x0:8
- 1a0:	7f ff 70 60       bset	#0x6,@0xff:8
- 1a4:	6a 10 00 00 76 60 band	#0x6,@0x0:16
- 1aa:	6a 10 7f ff 76 60 band	#0x6,@0x7fff:16
- 1b0:	6a 30 00 00 80 00 76 60 band	#0x6,@0x8000:32
- 1b8:	6a 30 00 00 ff 00 76 60 band	#0x6,@0xff00:32
- 1c0:	6a 30 00 ff ff 00 76 60 band	#0x6,@0xffff00:32
- 1c8:	6a 30 ff ff 7f ff 76 60 band	#0x6,@0xffff7fff:32
- 1d0:	6a 10 80 00 76 60 band	#0x6,@0x8000:16
- 1d6:	6a 10 fe ff 76 60 band	#0x6,@0xfeff:16
- 1dc:	7e 00 76 60       band	#0x6,@0x0:8
- 1e0:	7e ff 76 60       band	#0x6,@0xff:8
+ 100:	f8 03.*mov.b	#0x3,r0l
+ 102:	fa 05.*mov.b	#0x5,r2l
+ 104:	7f ff 60 80.*bset	r0l,@0xff:8
+ 108:	7f 00 60 a0.*bset	r2l,@0x0:8
+ 10c:	7e ff 63 a0.*btst	r2l,@0xff:8
+ 110:	7e 00 63 80.*btst	r0l,@0x0:8
+ 114:	6a 18 00 00.*bset	#0x5,@0x0:16
+ 118:	70 50 
+ 11a:	6a 18 7f ff.*bset	#0x5,@0x7fff:16
+ 11e:	70 50 
+ 120:	6a 18 80 00.*bset	#0x5,@0x8000:16
+ 124:	70 50 
+ 126:	6a 18 fe ff.*bset	#0x5,@0xfeff:16
+ 12a:	70 50 
+ 12c:	7f 00 70 50.*bset	#0x5,@0x0:8
+ 130:	7f ff 70 50.*bset	#0x5,@0xff:8
+ 134:	6a 10 00 00.*band	#0x5,@0x0:16
+ 138:	76 50 
+ 13a:	6a 10 7f ff.*band	#0x5,@0x7fff:16
+ 13e:	76 50 
+ 140:	6a 10 80 00.*band	#0x5,@0x8000:16
+ 144:	76 50 
+ 146:	6a 10 fe ff.*band	#0x5,@0xfeff:16
+ 14a:	76 50 
+ 14c:	7e 00 76 50.*band	#0x5,@0x0:8
+ 150:	7e ff 76 50.*band	#0x5,@0xff:8
+ 154:	7f ff 60 a0.*bset	r2l,@0xff:8
+ 158:	7f 00 60 80.*bset	r0l,@0x0:8
+ 15c:	7e ff 63 80.*btst	r0l,@0xff:8
+ 160:	7e 00 63 a0.*btst	r2l,@0x0:8
+ 164:	6a 18 00 00.*bset	#0x6,@0x0:16
+ 168:	70 60 
+ 16a:	6a 18 7f ff.*bset	#0x6,@0x7fff:16
+ 16e:	70 60 
+ 170:	6a 38 00 00.*bset	#0x6,@0x8000:32
+ 174:	80 00 70 60 
+ 178:	6a 38 00 00.*bset	#0x6,@0xff00:32
+ 17c:	ff 00 70 60 
+ 180:	6a 38 00 ff.*bset	#0x6,@0xffff00:32
+ 184:	ff 00 70 60 
+ 188:	6a 38 ff ff.*bset	#0x6,@0xffff7fff:32
+ 18c:	7f ff 70 60 
+ 190:	6a 18 80 00.*bset	#0x6,@0x8000:16
+ 194:	70 60 
+ 196:	6a 18 fe ff.*bset	#0x6,@0xfeff:16
+ 19a:	70 60 
+ 19c:	7f 00 70 60.*bset	#0x6,@0x0:8
+ 1a0:	7f ff 70 60.*bset	#0x6,@0xff:8
+ 1a4:	6a 10 00 00.*band	#0x6,@0x0:16
+ 1a8:	76 60 
+ 1aa:	6a 10 7f ff.*band	#0x6,@0x7fff:16
+ 1ae:	76 60 
+ 1b0:	6a 30 00 00.*band	#0x6,@0x8000:32
+ 1b4:	80 00 76 60 
+ 1b8:	6a 30 00 00.*band	#0x6,@0xff00:32
+ 1bc:	ff 00 76 60 
+ 1c0:	6a 30 00 ff.*band	#0x6,@0xffff00:32
+ 1c4:	ff 00 76 60 
+ 1c8:	6a 30 ff ff.*band	#0x6,@0xffff7fff:32
+ 1cc:	7f ff 76 60 
+ 1d0:	6a 10 80 00.*band	#0x6,@0x8000:16
+ 1d4:	76 60 
+ 1d6:	6a 10 fe ff.*band	#0x6,@0xfeff:16
+ 1da:	76 60 
+ 1dc:	7e 00 76 60.*band	#0x6,@0x0:8
+ 1e0:	7e ff 76 60.*band	#0x6,@0xff:8
diff --git a/ld/testsuite/ld-h8300/relax-4.d b/ld/testsuite/ld-h8300/relax-4.d
index e7269a7..e9b8c8a 100644
--- a/ld/testsuite/ld-h8300/relax-4.d
+++ b/ld/testsuite/ld-h8300/relax-4.d
@@ -1,6 +1,6 @@
 # name: H8300 Relaxation Test 4
 # ld: --relax -m h8300self
-# objdump: -d --no-show-raw-insn
+# objdump: -d 
 
 .*:     file format .*-h8300
 
diff --git a/ld/testsuite/ld-h8300/relax-5-coff.d b/ld/testsuite/ld-h8300/relax-5-coff.d
index dae5d23..eed2ba0 100644
--- a/ld/testsuite/ld-h8300/relax-5-coff.d
+++ b/ld/testsuite/ld-h8300/relax-5-coff.d
@@ -1,4 +1,4 @@
-# name: H8300 Relaxation Test 5
+# name: H8300 Relaxation Test 5 (for COFF)
 # source: relax-5.s
 # ld: --relax -m h8300s
 # objdump: -d --no-show-raw-insn
@@ -8,43 +8,43 @@
 Disassembly of section .text:
 
 00000100 <_start>:
- 100:	01 40 6b 00 00 00 ldc	@0x0:16,ccr
- 106:	01 40 6b 00 7f ff ldc	@0x7fff:16,ccr
- 10c:	01 40 6b 20 00 00 80 00 ldc	@0x8000:32,ccr
- 114:	01 40 6b 20 00 00 ff 00 ldc	@0xff00:32,ccr
- 11c:	01 40 6b 20 00 ff ff 00 ldc	@0xffff00:32,ccr
- 124:	01 40 6b 20 ff ff 7f ff ldc	@0xffff7fff:32,ccr
- 12c:	01 40 6b 00 80 00 ldc	@0x8000:16,ccr
- 132:	01 40 6b 00 fe ff ldc	@0xfeff:16,ccr
- 138:	01 40 6b 00 ff 00 ldc	@0xff00:16,ccr
- 13e:	01 40 6b 00 ff ff ldc	@0xffff:16,ccr
- 144:	01 40 6b 80 00 00 stc	ccr,@0x0:16
- 14a:	01 40 6b 80 7f ff stc	ccr,@0x7fff:16
- 150:	01 40 6b a0 00 00 80 00 stc	ccr,@0x8000:32
- 158:	01 40 6b a0 00 00 ff 00 stc	ccr,@0xff00:32
- 160:	01 40 6b a0 00 ff ff 00 stc	ccr,@0xffff00:32
- 168:	01 40 6b a0 ff ff 7f ff stc	ccr,@0xffff7fff:32
- 170:	01 40 6b 80 80 00 stc	ccr,@0x8000:16
- 176:	01 40 6b 80 fe ff stc	ccr,@0xfeff:16
- 17c:	01 40 6b 80 ff 00 stc	ccr,@0xff00:16
- 182:	01 40 6b 80 ff ff stc	ccr,@0xffff:16
- 188:	01 41 6b 00 00 00 ldc	@0x0:16,exr
- 18e:	01 41 6b 00 7f ff ldc	@0x7fff:16,exr
- 194:	01 41 6b 20 00 00 80 00 ldc	@0x8000:32,exr
- 19c:	01 41 6b 20 00 00 ff 00 ldc	@0xff00:32,exr
- 1a4:	01 41 6b 20 00 ff ff 00 ldc	@0xffff00:32,exr
- 1ac:	01 41 6b 20 ff ff 7f ff ldc	@0xffff7fff:32,exr
- 1b4:	01 41 6b 00 80 00 ldc	@0x8000:16,exr
- 1ba:	01 41 6b 00 fe ff ldc	@0xfeff:16,exr
- 1c0:	01 41 6b 00 ff 00 ldc	@0xff00:16,exr
- 1c6:	01 41 6b 00 ff ff ldc	@0xffff:16,exr
- 1cc:	01 41 6b 80 00 00 stc	exr,@0x0:16
- 1d2:	01 41 6b 80 7f ff stc	exr,@0x7fff:16
- 1d8:	01 41 6b a0 00 00 80 00 stc	exr,@0x8000:32
- 1e0:	01 41 6b a0 00 00 ff 00 stc	exr,@0xff00:32
- 1e8:	01 41 6b a0 00 ff ff 00 stc	exr,@0xffff00:32
- 1f0:	01 41 6b a0 ff ff 7f ff stc	exr,@0xffff7fff:32
- 1f8:	01 41 6b 80 80 00 stc	exr,@0x8000:16
- 1fe:	01 41 6b 80 fe ff stc	exr,@0xfeff:16
- 204:	01 41 6b 80 ff 00 stc	exr,@0xff00:16
- 20a:	01 41 6b 80 ff ff stc	exr,@0xffff:16
+ 100:.*ldc	@0x0:16,ccr
+ 106:.*ldc	@0x7fff:16,ccr
+ 10c:.*ldc	@0x8000:32,ccr
+ 114:.*ldc	@0xff00:32,ccr
+ 11c:.*ldc	@0xffff00:32,ccr
+ 124:.*ldc	@0xffff7fff:32,ccr
+ 12c:.*ldc	@0x8000:16,ccr
+ 132:.*ldc	@0xfeff:16,ccr
+ 138:.*ldc	@0xff00:16,ccr
+ 13e:.*ldc	@0xffff:16,ccr
+ 144:.*stc	ccr,@0x0:16
+ 14a:.*stc	ccr,@0x7fff:16
+ 150:.*stc	ccr,@0x8000:32
+ 158:.*stc	ccr,@0xff00:32
+ 160:.*stc	ccr,@0xffff00:32
+ 168:.*stc	ccr,@0xffff7fff:32
+ 170:.*stc	ccr,@0x8000:16
+ 176:.*stc	ccr,@0xfeff:16
+ 17c:.*stc	ccr,@0xff00:16
+ 182:.*stc	ccr,@0xffff:16
+ 188:.*ldc	@0x0:16,exr
+ 18e:.*ldc	@0x7fff:16,exr
+ 194:.*ldc	@0x8000:32,exr
+ 19c:.*ldc	@0xff00:32,exr
+ 1a4:.*ldc	@0xffff00:32,exr
+ 1ac:.*ldc	@0xffff7fff:32,exr
+ 1b4:.*ldc	@0x8000:16,exr
+ 1ba:.*ldc	@0xfeff:16,exr
+ 1c0:.*ldc	@0xff00:16,exr
+ 1c6:.*ldc	@0xffff:16,exr
+ 1cc:.*stc	exr,@0x0:16
+ 1d2:.*stc	exr,@0x7fff:16
+ 1d8:.*stc	exr,@0x8000:32
+ 1e0:.*stc	exr,@0xff00:32
+ 1e8:.*stc	exr,@0xffff00:32
+ 1f0:.*stc	exr,@0xffff7fff:32
+ 1f8:.*stc	exr,@0x8000:16
+ 1fe:.*stc	exr,@0xfeff:16
+ 204:.*stc	exr,@0xff00:16
+ 20a:.*stc	exr,@0xffff:16
diff --git a/ld/testsuite/ld-h8300/relax.d b/ld/testsuite/ld-h8300/relax.d
index 2bf61c7..e7315a1 100644
--- a/ld/testsuite/ld-h8300/relax.d
+++ b/ld/testsuite/ld-h8300/relax.d
@@ -1,6 +1,6 @@
 # name: H8300 Relaxation Test
 # ld: --relax
-# objdump: -d --no-show-raw-insn
+# objdump: -d
 
 # Based on the test case reported by Kazu Hirata:
 # http://sources.redhat.com/ml/binutils/2002-11/msg00301.html
@@ -10,12 +10,12 @@
 Disassembly of section .text:
 
 00000100 <_start>:
- 100:	0d 00             mov.w	r0,r0
- 102:	47 02             beq	.+2 \(0x106\)
- 104:	55 02             bsr	.+2 \(0x108\)
+ 100:	0d 00.*mov.w	r0,r0
+ 102:	47 02.*beq	.+2 \(0x106\)
+ 104:	55 02.*bsr	.+2 \(0x108\)
 
 00000106 <.L1>:
- 106:	54 70             rts	
+ 106:	54 70.*rts	
 
 00000108 <_bar>:
- 108:	54 70             rts	
+ 108:	54 70.*rts