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

8 files changed, 236 insertions, 225 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b63d2cf..6befffc 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2004-07-22  Nick Clifton  <nickc@redhat.com>
+
+	PR/280
+	* gas/h8300/ffxx1-coff.d: Remove duplicated raw insn values.
+	* gas/h8300/ffxx1-elf.d: Likewise.
+	* gas/h8300/h8sx_disp2.d: Likewise.
+	* gas/h8300/h8sx_mov_imm.d: Likewise.
+	* gas/h8300/h8sx_rtsl.d: Likewise.	
+	* gas/h8300/ffxx1-coff.s: Remove inappropriate insn width specifier.
+	* gas/h8300/ffxx1-elf.s: Likewise.
+
 2004-07-21  Jan Beulich <jbeulich@novell.com>
 
 	* gas/i386/x86-64-addr32.[ds]: New test for x86-64 32-bit
diff --git a/gas/testsuite/gas/h8300/ffxx1-coff.d b/gas/testsuite/gas/h8300/ffxx1-coff.d
index 93455d5..18aa05b 100644
--- a/gas/testsuite/gas/h8300/ffxx1-coff.d
+++ b/gas/testsuite/gas/h8300/ffxx1-coff.d
@@ -8,16 +8,16 @@
 Disassembly of section .text:
 	...
 			0: 16	main
-0+0400 <main> f8 7f             mov.b	#0x7f,r0l
-0+0402 <main[+](0x|)2> 28 bb             mov.b	@0xbb:8,r0l
-0+0404 <main[+](0x|)4> 6a 88 ff b9       mov.b	r0l,@0xffb9:16
-0+0408 <main[+](0x|)8> f8 01             mov.b	#0x1,r0l
-0+040a <loop> 6a 88 ff bb       mov.b	r0l,@0xffbb:16
-0+040e <delay> 79 01 00 00       mov.w	#0x0,r1
-0+0412 <deloop> 0b 01             adds	#0x1,er1
-0+0414 <deloop[+](0x|)2> 46 00             bne	.0 \(416\)
+0+0400 <main>.*mov.b	#0x7f,r0l
+0+0402 <.*>.*mov.b	@0xbb:8,r0l
+0+0404 <.*>.*mov.b	r0l,@0xffb9:16
+0+0408 <.*>.*mov.b	#0x1,r0l
+0+040a <loop>.*mov.b	r0l,@0xffbb:16
+0+040e <delay>.*mov.w	#0x0,r1
+0+0412 <deloop>.*adds	#1,r1
+0+0414 <.*>.*bne	.0 \(0x416\)
 			415: DISP8	deloop[+]0xffffffff
-0+0416 <deloop[+](0x|)4> 12 88             rotl	r0l
-0+0418 <deloop[+](0x|)6> 40 00             bra	.0 \(41a\)
+0+0416 <.*>.*rotl.b	r0l
+0+0418 <.*>.*bra	.0 \(0x41a\)
 			419: DISP8	loop[+]0xffffffff
 	...
diff --git a/gas/testsuite/gas/h8300/ffxx1-coff.s b/gas/testsuite/gas/h8300/ffxx1-coff.s
index 53fc841..b44a19f 100644
--- a/gas/testsuite/gas/h8300/ffxx1-coff.s
+++ b/gas/testsuite/gas/h8300/ffxx1-coff.s
@@ -13,7 +13,7 @@ main:   mov.b   #0x7f,r0l       ;port 6 ddr = 7F
 	mov.b   #seed,r0l       ;start with 0000001
 loop:   mov.b   r0l,@p6dr:16    ;output to port 6 
 delay:  mov.w   #0x0000,r1
-deloop: adds.w  #1,r1
+deloop: adds    #1,r1
 	bne     deloop:8        ;not = 0
 	rotl    r0l
         bra     loop:8
diff --git a/gas/testsuite/gas/h8300/ffxx1-elf.d b/gas/testsuite/gas/h8300/ffxx1-elf.d
index efbf308..89e7224 100644
--- a/gas/testsuite/gas/h8300/ffxx1-elf.d
+++ b/gas/testsuite/gas/h8300/ffxx1-elf.d
@@ -8,16 +8,16 @@
 Disassembly of section .text:
 	...
 			0: R_H8_DIR16	main
-0+0400 <main> f8 7f             mov.b	#0x7f,r0l
-0+0402 <main[+](0x|)2> 28 bb             mov.b	@0xbb:8,r0l
-0+0404 <main[+](0x|)4> 6a 88 ff b9       mov.b	r0l,@0xffb9:16
-0+0408 <main[+](0x|)8> f8 01             mov.b	#0x1,r0l
-0+040a <loop> 6a 88 ff bb       mov.b	r0l,@0xffbb:16
-0+040e <delay> 79 01 00 00       mov.w	#0x0,r1
-0+0412 <deloop> 0b 01             adds	#0x1,er1
-0+0414 <deloop[+](0x|)2> 46 00             bne	.0 \(416\)
+0+0400 <main>.*mov.b	#0x7f,r0l
+0+0402 <.*>.*mov.b	@0xbb:8,r0l
+0+0404 <.*>.*mov.b	r0l,@0xffb9:16
+0+0408 <.*>.*mov.b	#0x1,r0l
+0+040a <loop>.*mov.b	r0l,@0xffbb:16
+0+040e <delay>.*mov.w	#0x0,r1
+0+0412 <deloop>.*adds	#1,r1
+0+0414 <.*>.*bne	.0 \(0x416\)
 			415: R_H8_PCREL8	deloop
