x86: support VMGEXIT

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

diff --git a/opcodes/ia64-gen.c b/opcodes/ia64-gen.c
index af4170c667a39c189b18907f38e942ceaa8dad60..6f70d07c9d66617705e378595f5f18d775c4a564 100644 (file)
--- a/opcodes/ia64-gen.c
+++ b/opcodes/ia64-gen.c
@@ -1,6 +1,5 @@
 /* ia64-gen.c -- Generate a shrunk set of opcode tables
 /* ia64-gen.c -- Generate a shrunk set of opcode tables

-   Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2020 Free Software Foundation, Inc.

    Written by Bob Manson, Cygnus Solutions, <manson@cygnus.com>
 
    This file is part of the GNU opcodes library.
    Written by Bob Manson, Cygnus Solutions, <manson@cygnus.com>
 
    This file is part of the GNU opcodes library.


@@ -23,25 +22,24 @@
 
 /* While the ia64-opc-* set of opcode tables are easy to maintain,
    they waste a tremendous amount of space.  ia64-gen rearranges the
 
 /* While the ia64-opc-* set of opcode tables are easy to maintain,
    they waste a tremendous amount of space.  ia64-gen rearranges the

-   instructions into a directed acyclic graph (DAG) of instruction opcodes and 
-   their possible completers, as well as compacting the set of strings used.  
+   instructions into a directed acyclic graph (DAG) of instruction opcodes and
+   their possible completers, as well as compacting the set of strings used.

 
    The disassembler table consists of a state machine that does
    branching based on the bits of the opcode being disassembled.  The
    state encodings have been chosen to minimize the amount of space
 
    The disassembler table consists of a state machine that does
    branching based on the bits of the opcode being disassembled.  The
    state encodings have been chosen to minimize the amount of space

-   required.  
+   required.

 
 

-   The resource table is constructed based on some text dependency tables, 
+   The resource table is constructed based on some text dependency tables,

    which are also easier to maintain than the final representation.  */
 
    which are also easier to maintain than the final representation.  */
 

+#include "sysdep.h"

 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
 
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
 

-#include "ansidecl.h"

 #include "libiberty.h"
 #include "safe-ctype.h"
 #include "libiberty.h"
 #include "safe-ctype.h"

-#include "sysdep.h"

 #include "getopt.h"
 #include "ia64-opc.h"
 #include "ia64-opc-a.c"
 #include "getopt.h"
 #include "ia64-opc.h"
 #include "ia64-opc-a.c"


@@ -70,6 +68,7 @@ int debug = 0;
 #define NELEMS(a) (sizeof (a) / sizeof ((a)[0]))
 #define tmalloc(X) (X *) xmalloc (sizeof (X))
 
 #define NELEMS(a) (sizeof (a) / sizeof ((a)[0]))
 #define tmalloc(X) (X *) xmalloc (sizeof (X))
 

+typedef unsigned long long  ci_t;

 /* The main opcode table entry.  Each entry is a unique combination of
    name and flags (no two entries in the table compare as being equal
    via opcodes_eq).  */
 /* The main opcode table entry.  Each entry is a unique combination of
    name and flags (no two entries in the table compare as being equal
    via opcodes_eq).  */


@@ -147,7 +146,7 @@ struct disent
   int priority;
 
   /* The completer_index value for this entry.  */
   int priority;
 
   /* The completer_index value for this entry.  */

-  int completer_index;
+  ci_t completer_index;

 
   /* How many other entries share this decode.  */
   int nextcnt;
 
   /* How many other entries share this decode.  */
   int nextcnt;


@@ -173,7 +172,7 @@ struct bittree
    alphabetical order.  */
 
 /* One entry in the string table.  */
    alphabetical order.  */
 
 /* One entry in the string table.  */

