Automatic date update in version.in

[platform/upstream/binutils.git] / opcodes / ip2k-dis.c

diff --git a/opcodes/ip2k-dis.c b/opcodes/ip2k-dis.c
index 7b43ccb..aa05005 100644 (file)
--- a/opcodes/ip2k-dis.c
+++ b/opcodes/ip2k-dis.c
@@ -4,20 +4,19 @@
    THIS FILE IS MACHINE GENERATED WITH CGEN.
    - the resultant file is machine generated, cgen-dis.in isn't
 
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
-   This file is part of the GNU Binutils and GDB, the GNU debugger.
+   This file is part of libopcodes.
 
-   This program is free software; you can redistribute it and/or modify
+   This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   It is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation, Inc.,
@@ -89,7 +88,7 @@ print_fr (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
       if (offsetvalue == 0)
        (*info->fprintf_func) (info->stream, "%s","(DP)");
       else
-       (*info->fprintf_func) (info->stream, "$%x%s",offsetvalue, "(DP)");
+       (*info->fprintf_func) (info->stream, "$%lx%s", offsetvalue, "(DP)");
       return;
     }
 
@@ -99,7 +98,7 @@ print_fr (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
       if (offsetvalue == 0)
        (*info->fprintf_func) (info->stream, "%s", "(SP)");
       else
-       (*info->fprintf_func) (info->stream, "$%x%s", offsetvalue,"(SP)");
+       (*info->fprintf_func) (info->stream, "$%lx%s", offsetvalue,"(SP)");
       return;
     }
 
@@ -110,7 +109,7 @@ print_fr (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
     (*info->fprintf_func) (info->stream, "%s", ke->name);
   else
     /* Print as an address literal.  */
-    (*info->fprintf_func) (info->stream, "$%02x", value);
+    (*info->fprintf_func) (info->stream, "$%02lx", value);
 }
 
 static void
@@ -123,7 +122,7 @@ print_dollarhex (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-  (*info->fprintf_func) (info->stream, "$%x", value);
+  (*info->fprintf_func) (info->stream, "$%lx", value);
 }
 
 static void
@@ -136,7 +135,7 @@ print_dollarhex8 (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-  (*info->fprintf_func) (info->stream, "$%02x", value);
+  (*info->fprintf_func) (info->stream, "$%02lx", value);
 }
 
 static void
@@ -153,7 +152,7 @@ print_dollarhex_addr16h (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
      by 8 bits so that disassembled code will reassemble properly.  */
   value = ((value << 8) & 0xFF00);
 
-  (*info->fprintf_func) (info->stream, "$%04x", value);
+  (*info->fprintf_func) (info->stream, "$%04lx", value);
 }
 
 static void
@@ -166,7 +165,7 @@ print_dollarhex_addr16l (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-  (*info->fprintf_func) (info->stream, "$%04x", value);
+  (*info->fprintf_func) (info->stream, "$%04lx", value);
 }
 
 static void
@@ -181,7 +180,7 @@ print_dollarhex_p (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 
   value = ((value << 14) & 0x1C000);
   ;value = (value  & 0x1FFFF);
-  (*info->fprintf_func) (info->stream, "$%05x", value);
+  (*info->fprintf_func) (info->stream, "$%05lx", value);
 }
 
 static void
@@ -195,7 +194,7 @@ print_dollarhex_cj (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
   disassemble_info *info = (disassemble_info *) dis_info;
 
   value = ((value << 1) & 0x1FFFF);
-  (*info->fprintf_func) (info->stream, "$%05x", value);
+  (*info->fprintf_func) (info->stream, "$%05lx", value);
 }
 
 static void
@@ -208,7 +207,7 @@ print_decimal (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-  (*info->fprintf_func) (info->stream, "%d", value);
+  (*info->fprintf_func) (info->stream, "%ld", value);
 }
 
 
@@ -319,10 +318,6 @@ print_normal (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-#ifdef CGEN_PRINT_NORMAL
-  CGEN_PRINT_NORMAL (cd, info, value, attrs, pc, length);
-#endif
-
   /* Print the operand as directed by the attributes.  */
   if (CGEN_BOOL_ATTR (attrs, CGEN_OPERAND_SEM_ONLY))
     ; /* nothing to do */
@@ -344,10 +339,6 @@ print_address (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-#ifdef CGEN_PRINT_ADDRESS
-  CGEN_PRINT_ADDRESS (cd, info, value, attrs, pc, length);
-#endif
-
   /* Print the operand as directed by the attributes.  */
   if (CGEN_BOOL_ATTR (attrs, CGEN_OPERAND_SEM_ONLY))
     ; /* Nothing to do.  */
@@ -596,7 +587,7 @@ default_print_insn (CGEN_CPU_DESC cd, bfd_vma pc, disassemble_info *info)
 typedef struct cpu_desc_list
 {
   struct cpu_desc_list *next;
-  int isa;
+  CGEN_BITSET *isa;
   int mach;
   int endian;
   CGEN_CPU_DESC cd;
@@ -608,11 +599,12 @@ print_insn_ip2k (bfd_vma pc, disassemble_info *info)
   static cpu_desc_list *cd_list = 0;
   cpu_desc_list *cl = 0;
   static CGEN_CPU_DESC cd = 0;
-  static int prev_isa;
+  static CGEN_BITSET *prev_isa;
   static int prev_mach;
   static int prev_endian;
   int length;
-  int isa,mach;
+  CGEN_BITSET *isa;
+  int mach;
   int endian = (info->endian == BFD_ENDIAN_BIG
                ? CGEN_ENDIAN_BIG
                : CGEN_ENDIAN_LITTLE);
@@ -635,25 +627,34 @@ print_insn_ip2k (bfd_vma pc, disassemble_info *info)
 #endif
 
 #ifdef CGEN_COMPUTE_ISA
-  isa = CGEN_COMPUTE_ISA (info);
+  {
+    static CGEN_BITSET *permanent_isa;
+
+    if (!permanent_isa)
+      permanent_isa = cgen_bitset_create (MAX_ISAS);
+    isa = permanent_isa;
+    cgen_bitset_clear (isa);
+    cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
+  }
 #else
   isa = info->insn_sets;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
   if (cd
-      && (isa != prev_isa
+      && (cgen_bitset_compare (isa, prev_isa) != 0
          || mach != prev_mach
          || endian != prev_endian))
     {
       cd = 0;
       for (cl = cd_list; cl; cl = cl->next)
        {
-         if (cl->isa == isa &&
+         if (cgen_bitset_compare (cl->isa, isa) == 0 &&
              cl->mach == mach &&
              cl->endian == endian)
            {
              cd = cl->cd;
+             prev_isa = cd->isas;
              break;
            }
        }
@@ -669,7 +670,7 @@ print_insn_ip2k (bfd_vma pc, disassemble_info *info)
        abort ();
       mach_name = arch_type->printable_name;
 
-      prev_isa = isa;
+      prev_isa = cgen_bitset_copy (isa);
       prev_mach = mach;
       prev_endian = endian;
       cd = ip2k_cgen_cpu_open (CGEN_CPU_OPEN_ISAS, prev_isa,
@@ -682,7 +683,7 @@ print_insn_ip2k (bfd_vma pc, disassemble_info *info)
       /* Save this away for future reference.  */
       cl = xmalloc (sizeof (struct cpu_desc_list));
       cl->cd = cd;
-      cl->isa = isa;
+      cl->isa = prev_isa;
       cl->mach = mach;
       cl->endian = endian;
       cl->next = cd_list;