-0+0416 <deloop[+](0x|)4> 12 88             rotl	r0l
-0+0418 <deloop[+](0x|)6> 40 00             bra	.0 \(41a\)
+0+0416 <.*>.*rotl.b	r0l
+0+0418 <.*>.*bra	.0 \(0x41a\)
 			419: R_H8_PCREL8	loop
 	...
diff --git a/gas/testsuite/gas/h8300/ffxx1-elf.s b/gas/testsuite/gas/h8300/ffxx1-elf.s
index 53fc841..b44a19f 100644
--- a/gas/testsuite/gas/h8300/ffxx1-elf.s
+++ b/gas/testsuite/gas/h8300/ffxx1-elf.s
@@ -13,7 +13,7 @@ main:   mov.b   #0x7f,r0l       ;port 6 ddr = 7F
 	mov.b   #seed,r0l       ;start with 0000001
 loop:   mov.b   r0l,@p6dr:16    ;output to port 6 
 delay:  mov.w   #0x0000,r1
-deloop: adds.w  #1,r1
+deloop: adds    #1,r1
 	bne     deloop:8        ;not = 0
 	rotl    r0l
         bra     loop:8
diff --git a/gas/testsuite/gas/h8300/h8sx_disp2.d b/gas/testsuite/gas/h8300/h8sx_disp2.d
index a3c712c..77aaba3 100644
--- a/gas/testsuite/gas/h8300/h8sx_disp2.d
+++ b/gas/testsuite/gas/h8300/h8sx_disp2.d
@@ -5,42 +5,42 @@
 Disassembly of section \.text:
 
 0+00 <\.text>:
- .*:	01 75 68 08 *	01 75 68 08 80 02 add.b	#0x2,@\(0x1:2,r0\)
- .*:	80 02 *
- .*:	01 76 68 08 *	01 76 68 08 80 02 add.b	#0x2,@\(0x2:2,r0\)
- .*:	80 02 *
- .*:	01 77 68 08 *	01 77 68 08 80 02 add.b	#0x2,@\(0x3:2,r0\)
- .*:	80 02 *
- .*:	01 74 6e 08 *	01 74 6e 08 00 04 80 02 add.b	#0x2,@\(0x4:16,r0\)
- .*:	00 04 80 02 *
- .*:	78 04 6a 28 *	78 04 6a 28 00 00 00 00 80 02 add.b	#0x2,@\(0x0:32,r0\)
- .*:	00 00 00 00 *
- .*:	80 02 *
- .*:	01 5e c0 10 *	01 5e c0 10 00 01 00 02 add.w	#0x2,@\(0x1:16,r0\)
- .*:	00 01 00 02 *
- .*:	01 5e 10 10 *	01 5e 10 10 00 02 add.w	#0x2,@\(0x2:2,r0\)
- .*:	00 02 *
- .*:	01 5e 20 10 *	01 5e 20 10 00 02 add.w	#0x2,@\(0x4:2,r0\)
- .*:	00 02 *
- .*:	01 5e 30 10 *	01 5e 30 10 00 02 add.w	#0x2,@\(0x6:2,r0\)
- .*:	00 02 *
- .*:	01 5e c0 10 *	01 5e c0 10 00 08 00 02 add.w	#0x2,@\(0x8:16,r0\)
- .*:	00 08 00 02 *
- .*:	01 5e c8 10 *	01 5e c8 10 00 00 00 00 00 02 add.w	#0x2,@\(0x0:32,r0\)
- .*:	00 00 00 00 *
- .*:	00 02 *
- .*:	01 0e c0 10 *	01 0e c0 10 00 01 00 02 add.l	#0x2,@\(0x1:16,r0\)
- .*:	00 01 00 02 *
- .*:	01 0e c0 10 *	01 0e c0 10 00 02 00 02 add.l	#0x2,@\(0x2:16,r0\)
- .*:	00 02 00 02 *
- .*:	01 0e 10 10 *	01 0e 10 10 00 02 add.l	#0x2,@\(0x4:2,r0\)
- .*:	00 02 *
- .*:	01 0e 20 10 *	01 0e 20 10 00 02 add.l	#0x2,@\(0x8:2,r0\)
- .*:	00 02 *
- .*:	01 0e 30 10 *	01 0e 30 10 00 02 add.l	#0x2,@\(0xc:2,r0\)
- .*:	00 02 *
- .*:	01 0e c0 10 *	01 0e c0 10 00 10 00 02 add.l	#0x2,@\(0x10:16,r0\)
- .*:	00 10 00 02 *
- .*:	01 0e c8 10 *	01 0e c8 10 00 00 00 00 00 02 add.l	#0x2,@\(0x0:32,r0\)
- .*:	00 00 00 00 *
- .*:	00 02 *
+ .*:	01 75 68 08.*add.b	#0x2,@\(0x1:2,er0\)
+ .*:	80 02 
+ .*:	01 76 68 08.*add.b	#0x2,@\(0x2:2,er0\)
+ .*:	80 02 
+ .*:	01 77 68 08.*add.b	#0x2,@\(0x3:2,er0\)
+ .*:	80 02 
+ .*:	01 74 6e 08.*add.b	#0x2,@\(0x4:16,er0\)
+ .*:	00 04 80 02 
+ .*:	78 04 6a 28.*add.b	#0x2,@\(0x0:32,er0\)
+ .*:	00 00 00 00 
+ .*:	80 02 
+ .*:	01 5e c0 10.*add.w	#0x2,@\(0x1:16,er0\)
+ .*:	00 01 00 02 
+ .*:	01 5e 10 10.*add.w	#0x2,@\(0x2:2,er0\)
+ .*:	00 02 
+ .*:	01 5e 20 10.*add.w	#0x2,@\(0x4:2,er0\)
+ .*:	00 02 
+ .*:	01 5e 30 10.*add.w	#0x2,@\(0x6:2,er0\)
+ .*:	00 02 
+ .*:	01 5e c0 10.*add.w	#0x2,@\(0x8:16,er0\)
+ .*:	00 08 00 02 
+ .*:	01 5e c8 10.*add.w	#0x2,@\(0x0:32,er0\)
+ .*:	00 00 00 00 
+ .*:	00 02 
+ .*:	01 0e c0 10.*add.l	#0x2,@\(0x1:16,er0\)
+ .*:	00 01 00 02 
+ .*:	01 0e c0 10.*add.l	#0x2,@\(0x2:16,er0\)
+ .*:	00 02 00 02 
+ .*:	01 0e 10 10.*add.l	#0x2,@\(0x4:2,er0\)
+ .*:	00 02 
+ .*:	01 0e 20 10.*add.l	#0x2,@\(0x8:2,er0\)
+ .*:	00 02 
+ .*:	01 0e 30 10.*add.l	#0x2,@\(0xc:2,er0\)
+ .*:	00 02 
+ .*:	01 0e c0 10.*add.l	#0x2,@\(0x10:16,er0\)
+ .*:	00 10 00 02 
+ .*:	01 0e c8 10.*add.l	#0x2,@\(0x0:32,er0\)
+ .*:	00 00 00 00 
+ .*:	00 02 
diff --git a/gas/testsuite/gas/h8300/h8sx_mov_imm.d b/gas/testsuite/gas/h8300/h8sx_mov_imm.d
index 15a5ff9..968e3c7 100644
--- a/gas/testsuite/gas/h8300/h8sx_mov_imm.d
+++ b/gas/testsuite/gas/h8300/h8sx_mov_imm.d
@@ -5,303 +5,303 @@
 Disassembly of section \.text:
 
 .* <.*>:
