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

diff --git a/binutils/objdump.c b/binutils/objdump.c
index 683203f..7cc9640 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1407,6 +1407,7 @@ disassemble_bytes (struct disassemble_info * info,
              for (j = addr_offset * opb; j < addr_offset * opb + pb; j += bpc)
                {
                  int k;
+
                  if (bpc > 1 && info->display_endian == BFD_ENDIAN_LITTLE)
                    {
                      for (k = bpc - 1; k >= 0; k--)

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b63d2cf..6befffc 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 74732d4..50a7f14 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-22  Nick Clifton  <nickc@redhat.com>
+
+       PR/280
+       * ld-h8300/relax-3-coff.d: Remove duplicated raw insn values.
+       * ld-h8300/relax-3.d: Likewise.
+       * ld-h8300/relax-4-coff.d: Likewise.
+       * ld-h8300/relax-4.d: Likewise.
+       * ld-h8300/relax-5-coff.d: Likewise.
+       * ld-h8300/relax.d: Likewise.
+
 2004-07-22  H.J. Lu  <hongjiu.lu@intel.com>
 
        * ld-scripts/crossref.exp: XFAIL ia64-*-* on the first test.

diff --git a/ld/testsuite/ld-h8300/relax-3-coff.d b/ld/testsuite/ld-h8300/relax-3-coff.d
index 49a68cf..0384398 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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      

diff --git a/ld/testsuite/ld-scripts/size-2.d b/ld/testsuite/ld-scripts/size-2.d
index dfcc3e4..f44f908 100644 (file)
--- a/ld/testsuite/ld-scripts/size-2.d
+++ b/ld/testsuite/ld-scripts/size-2.d
@@ -13,5 +13,5 @@ Program Headers:
  Section to Segment mapping:
  +Segment Sections\.\.\.
  +00 .*
- +01 +\.text \.tdata \.map 
- +02 +\.tdata \.tbss \.map 
+ +01.*\.text.*\.tdata.*
+ +02.*\.tdata.*

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 65fd78c..159f6d0 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-22  Nick Clifton  <nickc@redhat.com>
+
+       PR/280
+       * h8300-dis.c (bfd_h8_disassemble): Do not dump raw bytes for the
+       insns - this is done by objdump itself.
+       * h8500-dis.c (print_insn_h8500): Likewise.
+
 2004-07-21  Jan Beulich <jbeulich@novell.com>
 
        * i386-dis.c (OP_E): Show rip-relative addressing in 64-bit mode

diff --git a/opcodes/h8300-dis.c b/opcodes/h8300-dis.c
index 2587919..8ba93f6 100644 (file)
--- a/opcodes/h8300-dis.c
+++ b/opcodes/h8300-dis.c
@@ -1,20 +1,20 @@
 /* Disassemble h8300 instructions.
-   Copyright 1993, 1994, 1996, 1998, 2000, 2001, 2002, 2003
+   Copyright 1993, 1994, 1996, 1998, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define DEFINE_TABLE
 
@@ -640,14 +640,6 @@ bfd_h8_disassemble (addr, info, mach)
                }
              else if (looking_for == (op_type) E)
                {
-                 int i;
-
-                 for (i = 0; i < qi->length; i++)
-                   outfn (stream, "%02x ", data[i]);
-
-                 for (; i < 6; i++)
-                   outfn (stream, "   ");
-
                  outfn (stream, "%s\t", q->name);
 
                  /* Gross.  Disgusting.  */
@@ -761,9 +753,7 @@ bfd_h8_disassemble (addr, info, mach)
     }
 
   /* Fell off the end.  */
-  outfn (stream, "%02x %02x        .word\tH'%x,H'%x",
-          data[0], data[1],
-          data[0], data[1]);
+  outfn (stream, ".word\tH'%x,H'%x", data[0], data[1]);
   return 2;
 }
 

diff --git a/opcodes/h8500-dis.c b/opcodes/h8500-dis.c
index 5fa52fb..144c7e4 100644 (file)
--- a/opcodes/h8500-dis.c
+++ b/opcodes/h8500-dis.c
@@ -1,19 +1,19 @@
 /* Disassemble h8500 instructions.
-   Copyright 1993, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1993, 1998, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 
@@ -227,14 +227,6 @@ print_insn_h8500 (addr, info)
       /* We get here when all the masks have passed so we can output
         the operands.  */
       FETCH_DATA (info, buffer + opcode->length);
-      for (i = 0; i < opcode->length; i++)
-       {
-         (func) (stream, "%02x ", buffer[i]);
-       }
-      for (; i < 6; i++)
-       {
-         (func) (stream, "   ");
-       }
       (func) (stream, "%s\t", opcode->name);
       for (i = 0; i < opcode->nargs; i++)
        {