PR binutils/2454

* avr-dis.c (avr_operand): Arrange for a comment to appear before the symolic
form of an address, so that the output of objdump -d can be reassembled.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 030118a574768c9fc8d0acafc3263f6760163d8d..0f098705acf64e3e44bb8c1ff08ba8406cc3456d 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-12   Hochstein  <hochstein@algo.informatik.tu-darmstadt.de>
+
+       PR binutils/2454
+       * avr-dis.c (avr_operand): Arrange for a comment to appear before
+       the symolic form of an address, so that the output of objdump -d
+       can be reassembled.
+
 2006-04-10  DJ Delorie  <dj@redhat.com>
 
        * m32c-asm.c: Regenerate.

diff --git a/opcodes/avr-dis.c b/opcodes/avr-dis.c
index 15300844183c74810969c8733a39bcfd3f0097bd..7938dcadbaf44feb610c4976edf714a44789fde8 100644 (file)
--- a/opcodes/avr-dis.c
+++ b/opcodes/avr-dis.c
@@ -139,7 +139,12 @@ avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constra
     case 'h':
       *sym = 1;
       *sym_addr = ((((insn & 1) | ((insn & 0x1f0) >> 3)) << 16) | insn2) * 2;
-      sprintf (buf, "0x");
+      /* See PR binutils/2545.  Ideally we would like to display the hex
+        value of the address only once, but this would mean recoding
+        objdump_print_address() which would affect many targets.  */
+      sprintf (buf, "%#lx", * sym_addr);      
+      sprintf (comment, "0x");
+
       break;
       
     case 'L':