-.*:	fa 00 *	fa 00 * mov.b	#0x0,r2l
+.*:	fa 00 *	mov.b	#0x0,r2l
 			.*: R_H8_DIR8	foo
-.*:	fa 00 *	fa 00 * mov.b	#0x0,r2l
+.*:	fa 00 *	mov.b	#0x0,r2l
 			.*: R_H8_DIR8	.L1
-.*:	fa 00 *	fa 00 * mov.b	#0x0,r2l
+.*:	fa 00 *	mov.b	#0x0,r2l
 			.*: R_H8_DIR8	bar
-.*:	01 7d 02 00 *	01 7d 02 00 * mov.b	#0x0,@r2
+.*:	01 7d 02 00[ 	]*mov.b	#0x0,@er2
 			.*: R_H8_DIR8	foo
-.*:	01 7d 02 00 *	01 7d 02 00 * mov.b	#0x0,@r2
+.*:	01 7d 02 00[ 	]*mov.b	#0x0,@er2
 			.*: R_H8_DIR8	.L1
-.*:	01 7d 02 00 *	01 7d 02 00 * mov.b	#0x0,@r2
+.*:	01 7d 02 00[ 	]*mov.b	#0x0,@er2
 			.*: R_H8_DIR8	bar
-.*:	01 7d b2 00 *	01 7d b2 00 * mov.b	#0x0,@-r2
+.*:	01 7d b2 00[ 	]*mov.b	#0x0,@-er2
 			.*: R_H8_DIR8	foo
-.*:	01 7d 82 00 *	01 7d 82 00 * mov.b	#0x0,@r2\+
+.*:	01 7d 82 00[ 	]*mov.b	#0x0,@er2\+
 			.*: R_H8_DIR8	.L1
-.*:	01 7d a2 00 *	01 7d a2 00 * mov.b	#0x0,@r2-
+.*:	01 7d a2 00[ 	]*mov.b	#0x0,@er2-
 			.*: R_H8_DIR8	bar
-.*:	01 7d 22 00 *	01 7d 22 00 * mov.b	#0x0,@\(0x2:2,r2\)
+.*:	01 7d 22 00[ 	]*mov.b	#0x0,@\(0x2:2,er2\)
 			.*: R_H8_DIR8	foo