-struct string_entry 
+struct string_entry

 {
   /* The index in the ia64_strings[] array for this entry.  */
   int num;
 {
   /* The index in the ia64_strings[] array for this entry.  */
   int num;


@@ -189,11 +188,11 @@ int strtabtotlen = 0;
 struct rdep
 {
   char *name;                       /* Resource name.  */
 struct rdep
 {
   char *name;                       /* Resource name.  */

-  unsigned 
+  unsigned

     mode:2,                         /* RAW, WAW, or WAR.  */
     semantics:3;                    /* Dependency semantics.  */
   char *extra;                      /* Additional semantics info.  */
     mode:2,                         /* RAW, WAW, or WAR.  */
     semantics:3;                    /* Dependency semantics.  */
   char *extra;                      /* Additional semantics info.  */

-  int nchks;                   
+  int nchks;

   int total_chks;                   /* Total #of terminal insns.  */
   int *chks;                        /* Insn classes which read (RAW), write
                                        (WAW), or write (WAR) this rsrc.  */
   int total_chks;                   /* Total #of terminal insns.  */
   int *chks;                        /* Insn classes which read (RAW), write
                                        (WAW), or write (WAR) this rsrc.  */


@@ -212,12 +211,12 @@ static int rdepstotlen = 0;
 
 /* Array of all instruction classes.  */
 struct iclass
 
 /* Array of all instruction classes.  */
 struct iclass

-{ 
+{

   char *name;                       /* Instruction class name.  */
   int is_class;                     /* Is a class, not a terminal.  */
   char *name;                       /* Instruction class name.  */
   int is_class;                     /* Is a class, not a terminal.  */

-  int nsubs;                        
+  int nsubs;

   int *subs;                        /* Other classes within this class.  */
   int *subs;                        /* Other classes within this class.  */

-  int nxsubs;                       
+  int nxsubs;

   int xsubs[4];                     /* Exclusions.  */
   char *comment;                    /* Optional comment.  */
   int note;                         /* Optional note.  */
   int xsubs[4];                     /* Exclusions.  */
   char *comment;                    /* Optional comment.  */
   int note;                         /* Optional note.  */


@@ -291,18 +290,18 @@ static void shrink (struct ia64_opcode *);
 static void print_version (void);
 static void usage (FILE *, int);
 static void finish_distable (void);
 static void print_version (void);
 static void usage (FILE *, int);
 static void finish_distable (void);

-static void insert_bit_table_ent (struct bittree *, int, ia64_insn, ia64_insn, int, int, int);
-static void add_dis_entry (struct bittree *, ia64_insn, ia64_insn, int, struct completer_entry *, int);
+static void insert_bit_table_ent (struct bittree *, int, ia64_insn, ia64_insn, int, int, ci_t);
+static void add_dis_entry (struct bittree *, ia64_insn, ia64_insn, int, struct completer_entry *, ci_t);

 static void compact_distree (struct bittree *);
 static struct bittree * make_bittree_entry (void);
 static void compact_distree (struct bittree *);
 static struct bittree * make_bittree_entry (void);

-static struct disent * add_dis_table_ent (struct disent *, int, int, int);
+static struct disent * add_dis_table_ent (struct disent *, int, int, ci_t);

 
 \f
 static void
 fail (const char *message, ...)
 {
   va_list args;
 
 \f
 static void
 fail (const char *message, ...)
 {
   va_list args;

-  
+

   va_start (args, message);
   fprintf (stderr, _("%s: Error: "), program_name);
   vfprintf (stderr, message, args);
   va_start (args, message);
   fprintf (stderr, _("%s: Error: "), program_name);
   vfprintf (stderr, message, args);


@@ -337,7 +336,7 @@ insert_resource (const char *name, enum ia64_dependency_mode type)
   rdeps[rdepslen]->name = xstrdup (name);
   rdeps[rdepslen]->mode = type;
   rdeps[rdepslen]->waw_special = 0;
   rdeps[rdepslen]->name = xstrdup (name);
   rdeps[rdepslen]->mode = type;
   rdeps[rdepslen]->waw_special = 0;

-  
+

   return rdeps[rdepslen++];
 }
 
   return rdeps[rdepslen++];
 }
 


@@ -406,7 +405,7 @@ insert_deplist (int count, unsigned short *deps)
 
 /* Add the given pair of dependency lists to the opcode dependency list.  */
 static short
 
 /* Add the given pair of dependency lists to the opcode dependency list.  */
 static short

-insert_dependencies (int nchks, unsigned short *chks, 
+insert_dependencies (int nchks, unsigned short *chks,

                      int nregs, unsigned short *regs)
 {
   struct opdep *pair;
                      int nregs, unsigned short *regs)
 {
   struct opdep *pair;


@@ -420,14 +419,14 @@ insert_dependencies (int nchks, unsigned short *chks,
     chkind = insert_deplist (nchks, chks);
 
   for (i = 0; i < opdeplen; i++)
     chkind = insert_deplist (nchks, chks);
 
   for (i = 0; i < opdeplen; i++)

-    if (opdeps[i]->chk == chkind 
+    if (opdeps[i]->chk == chkind

        && opdeps[i]->reg == regind)
       return i;
 
   pair = tmalloc (struct opdep);
   pair->chk = chkind;
   pair->reg = regind;
        && opdeps[i]->reg == regind)
       return i;
 
   pair = tmalloc (struct opdep);
   pair->chk = chkind;
   pair->reg = regind;

-  
+

   if (opdeplen == opdeptotlen)
     {
       opdeptotlen += 20;
   if (opdeplen == opdeptotlen)
     {
       opdeptotlen += 20;


@@ -439,7 +438,7 @@ insert_dependencies (int nchks, unsigned short *chks,
   return opdeplen++;
 }
 
   return opdeplen++;
 }
 

-static void 
+static void

 mark_used (struct iclass *ic, int clear_terminals)
 {
   int i;
 mark_used (struct iclass *ic, int clear_terminals)
 {
   int i;


@@ -522,7 +521,7 @@ fetch_insn_class (const char *full_name, int create)
     if (strcmp (name, ics[i]->name) == 0
         && ((comment == NULL && ics[i]->comment == NULL)
             || (comment != NULL && ics[i]->comment != NULL
     if (strcmp (name, ics[i]->name) == 0
         && ((comment == NULL && ics[i]->comment == NULL)
             || (comment != NULL && ics[i]->comment != NULL

-                && strncmp (ics[i]->comment, comment, 
+                && strncmp (ics[i]->comment, comment,

                             strlen (ics[i]->comment)) == 0))
         && note == ics[i]->note)
       return i;
                             strlen (ics[i]->comment)) == 0))
         && note == ics[i]->note)
       return i;


@@ -570,7 +569,7 @@ fetch_insn_class (const char *full_name, int create)
 
       ics[ind]->nsubs = 1;
       ics[ind]->subs = tmalloc(int);
 
       ics[ind]->nsubs = 1;
       ics[ind]->subs = tmalloc(int);

-      ics[ind]->subs[0] = fetch_insn_class (subname, 1);;
+      ics[ind]->subs[0] = fetch_insn_class (subname, 1);

     }
 
   while (xsect)
     }
 
   while (xsect)


@@ -624,10 +623,10 @@ load_insn_classes (void)
       int iclass;
       char *name;
       char *tmp;
       int iclass;
       char *name;
       char *tmp;

-      
+

       if (fgets (buf, sizeof (buf), fp) == NULL)
         break;
       if (fgets (buf, sizeof (buf), fp) == NULL)
         break;

-      
+

       while (ISSPACE (buf[strlen (buf) - 1]))
         buf[strlen (buf) - 1] = '\0';
 
       while (ISSPACE (buf[strlen (buf) - 1]))
         buf[strlen (buf) - 1] = '\0';
 


@@ -671,9 +670,9 @@ load_insn_classes (void)
             }
           if (*tmp == ',')
             *tmp++ = '\0';
             }
           if (*tmp == ',')
             *tmp++ = '\0';

-          
+

           ics[iclass]->subs = (int *)
           ics[iclass]->subs = (int *)

-            xrealloc ((void *)ics[iclass]->subs, 
+            xrealloc ((void *)ics[iclass]->subs,

                      (ics[iclass]->nsubs + 1) * sizeof (int));
 
           sub = fetch_insn_class (subname, 1);
                      (ics[iclass]->nsubs + 1) * sizeof (int));
 
           sub = fetch_insn_class (subname, 1);


@@ -683,7 +682,7 @@ load_insn_classes (void)
         }
 
       /* Make sure classes come before terminals.  */
         }
 
       /* Make sure classes come before terminals.  */

-      qsort ((void *)ics[iclass]->subs, 
+      qsort ((void *)ics[iclass]->subs,

              ics[iclass]->nsubs, sizeof(int), sub_compare);
     }
   fclose (fp);
              ics[iclass]->nsubs, sizeof(int), sub_compare);
     }
   fclose (fp);


@@ -694,11 +693,8 @@ load_insn_classes (void)
 
 /* Extract the insn classes from the given line.  */
 static void
 
 /* Extract the insn classes from the given line.  */
 static void

-parse_resource_users (ref, usersp, nusersp, notesp)
-  const char *ref;
-  int **usersp;
-  int *nusersp;
-  int **notesp;
+parse_resource_users (const char *ref, int **usersp, int *nusersp,
+                      int **notesp)

 {
   int c;
   char *line = xstrdup (ref);
 {
   int c;
   char *line = xstrdup (ref);


@@ -716,7 +712,7 @@ parse_resource_users (ref, usersp, nusersp, notesp)
       int iclass;
       int create = 0;
       char *name;
       int iclass;
       int create = 0;
       char *name;

-      
+

       while (ISSPACE (*tmp))
         ++tmp;
       name = tmp;
       while (ISSPACE (*tmp))
         ++tmp;
       name = tmp;


@@ -724,7 +720,7 @@ parse_resource_users (ref, usersp, nusersp, notesp)
         ++tmp;
       c = *tmp;
       *tmp++ = '\0';
         ++tmp;
       c = *tmp;
       *tmp++ = '\0';

-      
+

       xsect = strchr (name, '\\');
       if ((notestr = strstr (name, "+")) != NULL)
         {
       xsect = strchr (name, '\\');
       if ((notestr = strstr (name, "+")) != NULL)
         {


@@ -742,7 +738,7 @@ parse_resource_users (ref, usersp, nusersp, notesp)
           if (!xsect)
             *notestr = '\0';
         }
           if (!xsect)
             *notestr = '\0';
         }

-      else 
+      else

         note = 0;
 
       /* All classes are created when the insn class table is parsed;
         note = 0;
 
       /* All classes are created when the insn class table is parsed;


@@ -752,7 +748,7 @@ parse_resource_users (ref, usersp, nusersp, notesp)
          table).  */
       if (! CONST_STRNEQ (name, "IC:") || xsect != NULL)
         create = 1;
          table).  */
       if (! CONST_STRNEQ (name, "IC:") || xsect != NULL)
         create = 1;

-      
+

       iclass = fetch_insn_class (name, create);
       if (iclass != -1)
         {
       iclass = fetch_insn_class (name, create);
       if (iclass != -1)
         {


@@ -792,7 +788,7 @@ parse_semantics (char *sem)
     return IA64_DVS_SPECIFIC;
   else if (strcmp (sem, "stop") == 0)
     return IA64_DVS_STOP;
     return IA64_DVS_SPECIFIC;
   else if (strcmp (sem, "stop") == 0)
     return IA64_DVS_STOP;

-  else 
+  else

     return IA64_DVS_OTHER;
 }
 
     return IA64_DVS_OTHER;
 }
 


@@ -839,7 +835,7 @@ load_depfile (const char *filename, enum ia64_dependency_mode mode)
       while (*tmp != ';')
         ++tmp;
       *tmp++ = '\0';
       while (*tmp != ';')
         ++tmp;
       *tmp++ = '\0';

-      
+

       while (ISSPACE (*tmp))
         ++tmp;
       regp = tmp;
       while (ISSPACE (*tmp))
         ++tmp;
       regp = tmp;


@@ -887,7 +883,7 @@ load_dependencies (void)
 }
 
 /* Is the given operand an indirect register file operand?  */
 }
 
 /* Is the given operand an indirect register file operand?  */

-static int 
+static int

 irf_operand (int op, const char *field)
 {
   if (!field)
 irf_operand (int op, const char *field)
 {
   if (!field)


@@ -906,14 +902,15 @@ irf_operand (int op, const char *field)
               || (op == IA64_OPND_PMC_R3 && strstr (field, "pmc"))
               || (op == IA64_OPND_PMD_R3 && strstr (field, "pmd"))
               || (op == IA64_OPND_MSR_R3 && strstr (field, "msr"))
               || (op == IA64_OPND_PMC_R3 && strstr (field, "pmc"))
               || (op == IA64_OPND_PMD_R3 && strstr (field, "pmd"))
               || (op == IA64_OPND_MSR_R3 && strstr (field, "msr"))

-              || (op == IA64_OPND_CPUID_R3 && strstr (field, "cpuid")));
+              || (op == IA64_OPND_CPUID_R3 && strstr (field, "cpuid"))
+              || (op == IA64_OPND_DAHR_R3  && strstr (field, "dahr")));

     }
 }
 
     }
 }
 

