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

3 files changed, 32 insertions, 43 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 65fd78c..159f6d0 100644
--- 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
--- 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
--- 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++)
 	{