-.*:	01 7d 22 00 *	01 7d 22 00 * mov.b	#0x0,@\(0x2:2,r2\)
+.*:	01 7d 22 00[ 	]*mov.b	#0x0,@\(0x2:2,er2\)
 			.*: R_H8_DIR8	.L1
-.*:	01 7d 22 00 *	01 7d 22 00 * mov.b	#0x0,@\(0x2:2,r2\)
+.*:	01 7d 22 00[ 	]*mov.b	#0x0,@\(0x2:2,er2\)
 			.*: R_H8_DIR8	bar
-.*:	01 7d c2 00 *	01 7d c2 00 00 10 * mov.b	#0x0,@\(0x10:16,r2\)
+.*:	01 7d c2 00[ 	]*mov.b	#0x0,@\(0x10:16,er2\)
 .*:	00 10 *
 			.*: R_H8_DIR8	foo
-.*:	01 7d c2 00 *	01 7d c2 00 00 10 * mov.b	#0x0,@\(0x10:16,r2\)
+.*:	01 7d c2 00[ 	]*mov.b	#0x0,@\(0x10:16,er2\)
 .*:	00 10 *
 			.*: R_H8_DIR8	.L1
-.*:	01 7d c2 00 *	01 7d c2 00 00 10 * mov.b	#0x0,@\(0x10:16,r2\)
+.*:	01 7d c2 00[ 	]*mov.b	#0x0,@\(0x10:16,er2\)
 .*:	00 10 *
 			.*: R_H8_DIR8	bar
-.*:	01 7d d2 00 *	01 7d d2 00 00 10 * mov.b	#0x0,@\(0x10:16,r2l.b\)
+.*:	01 7d d2 00[ 	]*mov.b	#0x0,@\(0x10:16,r2l.b\)
 .*:	00 10 *
 			.*: R_H8_DIR8	foo
-.*:	01 7d e2 00 *	01 7d e2 00 00 10 * mov.b	#0x0,@\(0x10:16,r2.w\)
+.*:	01 7d e2 00[ 	]*mov.b	#0x0,@\(0x10:16,r2.w\)
 .*:	00 10 *
 			.*: R_H8_DIR8	.L1
-.*:	01 7d f2 00 *	01 7d f2 00 00 10 * mov.b	#0x0,@\(0x10:16,er2.l\)
+.*:	01 7d f2 00[ 	]*mov.b	#0x0,@\(0x10:16,er2.l\)
 .*:	00 10 *
 			.*: R_H8_DIR8	bar
-.*:	01 7d ca 00 *	01 7d ca 00 00 01 23 45 * mov.b	#0x0,@\(0x12345:32,r2\)
+.*:	01 7d ca 00[ 	]*mov.b	#0x0,@\(0x12345:32,er2\)
 .*:	00 01 23 45 *
 			.*: R_H8_DIR8	foo
-.*:	01 7d ca 00 *	01 7d ca 00 00 01 23 45 * mov.b	#0x0,@\(0x12345:32,r2\)
+.*:	01 7d ca 00[ 	]*mov.b	#0x0,@\(0x12345:32,er2\)
 .*:	00 01 23 45 *
 			.*: R_H8_DIR8	.L1
-.*:	01 7d ca 00 *	01 7d ca 00 00 01 23 45 * mov.b	#0x0,@\(0x12345:32,r2\)
+.*:	01 7d ca 00[ 	]*mov.b	#0x0,@\(0x12345:32,er2\)
 .*:	00 01 23 45 *
 			.*: R_H8_DIR8	bar
-.*:	01 7d da 00 *	01 7d da 00 00 01 23 45 * mov.b	#0x0,@\(0x12345:32,r2l.b\)
+.*:	01 7d da 00[ 	]*mov.b	#0x0,@\(0x12345:32,r2l.b\)
 .*:	00 01 23 45 *
 			.*: R_H8_DIR8	foo
-.*:	01 7d ea 00 *	01 7d ea 00 00 01 23 45 * mov.b	#0x0,@\(0x12345:32,r2.w\)
+.*:	01 7d ea 00[ 	]*mov.b	#0x0,@\(0x12345:32,r2.w\)
 .*:	00 01 23 45 *
 			.*: R_H8_DIR8	.L1
-.*:	01 7d fa 00 *	01 7d fa 00 00 01 23 45 * mov.b	#0x0,@\(0x12345:32,er2.l\)
+.*:	01 7d fa 00[ 	]*mov.b	#0x0,@\(0x12345:32,er2.l\)
 .*:	00 01 23 45 *
 			.*: R_H8_DIR8	bar
-.*:	01 7d 40 00 *	01 7d 40 00 80 00 * mov.b	#0x0,@0x8000:16
+.*:	01 7d 40 00[ 	]*mov.b	#0x0,@0x8000:16
 .*:	80 00 *
 			.*: R_H8_DIR8	foo
-.*:	01 7d 40 00 *	01 7d 40 00 80 00 * mov.b	#0x0,@0x8000:16
+.*:	01 7d 40 00[ 	]*mov.b	#0x0,@0x8000:16
 .*:	80 00 *
 			.*: R_H8_DIR8	.L1