-/* Handle mov_ar, mov_br, mov_cr, mov_indirect, mov_ip, mov_pr, mov_psr, and
-   mov_um insn classes.  */
+/* Handle mov_ar, mov_br, mov_cr, move_dahr, mov_indirect, mov_ip, mov_pr,
+ * mov_psr, and  mov_um insn classes.  */

 static int
 static int

-in_iclass_mov_x (struct ia64_opcode *idesc, struct iclass *ic, 
+in_iclass_mov_x (struct ia64_opcode *idesc, struct iclass *ic,

                  const char *format, const char *field)
 {
   int plain_mov = strcmp (idesc->name, "mov") == 0;
                  const char *format, const char *field)
 {
   int plain_mov = strcmp (idesc->name, "mov") == 0;


@@ -969,6 +966,13 @@ in_iclass_mov_x (struct ia64_opcode *idesc, struct iclass *ic,
           return strstr (format, "M33") != NULL;
       }
       break;
           return strstr (format, "M33") != NULL;
       }
       break;

+    case 'd':
+      {
+        int m50 = plain_mov && idesc->operands[0] == IA64_OPND_DAHR3;
+        if (m50)
+          return strstr (format, "M50") != NULL;
+      }
+      break;

     case 'i':
       if (ic->name[5] == 'n')
         {
     case 'i':
       if (ic->name[5] == 'n')
         {


@@ -1027,7 +1031,7 @@ in_iclass_mov_x (struct ia64_opcode *idesc, struct iclass *ic,
 
 /* Is the given opcode in the given insn class?  */
 static int
 
 /* Is the given opcode in the given insn class?  */
 static int

-in_iclass (struct ia64_opcode *idesc, struct iclass *ic, 
+in_iclass (struct ia64_opcode *idesc, struct iclass *ic,

           const char *format, const char *field, int *notep)
 {
   int i;
           const char *format, const char *field, int *notep)
 {
   int i;


@@ -1045,7 +1049,7 @@ in_iclass (struct ia64_opcode *idesc, struct iclass *ic,
                 {
                   warn (_("most recent format '%s'\nappears more restrictive than '%s'\n"),
                        ic->comment, format);
                 {
                   warn (_("most recent format '%s'\nappears more restrictive than '%s'\n"),
                        ic->comment, format);

-                  format = ic->comment; 
+                  format = ic->comment;

                 }
             }
           else
                 }
             }
           else


@@ -1070,7 +1074,7 @@ in_iclass (struct ia64_opcode *idesc, struct iclass *ic,
       int len = strlen(ic->name);
 
       resolved = ((strncmp (ic->name, idesc->name, len) == 0)
       int len = strlen(ic->name);
 
       resolved = ((strncmp (ic->name, idesc->name, len) == 0)

-                  && (idesc->name[len] == '\0' 
+                  && (idesc->name[len] == '\0'

                       || idesc->name[len] == '.'));
 
       /* All break, nop, and hint variations must match exactly.  */
                       || idesc->name[len] == '.'));
 
       /* All break, nop, and hint variations must match exactly.  */


@@ -1158,7 +1162,7 @@ in_iclass (struct ia64_opcode *idesc, struct iclass *ic,
             resolved = 0;
         }
 
             resolved = 0;
         }
 

-      /* Misc brl variations ('.cond' is optional); 
+      /* Misc brl variations ('.cond' is optional);

          plain brl matches brl.cond.  */
       if (!resolved
           && (strcmp (idesc->name, "brl") == 0
          plain brl matches brl.cond.  */
       if (!resolved
           && (strcmp (idesc->name, "brl") == 0


@@ -1169,7 +1173,7 @@ in_iclass (struct ia64_opcode *idesc, struct iclass *ic,
         }
 
       /* Misc br variations ('.cond' is optional).  */
         }
 
       /* Misc br variations ('.cond' is optional).  */

-      if (!resolved 
+      if (!resolved

           && (strcmp (idesc->name, "br") == 0
               || CONST_STRNEQ (idesc->name, "br."))
           && strcmp (ic->name, "br.cond") == 0)
           && (strcmp (idesc->name, "br") == 0
               || CONST_STRNEQ (idesc->name, "br."))
           && strcmp (ic->name, "br.cond") == 0)


@@ -1186,8 +1190,8 @@ in_iclass (struct ia64_opcode *idesc, struct iclass *ic,
       /* probe variations.  */
       if (!resolved && CONST_STRNEQ (idesc->name, "probe"))
         {
       /* probe variations.  */
       if (!resolved && CONST_STRNEQ (idesc->name, "probe"))
         {

-          resolved = strcmp (ic->name, "probe") == 0 
-            && !((strstr (idesc->name, "fault") != NULL) 
+          resolved = strcmp (ic->name, "probe") == 0
+            && !((strstr (idesc->name, "fault") != NULL)

                  ^ (format && strstr (format, "M40") != NULL));
         }
 
                  ^ (format && strstr (format, "M40") != NULL));
         }
 


@@ -1222,7 +1226,7 @@ in_iclass (struct ia64_opcode *idesc, struct iclass *ic,
            resolved = in_iclass_mov_x (idesc, ic, format, field);
         }
 
            resolved = in_iclass_mov_x (idesc, ic, format, field);
         }
 

-      /* Keep track of this so we can flag any insn classes which aren't 
+      /* Keep track of this so we can flag any insn classes which aren't

          mapped onto at least one real insn.  */
       if (resolved)
        ic->terminal_resolved = 1;
          mapped onto at least one real insn.  */
       if (resolved)
        ic->terminal_resolved = 1;


@@ -1244,7 +1248,7 @@ in_iclass (struct ia64_opcode *idesc, struct iclass *ic,
           break;
         }
     }
           break;
         }
     }

-  
+

   /* If it's in this IC, add the IC note (if any) to the insn.  */
   if (resolved)
     {
   /* If it's in this IC, add the IC note (if any) to the insn.  */
   if (resolved)
     {


@@ -1445,6 +1449,8 @@ lookup_specifier (const char *name)
         return IA64_RS_CR_LRR;
       if (strstr (name, "CR%") != NULL)
         return IA64_RS_CR;
         return IA64_RS_CR_LRR;
       if (strstr (name, "CR%") != NULL)
         return IA64_RS_CR;

+      if (strstr (name, "DAHR%, % in 0") != NULL)
+        return IA64_RS_DAHR;

       if (strstr (name, "FR%, % in 0") != NULL)
         return IA64_RS_FR;
       if (strstr (name, "FR%, % in 2") != NULL)
       if (strstr (name, "FR%, % in 0") != NULL)
         return IA64_RS_FR;
       if (strstr (name, "FR%, % in 2") != NULL)


@@ -1477,7 +1483,7 @@ lookup_specifier (const char *name)
         return IA64_RS_PMD;
       if (strstr (name, "RR#") != NULL)
         return IA64_RS_RR;
         return IA64_RS_PMD;
       if (strstr (name, "RR#") != NULL)
         return IA64_RS_RR;

-      
+

       warn (_("Don't know how to specify # dependency %s\n"),
            name);
     }
       warn (_("Don't know how to specify # dependency %s\n"),
            name);
     }


@@ -1504,11 +1510,11 @@ lookup_specifier (const char *name)
 }
 
 static void
 }
 
 static void

-print_dependency_table ()
+print_dependency_table (void)

 {
   int i, j;
 
 {
   int i, j;
 

-  if (debug) 
+  if (debug)

     {
       for (i=0;i < iclen;i++)
         {
     {
       for (i=0;i < iclen;i++)
         {


@@ -1524,7 +1530,7 @@ print_dependency_table ()
                          ics[i]->name);
                 }
             }
                          ics[i]->name);
                 }
             }

-          else 
+          else

             {
               if (!ics[i]->terminal_resolved && !ics[i]->orphan)
                 {
             {
               if (!ics[i]->terminal_resolved && !ics[i]->orphan)
                 {


@@ -1550,16 +1556,16 @@ print_dependency_table ()
 
       if (debug > 1)
        for (i = 0; i < rdepslen; i++)
 
       if (debug > 1)
        for (i = 0; i < rdepslen; i++)

-         {  
+         {

            static const char *mode_str[] = { "RAW", "WAW", "WAR" };
 
            if (rdeps[i]->total_chks == 0)
              {
                if (rdeps[i]->total_regs)
            static const char *mode_str[] = { "RAW", "WAW", "WAR" };
 
            if (rdeps[i]->total_chks == 0)
              {
                if (rdeps[i]->total_regs)

-                 warn (_("Warning: rsrc %s (%s) has no chks\n"), 
+                 warn (_("Warning: rsrc %s (%s) has no chks\n"),

                        rdeps[i]->name, mode_str[rdeps[i]->mode]);
                else
                        rdeps[i]->name, mode_str[rdeps[i]->mode]);
                else

-                 warn (_("Warning: rsrc %s (%s) has no chks or regs\n"), 
+                 warn (_("Warning: rsrc %s (%s) has no chks or regs\n"),

                        rdeps[i]->name, mode_str[rdeps[i]->mode]);
              }
            else if (rdeps[i]->total_regs == 0)
                        rdeps[i]->name, mode_str[rdeps[i]->mode]);
              }
            else if (rdeps[i]->total_regs == 0)


@@ -1573,7 +1579,7 @@ print_dependency_table ()
   for (i = 0; i < rdepslen; i++)
     {
       /* '%', '#', AR[], CR[], or PSR. indicates we need to specify the actual
   for (i = 0; i < rdepslen; i++)
     {
       /* '%', '#', AR[], CR[], or PSR. indicates we need to specify the actual

-         resource used.  */ 
+         resource used.  */

       int specifier = lookup_specifier (rdeps[i]->name);
       int regindex = lookup_regindex (rdeps[i]->name, specifier);
 
       int specifier = lookup_specifier (rdeps[i]->name);
       int regindex = lookup_regindex (rdeps[i]->name, specifier);
 


@@ -1604,16 +1610,16 @@ print_dependency_table ()
   /* And dependency lists.  */
   for (i=0;i < dlistlen;i++)
     {
   /* And dependency lists.  */
   for (i=0;i < dlistlen;i++)
     {

-      int len = 2;
-      printf ("static const unsigned short dep%d[] = {\n  ", i);
+      unsigned int len = (unsigned) -1;
+      printf ("static const unsigned short dep%d[] = {", i);

       for (j=0;j < dlists[i]->len; j++)
         {
       for (j=0;j < dlists[i]->len; j++)
         {

-          len += printf ("%d, ", dlists[i]->deps[j]);
-          if (len > 75)
+          if (len > 74)

             {
             {

-              printf("\n  ");
-              len = 2;
+              printf("\n ");
+              len = 1;

             }
             }

+          len += printf (" %d,", dlists[i]->deps[j]);

         }
       printf ("\n};\n\n");
     }
         }
       printf ("\n};\n\n");
     }


@@ -1627,11 +1633,11 @@ print_dependency_table ()
       printf ("  { ");
       if (opdeps[i]->chk == -1)
         printf ("0, NULL, ");
       printf ("  { ");
       if (opdeps[i]->chk == -1)
         printf ("0, NULL, ");

-      else 
+      else

         printf ("NELS(dep%d), dep%d, ", opdeps[i]->chk, opdeps[i]->chk);
       if (opdeps[i]->reg == -1)
         printf ("0, NULL, ");
         printf ("NELS(dep%d), dep%d, ", opdeps[i]->chk, opdeps[i]->chk);
       if (opdeps[i]->reg == -1)
         printf ("0, NULL, ");

-      else 
+      else

         printf ("NELS(dep%d), dep%d, ", opdeps[i]->reg, opdeps[i]->reg);
       printf ("},\n");
     }
         printf ("NELS(dep%d), dep%d, ", opdeps[i]->reg, opdeps[i]->reg);
       printf ("},\n");
     }


@@ -1650,7 +1656,7 @@ insert_string (char *str)
     {
       strtabtotlen += 20;
       string_table = (struct string_entry **)
     {
       strtabtotlen += 20;
       string_table = (struct string_entry **)

-       xrealloc (string_table, 
+       xrealloc (string_table,

                  sizeof (struct string_entry **) * strtabtotlen);
     }
 
                  sizeof (struct string_entry **) * strtabtotlen);
     }
 


@@ -1723,14 +1729,11 @@ make_bittree_entry (void)
   res->bits_to_skip = 0;
   return res;
 }
   res->bits_to_skip = 0;
   return res;
 }

- 
+

 \f
 static struct disent *
 \f
 static struct disent *

-add_dis_table_ent (which, insn, order, completer_index)
-     struct disent *which;
-     int insn;
-     int order;
-     int completer_index;
+add_dis_table_ent (struct disent *which, int insn, int order,
+                   ci_t completer_index)

 {
   int ci = 0;
   struct disent *ent;
 {
   int ci = 0;
   struct disent *ent;


@@ -1767,7 +1770,7 @@ add_dis_table_ent (which, insn, order, completer_index)
 }
 \f
 static void
 }
 \f
 static void

-finish_distable ()
+finish_distable (void)

 {
   struct disent *ent = disinsntable;
   struct disent *prev = ent;
 {
   struct disent *ent = disinsntable;
   struct disent *prev = ent;


@@ -1781,15 +1784,9 @@ finish_distable ()
 }
 \f
 static void
 }
 \f
 static void

-insert_bit_table_ent (curr_ent, bit, opcode, mask, 
-                      opcodenum, order, completer_index)
-     struct bittree *curr_ent;
-     int bit;
-     ia64_insn opcode; 
-     ia64_insn mask;
-     int opcodenum;
-     int order;
-     int completer_index;
+insert_bit_table_ent (struct bittree *curr_ent, int bit, ia64_insn opcode,
+                      ia64_insn mask, int opcodenum, int order,
+                      ci_t completer_index)

 {
   ia64_insn m;
   int b;
 {
   ia64_insn m;
   int b;


@@ -1797,7 +1794,7 @@ insert_bit_table_ent (curr_ent, bit, opcode, mask,
 
   if (bit == -1)
     {
 
   if (bit == -1)
     {

-      struct disent *nent = add_dis_table_ent (curr_ent->disent, 
+      struct disent *nent = add_dis_table_ent (curr_ent->disent,

                                                opcodenum, order,
                                               completer_index);
       curr_ent->disent = nent;
                                                opcodenum, order,
                                               completer_index);
       curr_ent->disent = nent;


@@ -1822,15 +1819,10 @@ insert_bit_table_ent (curr_ent, bit, opcode, mask,
 }
 \f
 static void
 }
 \f
 static void

-add_dis_entry (first, opcode, mask, opcodenum, ent, completer_index)
-     struct bittree *first;
-     ia64_insn opcode;
-     ia64_insn mask;
-     int opcodenum;
-     struct completer_entry *ent;
-     int completer_index;
+add_dis_entry (struct bittree *first, ia64_insn opcode, ia64_insn mask,
+               int opcodenum, struct completer_entry *ent, ci_t completer_index)

 {
 {

-  if (completer_index & (1 << 20))
+  if (completer_index & ((ci_t)1 << 32) )

     abort ();
 
   while (ent != NULL)
     abort ();
 
   while (ent != NULL)


@@ -1841,8 +1833,8 @@ add_dis_entry (first, opcode, mask, opcodenum, ent, completer_index)
 
       if (ent->is_terminal)
        {
 
       if (ent->is_terminal)
        {

-         insert_bit_table_ent (bittree, 40, newopcode, mask, 
-                                opcodenum, opcode_count - ent->order - 1, 
+         insert_bit_table_ent (bittree, 40, newopcode, mask,
+                                opcodenum, opcode_count - ent->order - 1,

                                (completer_index << 1) | 1);
        }
       completer_index <<= 1;
                                (completer_index << 1) | 1);
        }
       completer_index <<= 1;


@@ -1852,8 +1844,7 @@ add_dis_entry (first, opcode, mask, opcodenum, ent, completer_index)
 \f
 /* This optimization pass combines multiple "don't care" nodes.  */
 static void
 \f
 /* This optimization pass combines multiple "don't care" nodes.  */
 static void

-compact_distree (ent)
-     struct bittree *ent;
+compact_distree (struct bittree *ent)

 {
 #define IS_SKIP(ent) \
     ((ent->bits[2] !=NULL) \
 {
 #define IS_SKIP(ent) \
     ((ent->bits[2] !=NULL) \


@@ -1904,8 +1895,7 @@ static int tot_insn_list_len = 0;
 /* Generate the disassembler state machine corresponding to the tree
    in ENT.  */
 static void
 /* Generate the disassembler state machine corresponding to the tree
    in ENT.  */
 static void

-gen_dis_table (ent)
-     struct bittree *ent;
+gen_dis_table (struct bittree *ent)

 {
   int x;
   int our_offset = insn_list_len;
 {
   int x;
   int our_offset = insn_list_len;


@@ -2023,7 +2013,7 @@ gen_dis_table (ent)
          else
            idest = ent->disent->ournum;
 
          else
            idest = ent->disent->ournum;
 

-         /* If the destination offset for the if (bit is 1) test is less 
+         /* If the destination offset for the if (bit is 1) test is less

             than 256 bytes away, we can store it as 8-bits instead of 16;
             the instruction has bit 5 set for the 16-bit address, and bit
             4 for the 8-bit address.  Since we've already allocated 16
             than 256 bytes away, we can store it as 8-bits instead of 16;
             the instruction has bit 5 set for the 16-bit address, and bit
             4 for the 8-bit address.  Since we've already allocated 16


@@ -2118,7 +2108,7 @@ gen_dis_table (ent)
     {
       if (ent->skip_flag)
        printf ("%d: skipping %d\n", our_offset, ent->bits_to_skip);
     {
       if (ent->skip_flag)
        printf ("%d: skipping %d\n", our_offset, ent->bits_to_skip);

-  
+

       if (ent->bits[0] != NULL)
        printf ("%d: if (0:%d) goto %d\n", our_offset, zero_count + 1,
                zero_dest);
       if (ent->bits[0] != NULL)
        printf ("%d: if (0:%d) goto %d\n", our_offset, zero_count + 1,
                zero_dest);


@@ -2134,13 +2124,13 @@ print_dis_table (void)
   int x;
   struct disent *cent = disinsntable;
 
   int x;
   struct disent *cent = disinsntable;
 

-  printf ("static const char dis_table[] = {\n");
+  printf ("static const char dis_table[] = {");

   for (x = 0; x < insn_list_len; x++)
     {
   for (x = 0; x < insn_list_len; x++)
     {

-      if ((x > 0) && ((x % 12) == 0))
-       printf ("\n");
+      if (x % 12 == 0)
+       printf ("\n ");

 
 

-      printf ("0x%02x, ", insn_list[x]);
+      printf (" 0x%02x,", insn_list[x]);

     }
   printf ("\n};\n\n");
 
     }
   printf ("\n};\n\n");
 


@@ -2151,7 +2141,7 @@ print_dis_table (void)
 
       while (ent != NULL)
        {
 
       while (ent != NULL)
        {

-         printf ("{ 0x%x, %d, %d, %d },\n", ent->completer_index,
+         printf ("{ 0x%lx, %d, %d, %d },\n", ( long ) ent->completer_index,

                  ent->insn, (ent->nexte != NULL ? 1 : 0),
                   ent->priority);
          ent = ent->nexte;
                  ent->insn, (ent->nexte != NULL ? 1 : 0),
                   ent->priority);
          ent = ent->nexte;


@@ -2174,7 +2164,7 @@ generate_disassembler (void)
 
       if (ptr->opcode->type != IA64_TYPE_DYN)
        add_dis_entry (bittree,
 
       if (ptr->opcode->type != IA64_TYPE_DYN)
        add_dis_entry (bittree,

-                      ptr->opcode->opcode, ptr->opcode->mask, 
+                      ptr->opcode->opcode, ptr->opcode->mask,

                       ptr->main_index,
                       ptr->completers, 1);
     }
                       ptr->main_index,
                       ptr->completers, 1);
     }


@@ -2199,7 +2189,7 @@ print_string_table (void)
   for (x = 0; x < strtablen; x++)
     {
       int len;
   for (x = 0; x < strtablen; x++)
     {
       int len;

-      
+

       if (strlen (string_table[x]->s) > 75)
        abort ();
 
       if (strlen (string_table[x]->s) > 75)
        abort ();
 


@@ -2229,8 +2219,8 @@ static int glisttotlen = 0;
 /* If the completer trees ENT1 and ENT2 are equal, return 1.  */
 
 static int
 /* If the completer trees ENT1 and ENT2 are equal, return 1.  */
 
 static int

-completer_entries_eq (ent1, ent2)
-     struct completer_entry *ent1, *ent2;
+completer_entries_eq (struct completer_entry *ent1,
+                      struct completer_entry *ent2)

 {
   while (ent1 != NULL && ent2 != NULL)
     {
 {
   while (ent1 != NULL && ent2 != NULL)
     {


@@ -2301,7 +2291,7 @@ insert_gclist (struct completer_entry *ent)
                end = i - 1;
              else if (c == 0)
                {
                end = i - 1;
              else if (c == 0)
                {

-                 while (i > 0 
+                 while (i > 0

                         && ent->name->num == glist[i - 1]->name->num)
                    i--;
 
                         && ent->name->num == glist[i - 1]->name->num)
                    i--;
 


@@ -2347,8 +2337,7 @@ insert_gclist (struct completer_entry *ent)
 }
 \f
 static int
 }
 \f
 static int

-get_prefix_len (name)
-     const char *name;
+get_prefix_len (const char *name)

 {
   char *c;
 
 {
   char *c;
 


@@ -2363,9 +2352,7 @@ get_prefix_len (name)
 }
 \f
 static void
 }
 \f
 static void

-compute_completer_bits (ment, ent)
-     struct main_entry *ment;
-     struct completer_entry *ent;
+compute_completer_bits (struct main_entry *ment, struct completer_entry *ent)

 {
   while (ent != NULL)
     {
 {
   while (ent != NULL)
     {


@@ -2381,7 +2368,7 @@ compute_completer_bits (ment, ent)
 
          while (p != NULL && ! p->is_terminal)
            p = p->parent;
 
          while (p != NULL && ! p->is_terminal)
            p = p->parent;

-      
+

          if (p != NULL)
            p_bits = p->bits;
          else
          if (p != NULL)
            p_bits = p->bits;
          else


@@ -2434,19 +2421,18 @@ collapse_redundant_completers (void)
 
 /* Attach two lists of dependencies to each opcode.
    1) all resources which, when already marked in use, conflict with this
 
 /* Attach two lists of dependencies to each opcode.
    1) all resources which, when already marked in use, conflict with this

-   opcode (chks) 
+   opcode (chks)

    2) all resources which must be marked in use when this opcode is used
    (regs).  */
 static int
    2) all resources which must be marked in use when this opcode is used
    (regs).  */
 static int

-insert_opcode_dependencies (opc, cmp)
-     struct ia64_opcode *opc;
-     struct completer_entry *cmp ATTRIBUTE_UNUSED;
+insert_opcode_dependencies (struct ia64_opcode *opc,
+                            struct completer_entry *cmp ATTRIBUTE_UNUSED)

 {
   /* Note all resources which point to this opcode.  rfi has the most chks
      (79) and cmpxchng has the most regs (54) so 100 here should be enough.  */
   int i;
   int nregs = 0;
 {
   /* Note all resources which point to this opcode.  rfi has the most chks
      (79) and cmpxchng has the most regs (54) so 100 here should be enough.  */
   int i;
   int nregs = 0;

-  unsigned short regs[256];                  
+  unsigned short regs[256];

   int nchks = 0;
   unsigned short chks[256];
   /* Flag insns for which no class matched; there should be none.  */
   int nchks = 0;
   unsigned short chks[256];
   /* Flag insns for which no class matched; there should be none.  */


@@ -2518,17 +2504,15 @@ insert_opcode_dependencies (opc, cmp)
 
   if (no_class_found)
     warn (_("opcode %s has no class (ops %d %d %d)\n"),
 
   if (no_class_found)
     warn (_("opcode %s has no class (ops %d %d %d)\n"),

-         opc->name, 
+         opc->name,

          opc->operands[0], opc->operands[1], opc->operands[2]);
 
   return insert_dependencies (nchks, chks, nregs, regs);
 }
 \f
 static void
          opc->operands[0], opc->operands[1], opc->operands[2]);
 
   return insert_dependencies (nchks, chks, nregs, regs);
 }
 \f
 static void

-insert_completer_entry (opc, tabent, order)
-     struct ia64_opcode *opc;
-     struct main_entry *tabent;
-     int order;
+insert_completer_entry (struct ia64_opcode *opc, struct main_entry *tabent,
+                        int order)

 {
   struct completer_entry **ptr = &tabent->completers;
   struct completer_entry *parent = NULL;
 {
   struct completer_entry **ptr = &tabent->completers;
   struct completer_entry *parent = NULL;


@@ -2599,8 +2583,7 @@ insert_completer_entry (opc, tabent, order)
 }
 \f
 static void
 }
 \f
 static void

-print_completer_entry (ent)
-     struct completer_entry *ent;
+print_completer_entry (struct completer_entry *ent)

 {
   int moffset = 0;
   ia64_insn mask = ent->mask, bits = ent->bits;
 {
   int moffset = 0;
   ia64_insn mask = ent->mask, bits = ent->bits;


@@ -2617,7 +2600,7 @@ print_completer_entry (ent)
       if (bits & 0xffffffff00000000LL)
        abort ();
     }
       if (bits & 0xffffffff00000000LL)
        abort ();
     }

-  
+

   printf ("  { 0x%x, 0x%x, %d, %d, %d, %d, %d, %d },\n",
          (int)bits,
          (int)mask,
   printf ("  { 0x%x, 0x%x, %d, %d, %d, %d, %d, %d },\n",
          (int)bits,
          (int)mask,


@@ -2630,7 +2613,7 @@ print_completer_entry (ent)
 }
 \f
 static void
 }
 \f
 static void

-print_completer_table ()
+print_completer_table (void)

 {
   int x;
 
 {
   int x;
 


@@ -2641,14 +2624,12 @@ print_completer_table ()
 }
 \f
 static int
 }
 \f
 static int

-opcodes_eq (opc1, opc2)
-     struct ia64_opcode *opc1;
-     struct ia64_opcode *opc2;
+opcodes_eq (struct ia64_opcode *opc1, struct ia64_opcode *opc2)

 {
   int x;
   int plen1, plen2;
 
 {
   int x;
   int plen1, plen2;
 

-  if ((opc1->mask != opc2->mask) || (opc1->type != opc2->type) 
+  if ((opc1->mask != opc2->mask) || (opc1->type != opc2->type)

       || (opc1->num_outputs != opc2->num_outputs)
       || (opc1->flags != opc2->flags))
     return 0;
       || (opc1->num_outputs != opc2->num_outputs)
       || (opc1->flags != opc2->flags))
     return 0;


@@ -2667,8 +2648,7 @@ opcodes_eq (opc1, opc2)
 }
 \f
 static void
 }
 \f
 static void

-add_opcode_entry (opc)
-     struct ia64_opcode *opc;
+add_opcode_entry (struct ia64_opcode *opc)

 {
   struct main_entry **place;
   struct string_entry *name;
 {
   struct main_entry **place;
   struct string_entry *name;


@@ -2684,7 +2664,7 @@ add_opcode_entry (opc)
   name = insert_string (prefix);
 
   /* Walk the list of opcode table entries.  If it's a new
   name = insert_string (prefix);
 
   /* Walk the list of opcode table entries.  If it's a new

-     instruction, allocate and fill in a new entry.  Note 
+     instruction, allocate and fill in a new entry.  Note

      the main table is alphabetical by opcode name.  */
 
   while (*place != NULL)
      the main table is alphabetical by opcode name.  */
 
   while (*place != NULL)


@@ -2726,7 +2706,7 @@ static void
 print_main_table (void)
 {
   struct main_entry *ptr = maintable;
 print_main_table (void)
 {
   struct main_entry *ptr = maintable;

-  int index = 0;
+  int tindex = 0;

 
   printf ("static const struct ia64_main_table\nmain_table[] = {\n");
   while (ptr != NULL)
 
   printf ("static const struct ia64_main_table\nmain_table[] = {\n");
   while (ptr != NULL)


@@ -2747,7 +2727,7 @@ print_main_table (void)
              ptr->opcode->flags,
              ptr->completers->num);
 
              ptr->opcode->flags,
              ptr->completers->num);
 

-      ptr->main_index = index++;
+      ptr->main_index = tindex++;

 
       ptr = ptr->next;
     }
 
       ptr = ptr->next;
     }


@@ -2755,8 +2735,7 @@ print_main_table (void)
 }
 \f
 static void
 }
 \f
 static void

-shrink (table)
-     struct ia64_opcode *table;
+shrink (struct ia64_opcode *table)

 {
   int curr_opcode;
 
 {
   int curr_opcode;
 


@@ -2787,7 +2766,7 @@ shrink (table)
 /* Program options.  */
 #define OPTION_SRCDIR  200
 
 /* Program options.  */
 #define OPTION_SRCDIR  200
 

-struct option long_options[] = 
+struct option long_options[] =

 {
   {"srcdir",  required_argument, NULL, OPTION_SRCDIR},
   {"debug",   no_argument,       NULL, 'd'},
 {
   {"srcdir",  required_argument, NULL, OPTION_SRCDIR},
   {"debug",   no_argument,       NULL, 'd'},


@@ -2817,7 +2796,7 @@ main (int argc, char **argv)
   extern int chdir (char *);
   char *srcdir = NULL;
   int c;
   extern int chdir (char *);
   char *srcdir = NULL;
   int c;

-  
+

   program_name = *argv;
   xmalloc_set_program_name (program_name);
 
   program_name = *argv;
   xmalloc_set_program_name (program_name);
 


@@ -2845,7 +2824,7 @@ main (int argc, char **argv)
   if (optind != argc)
     usage (stdout, 1);
 
   if (optind != argc)
     usage (stdout, 1);
 

-  if (srcdir != NULL) 
+  if (srcdir != NULL)

     if (chdir (srcdir) != 0)
       fail (_("unable to change directory to \"%s\", errno = %s\n"),
            srcdir, strerror (errno));
     if (chdir (srcdir) != 0)
       fail (_("unable to change directory to \"%s\", errno = %s\n"),
            srcdir, strerror (errno));


@@ -2864,7 +2843,7 @@ main (int argc, char **argv)
   collapse_redundant_completers ();
 
   printf ("/* This file is automatically generated by ia64-gen.  Do not edit!  */\n");
   collapse_redundant_completers ();
 
   printf ("/* This file is automatically generated by ia64-gen.  Do not edit!  */\n");

-  printf ("/* Copyright 2007  Free Software Foundation, Inc.\n\
+  printf ("/* Copyright (C) 2007-2020 Free Software Foundation, Inc.\n\

 \n\
    This file is part of the GNU opcodes library.\n\
 \n\
 \n\
    This file is part of the GNU opcodes library.\n\
 \n\