include/elf/

[deliverable/binutils-gdb.git] / opcodes / ia64-dis.c

diff --git a/opcodes/ia64-dis.c b/opcodes/ia64-dis.c
index 7a68597de1502af8b70bf750bfe29e6157e413f8..c40622686fa94a866bd8c92ffbf5c058f59be2d6 100644 (file)
--- a/opcodes/ia64-dis.c
+++ b/opcodes/ia64-dis.c
@@ -1,5 +1,5 @@
 /* ia64-dis.c -- Disassemble ia64 instructions
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
    Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
    This file is part of GDB, GAS, and the GNU binutils.
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this file; see the file COPYING.  If not, write to the
-   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 #include <assert.h>
 #include <string.h>
@@ -109,7 +109,7 @@ print_insn_ia64 (bfd_vma memaddr, struct disassemble_info *info)
   if (slotnum == 0)
     (*info->fprintf_func) (info->stream, "[%s] ", tname);
   else
-    (*info->fprintf_func) (info->stream, "      ", tname);
+    (*info->fprintf_func) (info->stream, "      ");
 
   unit = ia64_templ_desc[template].exec_unit[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 immediate for long branches. */
+         value = (((insn >> 13) & 0xfffff)
+                  | (((insn >> 36) & 1) << 59)
+                  | (((slot[1] >> 2) & 0x7fffffffffLL) << 20)) << 4;
+       }
       else
        {
          err = (*odesc->extract) (odesc, insn, &value);
@@ -230,11 +237,11 @@ print_insn_ia64 (bfd_vma memaddr, struct disassemble_info *info)
            if (str)
              (*info->fprintf_func) (info->stream, "%s", str);
            else if (odesc->flags & IA64_OPND_FLAG_DECIMAL_SIGNED)
-             (*info->fprintf_func) (info->stream, "%lld", value);
+             (*info->fprintf_func) (info->stream, "%lld", (long long) value);
            else if (odesc->flags & IA64_OPND_FLAG_DECIMAL_UNSIGNED)
-             (*info->fprintf_func) (info->stream, "%llu", value);
+             (*info->fprintf_func) (info->stream, "%llu", (long long) value);
            else
-             (*info->fprintf_func) (info->stream, "0x%llx", value);
+             (*info->fprintf_func) (info->stream, "0x%llx", (long long) value);
            break;
 
          case IA64_OPND_CLASS_REL:
@@ -254,11 +261,13 @@ print_insn_ia64 (bfd_vma memaddr, struct disassemble_info *info)
     (*info->fprintf_func) (info->stream, ";;");
 
  done:
+  ia64_free_opcode ((struct ia64_opcode *)idesc);
+ failed:
   if (slotnum == 2)
     retval += 16 - 3*slot_multiplier;
   return retval;
 
  decoding_failed:
-  (*info->fprintf_func) (info->stream, "      data8 %#011llx", insn);
-  goto done;
+  (*info->fprintf_func) (info->stream, "      data8 %#011llx", (long long) insn);
+  goto failed;
 }