-.*:	01 7d 40 00 *	01 7d 40 00 80 00 * mov.b	#0x0,@0x8000:16
+.*:	01 7d 40 00[ 	]*mov.b	#0x0,@0x8000:16
 .*:	80 00 *
 			.*: R_H8_DIR8	bar
-.*:	01 7d 48 00 *	01 7d 48 00 00 01 80 00 * mov.b	#0x0,@0x18000:32
+.*:	01 7d 48 00[ 	]*mov.b	#0x0,@0x18000:32
 .*:	00 01 80 00 *
 			.*: R_H8_DIR8	foo
-.*:	01 7d 48 00 *	01 7d 48 00 00 01 80 00 * mov.b	#0x0,@0x18000:32
+.*:	01 7d 48 00[ 	]*mov.b	#0x0,@0x18000:32
 .*:	00 01 80 00 *
 			.*: R_H8_DIR8	.L1
-.*:	01 7d 48 00 *	01 7d 48 00 00 01 80 00 * mov.b	#0x0,@0x18000:32
+.*:	01 7d 48 00[ 	]*mov.b	#0x0,@0x18000:32
 .*:	00 01 80 00 *
 			.*: R_H8_DIR8	bar
-.*:	79 02 00 00 *	79 02 00 00 * mov.w	#0x0,r2
+.*:	79 02 00 00[ 	]*mov.w	#0x0,r2
 			.*: R_H8_DIR16	foo
-.*:	79 02 00 00 *	79 02 00 00 * mov.w	#0x0,r2
+.*:	79 02 00 00[ 	]*mov.w	#0x0,r2
 			.*: R_H8_DIR16	.L1
-.*:	79 02 00 00 *	79 02 00 00 * mov.w	#0x0,r2
+.*:	79 02 00 00[ 	]*mov.w	#0x0,r2
 			.*: R_H8_DIR16	bar
-.*:	79 74 00 00 *	79 74 00 00 02 00 * mov.w	#0x0,@r2
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@er2
 .*:	02 00 *
 			.*: R_H8_DIR16	foo
-.*:	79 74 00 00 *	79 74 00 00 02 00 * mov.w	#0x0,@r2
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@er2
 .*:	02 00 *
 			.*: R_H8_DIR16	.L1
-.*:	79 74 00 00 *	79 74 00 00 02 00 * mov.w	#0x0,@r2
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@er2
 .*:	02 00 *
 			.*: R_H8_DIR16	bar
-.*:	79 74 00 00 *	79 74 00 00 b2 00 * mov.w	#0x0,@-r2
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@-er2
 .*:	b2 00 *
 			.*: R_H8_DIR16	foo
-.*:	79 74 00 00 *	79 74 00 00 82 00 * mov.w	#0x0,@r2\+
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@er2\+
 .*:	82 00 *
 			.*: R_H8_DIR16	.L1
-.*:	79 74 00 00 *	79 74 00 00 a2 00 * mov.w	#0x0,@r2-
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@er2-
 .*:	a2 00 *
 			.*: R_H8_DIR16	bar
-.*:	79 74 00 00 *	79 74 00 00 22 00 * mov.w	#0x0,@\(0x4:2,r2\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x4:2,er2\)
 .*:	22 00 *
 			.*: R_H8_DIR16	foo
-.*:	79 74 00 00 *	79 74 00 00 22 00 * mov.w	#0x0,@\(0x4:2,r2\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x4:2,er2\)
 .*:	22 00 *
 			.*: R_H8_DIR16	.L1
-.*:	79 74 00 00 *	79 74 00 00 22 00 * mov.w	#0x0,@\(0x4:2,r2\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x4:2,er2\)
 .*:	22 00 *
 			.*: R_H8_DIR16	bar
-.*:	79 74 00 00 *	79 74 00 00 c2 00 00 10 * mov.w	#0x0,@\(0x10:16,r2\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x10:16,er2\)
 .*:	c2 00 00 10 *
 			.*: R_H8_DIR16	foo
-.*:	79 74 00 00 *	79 74 00 00 c2 00 00 10 * mov.w	#0x0,@\(0x10:16,r2\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x10:16,er2\)
 .*:	c2 00 00 10 *
 			.*: R_H8_DIR16	.L1
-.*:	79 74 00 00 *	79 74 00 00 c2 00 00 10 * mov.w	#0x0,@\(0x10:16,r2\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x10:16,er2\)
 .*:	c2 00 00 10 *
 			.*: R_H8_DIR16	bar
-.*:	79 74 00 00 *	79 74 00 00 d2 00 00 10 * mov.w	#0x0,@\(0x10:16,r2l.b\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x10:16,r2l.b\)
 .*:	d2 00 00 10 *
 			.*: R_H8_DIR16	foo
-.*:	79 74 00 00 *	79 74 00 00 e2 00 00 10 * mov.w	#0x0,@\(0x10:16,r2.w\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x10:16,r2.w\)
 .*:	e2 00 00 10 *
 			.*: R_H8_DIR16	.L1
