From 522fe56177eaa68d38d62ae56763544ab795c36b Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 15 Jun 2009 15:24:52 +0000 Subject: [PATCH] PR 10173 * cr16-dis.c (print_arg): Avoid printing the 0x prefix twice. --- opcodes/ChangeLog | 5 +++++ opcodes/cr16-dis.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 93d5d0205da..5fd7db07162 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2009-06-15 Nick Clifton + + PR 10173 + * cr16-dis.c (print_arg): Avoid printing the 0x prefix twice. + 2009-06-15 Nick Clifton PR 10263 diff --git a/opcodes/cr16-dis.c b/opcodes/cr16-dis.c index 2627141d0fa..3a31d926b95 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)); -- 2.30.2