From: nickc <nickc>
Date: Mon, 15 Jun 2009 15:24:52 +0000 (+0000)
Subject:         PR 10173
X-Git-Tag: cgen-snapshot-20091101~2124
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=95b0e39ec050c3f144d1351daa86e671a3eb171b;p=pf3gnuchains%2Fpf3gnuchains4x.git

    PR 10173
        * cr16-dis.c (print_arg): Avoid printing the 0x prefix twice.
---

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 93d5d0205d..5fd7db0716 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,10 @@
 2009-06-15  Nick Clifton  <nickc@redhat.com>
 
+	PR 10173
+	* cr16-dis.c (print_arg): Avoid printing the 0x prefix twice.
+
+2009-06-15  Nick Clifton  <nickc@redhat.com>
+
 	PR 10263
 	* arm-dis.c (print_insn): Ignore is_data if the user has requested
 	the disassembly of data as well as instructions.
diff --git a/opcodes/cr16-dis.c b/opcodes/cr16-dis.c
index 2627141d0f..3a31d926b9 100644
--- a/opcodes/cr16-dis.c
+++ b/opcodes/cr16-dis.c
@@ -1,5 +1,5 @@
 /* Disassembler code for CR16.
-   Copyright 2007, 2008 Free Software Foundation, Inc.
+   Copyright 2007, 2008, 2009  Free Software Foundation, Inc.
    Contributed by M R Swami Reddy (MR.Swami.Reddy@nsc.com).
 
    This file is part of GAS, GDB and the GNU binutils.
@@ -678,7 +678,9 @@ print_arg (argument *a, bfd_vma memaddr, struct disassemble_info *info)
       if ((!IS_INSN_TYPE (CSTBIT_INS)) && (!IS_INSN_TYPE (LD_STOR_INS)))
 	(sign_flag) ? func (stream, "%s", "*-"): func (stream, "%s","*+");
 
-      func (stream, "%s", "0x");
+      /* PR 10173: Avoid printing the 0x prefix twice.  */
+      if (info->num_symbols > 0)
+	func (stream, "%s", "0x");
       number = ((relative ? memaddr : 0) +
 		(sign_flag ? ((- a->constant) & 0xffffffe) : a->constant));