* ia64-dis.c (print_insn_ia64): Get byte skip count correct

[external/binutils.git] / opcodes / ia64-dis.c

diff --git a/opcodes/ia64-dis.c b/opcodes/ia64-dis.c
index 7a68597..629a768 100644 (file)
--- a/opcodes/ia64-dis.c
+++ b/opcodes/ia64-dis.c
@@ -117,7 +117,7 @@ print_insn_ia64 (bfd_vma memaddr, struct disassemble_info *info)
     {
       /* skip L slot in MLI template: */
       slotnum = 2;
-      retval += slot_multiplier;
+      retval = 16 - slot_multiplier;
     }
 
   insn = slot[slotnum];
@@ -165,6 +165,13 @@ print_insn_ia64 (bfd_vma memaddr, struct disassemble_info *info)
             | (((insn >> 36) & 0x1) << 20)
             | ((insn >> 6) & 0xfffff);
         }
+      else if (odesc - elf64_ia64_operands == IA64_OPND_TGT64)
+       {
+         /* 60-bit immedate for long branches.  */
+         value = (((insn >> 13) & 0xfffff)
+                  | (((insn >> 36) & 1) << 59)
+                  | (slot[1] << 20)) << 4;
+       }
       else
        {
          err = (*odesc->extract) (odesc, insn, &value);
@@ -254,6 +261,7 @@ print_insn_ia64 (bfd_vma memaddr, struct disassemble_info *info)
     (*info->fprintf_func) (info->stream, ";;");
 
  done:
+  ia64_free_opcode (idesc);
   if (slotnum == 2)
     retval += 16 - 3*slot_multiplier;
   return retval;