* avr-dis.c (avr_operand): Bugfix for jmp/call address.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 3009d85..78ea691 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun  9 21:49:02 2000  Denis Chertykov  <denisc@overta.ru>
+
+       * avr-dis.c (avr_operand): Bugfix for jmp/call address.
+
 Wed Jun  7 21:36:45 2000  Denis Chertykov  <denisc@overta.ru>
 
        * avr-dis.c: completely rewritten.

diff --git a/opcodes/avr-dis.c b/opcodes/avr-dis.c
index 1ffd218..a774d8b 100644 (file)
--- a/opcodes/avr-dis.c
+++ b/opcodes/avr-dis.c
@@ -135,7 +135,8 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs)
       break;
       
     case 'h':
-      sprintf (buf, "0x%x%x", (insn & 1) | ((insn & (0x1f << 4)) >> 3), insn2);
+      sprintf (buf, "0x%x",
+              ((((insn & 1) | ((insn & 0x1f0) >> 3)) << 16) | insn2) * 2);
       break;
       
     case 'L':