-.*:	79 74 00 00 *	79 74 00 00 f2 00 00 10 * mov.w	#0x0,@\(0x10:16,er2.l\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x10:16,er2.l\)
 .*:	f2 00 00 10 *
 			.*: R_H8_DIR16	bar
-.*:	79 74 00 00 *	79 74 00 00 ca 00 00 01 23 45 * mov.w	#0x0,@\(0x12345:32,r2\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x12345:32,er2\)
 .*:	ca 00 00 01 *
 .*:	23 45 *
 			.*: R_H8_DIR16	foo
-.*:	79 74 00 00 *	79 74 00 00 ca 00 00 01 23 45 * mov.w	#0x0,@\(0x12345:32,r2\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x12345:32,er2\)
 .*:	ca 00 00 01 *
 .*:	23 45 *
 			.*: R_H8_DIR16	.L1
-.*:	79 74 00 00 *	79 74 00 00 ca 00 00 01 23 45 * mov.w	#0x0,@\(0x12345:32,r2\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x12345:32,er2\)
 .*:	ca 00 00 01 *
 .*:	23 45 *
 			.*: R_H8_DIR16	bar
-.*:	79 74 00 00 *	79 74 00 00 da 00 00 01 23 45 * mov.w	#0x0,@\(0x12345:32,r2l.b\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x12345:32,r2l.b\)
 .*:	da 00 00 01 *
 .*:	23 45 *
 			.*: R_H8_DIR16	foo
-.*:	79 74 00 00 *	79 74 00 00 ea 00 00 01 23 45 * mov.w	#0x0,@\(0x12345:32,r2.w\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x12345:32,r2.w\)
 .*:	ea 00 00 01 *
 .*:	23 45 *
 			.*: R_H8_DIR16	.L1
-.*:	79 74 00 00 *	79 74 00 00 fa 00 00 01 23 45 * mov.w	#0x0,@\(0x12345:32,er2.l\)
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@\(0x12345:32,er2.l\)
 .*:	fa 00 00 01 *
 .*:	23 45 *
 			.*: R_H8_DIR16	bar
-.*:	79 74 00 00 *	79 74 00 00 40 00 80 00 * mov.w	#0x0,@0x8000:16
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@0x8000:16
 .*:	40 00 80 00 *
 			.*: R_H8_DIR16	foo
-.*:	79 74 00 00 *	79 74 00 00 40 00 80 00 * mov.w	#0x0,@0x8000:16
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@0x8000:16
 .*:	40 00 80 00 *
 			.*: R_H8_DIR16	.L1
-.*:	79 74 00 00 *	79 74 00 00 40 00 80 00 * mov.w	#0x0,@0x8000:16
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@0x8000:16
 .*:	40 00 80 00 *
 			.*: R_H8_DIR16	bar
-.*:	79 74 00 00 *	79 74 00 00 48 00 00 01 80 00 * mov.w	#0x0,@0x18000:32
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@0x18000:32
 .*:	48 00 00 01 *
-.*:	80 00 *
+.*:	80 00 
 			.*: R_H8_DIR16	foo
-.*:	79 74 00 00 *	79 74 00 00 48 00 00 01 80 00 * mov.w	#0x0,@0x18000:32
-.*:	48 00 00 01 *
-.*:	80 00 *
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@0x18000:32
+.*:	48 00 00 01 
+.*:	80 00 
 			.*: R_H8_DIR16	.L1
-.*:	79 74 00 00 *	79 74 00 00 48 00 00 01 80 00 * mov.w	#0x0,@0x18000:32
-.*:	48 00 00 01 *
-.*:	80 00 *
+.*:	79 74 00 00[ 	]*mov.w	#0x0,@0x18000:32
+.*:	48 00 00 01 
+.*:	80 00 
 			.*: R_H8_DIR16	bar
 
 .* <.*>:
-.*:	7a 02 00 00 *	7a 02 00 00 00 00 * mov.l	#0x0,er2
-.*:	00 00 *
+.*:	7a 02 00 00[ 	]*mov.l	#0x0,er2
+.*:	00 00 
 			.*: R_H8_DIR32	foo
-.*:	7a 02 00 00 *	7a 02 00 00 00 00 * mov.l	#0x0,er2
-.*:	00 00 *
+.*:	7a 02 00 00[ 	]*mov.l	#0x0,er2
+.*:	00 00 
 			.*: R_H8_DIR32	.L1
-.*:	7a 02 00 00 *	7a 02 00 00 00 00 * mov.l	#0x0,er2
-.*:	00 00 *
+.*:	7a 02 00 00[ 	]*mov.l	#0x0,er2
+.*:	00 00 
 			.*: R_H8_DIR32	bar
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 02 00 * mov.l	#0x0,@r2
-.*:	00 00 02 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@er2
+.*:	00 00 02 00 
 			.*: R_H8_DIR32	foo
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 02 00 * mov.l	#0x0,@r2
-.*:	00 00 02 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@er2
+.*:	00 00 02 00 
 			.*: R_H8_DIR32	.L1
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 02 00 * mov.l	#0x0,@r2
-.*:	00 00 02 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@er2
+.*:	00 00 02 00 
 			.*: R_H8_DIR32	bar
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 b2 00 * mov.l	#0x0,@-r2
-.*:	00 00 b2 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@-er2
+.*:	00 00 b2 00 
 			.*: R_H8_DIR32	foo
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 82 00 * mov.l	#0x0,@r2\+
-.*:	00 00 82 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@er2\+
+.*:	00 00 82 00 
 			.*: R_H8_DIR32	.L1
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 a2 00 * mov.l	#0x0,@r2-
-.*:	00 00 a2 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@er2-
+.*:	00 00 a2 00 
 			.*: R_H8_DIR32	bar
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 22 00 * mov.l	#0x0,@\(0x8:2,r2\)
-.*:	00 00 22 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x8:2,er2\)
+.*:	00 00 22 00 
 			.*: R_H8_DIR32	foo
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 22 00 * mov.l	#0x0,@\(0x8:2,r2\)
-.*:	00 00 22 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x8:2,er2\)
+.*:	00 00 22 00 
 			.*: R_H8_DIR32	.L1
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 22 00 * mov.l	#0x0,@\(0x8:2,r2\)
-.*:	00 00 22 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x8:2,er2\)
+.*:	00 00 22 00 
 			.*: R_H8_DIR32	bar
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 c2 00 00 10 * mov.l	#0x0,@\(0x10:16,r2\)
-.*:	00 00 c2 00 *
-.*:	00 10 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x10:16,er2\)
+.*:	00 00 c2 00 
+.*:	00 10 
 			.*: R_H8_DIR32	foo
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 c2 00 00 10 * mov.l	#0x0,@\(0x10:16,r2\)
-.*:	00 00 c2 00 *
-.*:	00 10 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x10:16,er2\)
+.*:	00 00 c2 00 
+.*:	00 10 
 			.*: R_H8_DIR32	.L1
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 c2 00 00 10 * mov.l	#0x0,@\(0x10:16,r2\)
-.*:	00 00 c2 00 *
-.*:	00 10 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x10:16,er2\)
+.*:	00 00 c2 00 
+.*:	00 10 
 			.*: R_H8_DIR32	bar
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 d2 00 00 10 * mov.l	#0x0,@\(0x10:16,r2l.b\)
-.*:	00 00 d2 00 *
-.*:	00 10 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x10:16,r2l.b\)
+.*:	00 00 d2 00 
+.*:	00 10 
 			.*: R_H8_DIR32	foo
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 e2 00 00 10 * mov.l	#0x0,@\(0x10:16,r2.w\)
-.*:	00 00 e2 00 *
-.*:	00 10 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x10:16,r2.w\)
+.*:	00 00 e2 00 
+.*:	00 10 
 			.*: R_H8_DIR32	.L1
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 f2 00 00 10 * mov.l	#0x0,@\(0x10:16,er2.l\)
-.*:	00 00 f2 00 *
-.*:	00 10 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x10:16,er2.l\)
+.*:	00 00 f2 00 
+.*:	00 10 
 			.*: R_H8_DIR32	bar
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 ca 00 00 01 23 45 * mov.l	#0x0,@\(0x12345:32,r2\)
-.*:	00 00 ca 00 *
-.*:	00 01 23 45 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x12345:32,er2\)
+.*:	00 00 ca 00 
+.*:	00 01 23 45 
 			.*: R_H8_DIR32	foo
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 ca 00 00 01 23 45 * mov.l	#0x0,@\(0x12345:32,r2\)
-.*:	00 00 ca 00 *
-.*:	00 01 23 45 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x12345:32,er2\)
+.*:	00 00 ca 00 
+.*:	00 01 23 45 
 			.*: R_H8_DIR32	.L1
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 ca 00 00 01 23 45 * mov.l	#0x0,@\(0x12345:32,r2\)
-.*:	00 00 ca 00 *
-.*:	00 01 23 45 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x12345:32,er2\)
+.*:	00 00 ca 00 
+.*:	00 01 23 45 
 			.*: R_H8_DIR32	bar
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 da 00 00 01 23 45 * mov.l	#0x0,@\(0x12345:32,r2l.b\)
-.*:	00 00 da 00 *
-.*:	00 01 23 45 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x12345:32,r2l.b\)
+.*:	00 00 da 00 
+.*:	00 01 23 45 
 			.*: R_H8_DIR32	foo
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 ea 00 00 01 23 45 * mov.l	#0x0,@\(0x12345:32,r2.w\)
-.*:	00 00 ea 00 *
-.*:	00 01 23 45 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x12345:32,r2.w\)
+.*:	00 00 ea 00 
+.*:	00 01 23 45 
 			.*: R_H8_DIR32	.L1
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 fa 00 00 01 23 45 * mov.l	#0x0,@\(0x12345:32,er2.l\)
-.*:	00 00 fa 00 *
-.*:	00 01 23 45 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@\(0x12345:32,er2.l\)
+.*:	00 00 fa 00 
+.*:	00 01 23 45 
 			.*: R_H8_DIR32	bar
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 40 00 80 00 * mov.l	#0x0,@0x8000:16
-.*:	00 00 40 00 *
-.*:	80 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@0x8000:16
+.*:	00 00 40 00 
+.*:	80 00 
 			.*: R_H8_DIR32	foo
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 40 00 80 00 * mov.l	#0x0,@0x8000:16
-.*:	00 00 40 00 *
-.*:	80 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@0x8000:16
+.*:	00 00 40 00 
+.*:	80 00 
 			.*: R_H8_DIR32	.L1
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 40 00 80 00 * mov.l	#0x0,@0x8000:16
-.*:	00 00 40 00 *
-.*:	80 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@0x8000:16
+.*:	00 00 40 00 
+.*:	80 00 
 			.*: R_H8_DIR32	bar
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 48 00 00 01 80 00 * mov.l	#0x0,@0x18000:32
-.*:	00 00 48 00 *
-.*:	00 01 80 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@0x18000:32
+.*:	00 00 48 00 
+.*:	00 01 80 00 
 			.*: R_H8_DIR32	foo
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 48 00 00 01 80 00 * mov.l	#0x0,@0x18000:32
-.*:	00 00 48 00 *
-.*:	00 01 80 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@0x18000:32
+.*:	00 00 48 00 
+.*:	00 01 80 00 
 			.*: R_H8_DIR32	.L1
-.*:	7a 74 00 00 *	7a 74 00 00 00 00 48 00 00 01 80 00 * mov.l	#0x0,@0x18000:32
-.*:	00 00 48 00 *
-.*:	00 01 80 00 *
+.*:	7a 74 00 00[ 	]*mov.l	#0x0,@0x18000:32
+.*:	00 00 48 00 
+.*:	00 01 80 00 
 			.*: R_H8_DIR32	bar
-.*:	79 74 ff ff *	79 74 ff ff 00 00 * mov.w	#0xffff,@r0
-.*:	00 00 *
-.*:	01 5d 00 00 *	01 5d 00 00 * mov.w	#0x0,@r0
-.*:	01 5d 00 01 *	01 5d 00 01 * mov.w	#0x1,@r0
-.*:	01 5d 00 ff *	01 5d 00 ff * mov.w	#0xff,@r0
-.*:	79 74 01 00 *	79 74 01 00 00 00 * mov.w	#0x100,@r0
-.*:	00 00 *
-.*:	7a 74 ff ff *	7a 74 ff ff ff ff 00 00 * mov.l	#0xffffffff,@r0
-.*:	ff ff 00 00 *
-.*:	01 0d 00 00 *	01 0d 00 00 * mov.l	#0x0,@r0
-.*:	01 0d 00 01 *	01 0d 00 01 * mov.l	#0x1,@r0
-.*:	01 0d 00 ff *	01 0d 00 ff * mov.l	#0xff,@r0
-.*:	7a 7c 01 00 *	7a 7c 01 00 00 00 * mov.l	#0x100,@r0
-.*:	00 00 *
+.*:	79 74 ff ff[ 	]*mov.w	#0xffff,@er0
+.*:	00 00 
+.*:	01 5d 00 00[ 	]*mov.w	#0x0,@er0
+.*:	01 5d 00 01[ 	]*mov.w	#0x1,@er0
+.*:	01 5d 00 ff[ 	]*mov.w	#0xff,@er0
+.*:	79 74 01 00[ 	]*mov.w	#0x100,@er0
+.*:	00 00 
+.*:	7a 74 ff ff[ 	]*mov.l	#0xffffffff,@er0
+.*:	ff ff 00 00 
+.*:	01 0d 00 00[ 	]*mov.l	#0x0,@er0
+.*:	01 0d 00 01[ 	]*mov.l	#0x1,@er0
+.*:	01 0d 00 ff[ 	]*mov.l	#0xff,@er0
+.*:	7a 7c 01 00[ 	]*mov.l	#0x100,@er0
+.*:	00 00 
 .* <.*>:
 	\.\.\.
diff --git a/gas/testsuite/gas/h8300/h8sx_rtsl.d b/gas/testsuite/gas/h8300/h8sx_rtsl.d
index 648faf9..3275058 100644
--- a/gas/testsuite/gas/h8300/h8sx_rtsl.d
+++ b/gas/testsuite/gas/h8300/h8sx_rtsl.d
@@ -5,10 +5,10 @@
 Disassembly of section \.text:
 
 0+00 <\.text>:
- *0:	54 00 *	54 00 * rts/l	er0
- *2:	54 01 *	54 01 * rts/l	er1
- *4:	54 03 *	54 03 * rts/l	er3
- *6:	54 05 *	54 05 * rts/l	er5
- *8:	54 16 *	54 16 * rts/l	er5-er6
- *a:	54 25 *	54 25 * rts/l	er3-er5
- *c:	54 34 *	54 34 * rts/l	er1-er4
+ *0:	54 00 *	rts/l	er0
+ *2:	54 01 *	rts/l	er1
+ *4:	54 03 *	rts/l	er3
+ *6:	54 05 *	rts/l	er5
+ *8:	54 16 *	rts/l	er5-er6
+ *a:	54 25 *	rts/l	er3-er5
+ *c:	54 34 *	rts/l	er1-er4