x86: partial revert of 10c17abdd0

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

diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
index b3694e7aaeb33c5f996c11dc561db8335bf48e1c..2acf1a4fc775bed66b202629ba94f139ced65d2f 100644 (file)
--- a/opcodes/i386-gen.c
+++ b/opcodes/i386-gen.c
@@ -335,6 +335,19 @@ static initializer cpu_flag_init[] =
     "CpuAVX512_BITALG" },
 };
 
+static const initializer operand_type_shorthands[] =
+{
+  { "Reg8",     "Reg|Byte" },
+  { "Reg16",    "Reg|Word" },
+  { "Reg32",    "Reg|Dword" },
+  { "Reg64",    "Reg|Qword" },
+  { "FloatAcc", "Acc|Tbyte" },
+  { "FloatReg", "Reg|Tbyte" },
+  { "RegXMM",   "RegSIMD|Xmmword" },
+  { "RegYMM",   "RegSIMD|Ymmword" },
+  { "RegZMM",   "RegSIMD|Zmmword" },
+};
+
 static initializer operand_type_init[] =
 {
   { "OPERAND_TYPE_NONE",
@@ -439,8 +452,6 @@ static initializer operand_type_init[] =
     "Vec_Imm4" },
   { "OPERAND_TYPE_REGBND",
     "RegBND" },
-  { "OPERAND_TYPE_VEC_DISP8",
-    "Vec_Disp8" },
 };
 
 typedef struct bitfield
@@ -593,7 +604,6 @@ static bitfield opcode_modifiers[] =
   BITFIELD (NoTrackPrefixOk),
   BITFIELD (IsLockable),
   BITFIELD (RegKludge),
-  BITFIELD (FirstXmm0),
   BITFIELD (Implicit1stXmm0),
   BITFIELD (RepPrefixOk),
   BITFIELD (HLEPrefixOk),
@@ -633,15 +643,9 @@ static bitfield opcode_modifiers[] =
 
 static bitfield operand_types[] =
 {
-  BITFIELD (Reg8),
-  BITFIELD (Reg16),
-  BITFIELD (Reg32),
-  BITFIELD (Reg64),
-  BITFIELD (FloatReg),
+  BITFIELD (Reg),
   BITFIELD (RegMMX),
-  BITFIELD (RegXMM),
-  BITFIELD (RegYMM),
-  BITFIELD (RegZMM),
+  BITFIELD (RegSIMD),
   BITFIELD (RegMask),
   BITFIELD (Imm1),
   BITFIELD (Imm8),
@@ -664,7 +668,6 @@ static bitfield operand_types[] =
   BITFIELD (SReg2),
   BITFIELD (SReg3),
   BITFIELD (Acc),
-  BITFIELD (FloatAcc),
   BITFIELD (JumpAbsolute),
   BITFIELD (EsSeg),
   BITFIELD (RegMem),
@@ -682,13 +685,14 @@ static bitfield operand_types[] =
   BITFIELD (Anysize),
   BITFIELD (Vec_Imm4),
   BITFIELD (RegBND),
-  BITFIELD (Vec_Disp8),
 #ifdef OTUnused
   BITFIELD (OTUnused),
 #endif
 };
 
 static const char *filename;
+static i386_cpu_flags active_cpu_flags;
+static int active_isstring;
 
 static int
 compare (const void *x, const void *y)
@@ -790,9 +794,8 @@ next_field (char *str, char sep, char **next, char *last)
 static void set_bitfield (char *, bitfield *, int, unsigned int, int);
 
 static int
-set_bitfield_from_cpu_flag_init (char *f, bitfield *array,
-                                int value, unsigned int size,
-                                int lineno)
+set_bitfield_from_shorthand (char *f, bitfield *array, unsigned int size,
+                            int lineno)
 {
   char *str, *next, *last;
   unsigned int i;
@@ -813,6 +816,22 @@ set_bitfield_from_cpu_flag_init (char *f, bitfield *array,
        return 0;
       }
 
+  for (i = 0; i < ARRAY_SIZE (operand_type_shorthands); i++)
+    if (strcmp (operand_type_shorthands[i].name, f) == 0)
+      {
+       /* Turn on selective bits.  */
+       char *init = xstrdup (operand_type_shorthands[i].init);
+       last = init + strlen (init);
+       for (next = init; next && next < last; )
+         {
+           str = next_field (next, '|', &next, last);
+           if (str)
+             set_bitfield (str, array, 1, size, lineno);
+         }
+       free (init);
+       return 0;
+      }
+
   return -1;
 }
 
@@ -863,8 +882,8 @@ set_bitfield (char *f, bitfield *array, int value,
        }
     }
 
-  /* Handle CPU_XXX_FLAGS.  */
-  if (!set_bitfield_from_cpu_flag_init (f, array, value, size, lineno))
+  /* Handle shorthands.  */
+  if (value == 1 && !set_bitfield_from_shorthand (f, array, size, lineno))
     return;
 
   if (lineno != -1)
@@ -879,6 +898,8 @@ output_cpu_flags (FILE *table, bitfield *flags, unsigned int size,
 {
   unsigned int i;
 
+  memset (&active_cpu_flags, 0, sizeof(active_cpu_flags));
+
   fprintf (table, "%s{ { ", indent);
 
   for (i = 0; i < size - 1; i++)
@@ -895,6 +916,8 @@ output_cpu_flags (FILE *table, bitfield *flags, unsigned int size,
          else
            fprintf (table, "\n    %s", indent);
        }
+      if (flags[i].value)
+       active_cpu_flags.array[i / 32] |= 1U << (i % 32);
     }
 
   fprintf (table, "%d } }%s\n", flags[i].value, comma);
@@ -991,6 +1014,8 @@ process_i386_opcode_modifier (FILE *table, char *mod, int lineno)
   char *str, *next, *last;
   bitfield modifiers [ARRAY_SIZE (opcode_modifiers)];
 
+  active_isstring = 0;
+
   /* Copy the default opcode modifier.  */
   memcpy (modifiers, opcode_modifiers, sizeof (modifiers));
 
@@ -1001,16 +1026,26 @@ process_i386_opcode_modifier (FILE *table, char *mod, int lineno)
        {
          str = next_field (next, '|', &next, last);
          if (str)
-           set_bitfield (str, modifiers, 1, ARRAY_SIZE (modifiers),
+           {
+             set_bitfield (str, modifiers, 1, ARRAY_SIZE (modifiers),
                          lineno);
+             if (strcasecmp(str, "IsString") == 0)
+               active_isstring = 1;
+           }
        }
     }
   output_opcode_modifier (table, modifiers, ARRAY_SIZE (modifiers));
 }
 
+enum stage {
+  stage_macros,
+  stage_opcodes,
+  stage_registers,
+};
+
 static void
 output_operand_type (FILE *table, bitfield *types, unsigned int size,
-                    int macro, const char *indent)
+                    enum stage stage, const char *indent)
 {
   unsigned int i;
 
@@ -1025,7 +1060,7 @@ output_operand_type (FILE *table, bitfield *types, unsigned int size,
       if (((i + 1) % 20) == 0)
        {
          /* We need \\ for macro.  */
-         if (macro)
+         if (stage == stage_macros)
            fprintf (table, " \\\n%s", indent);
          else
            fprintf (table, "\n%s", indent);
@@ -1036,7 +1071,7 @@ output_operand_type (FILE *table, bitfield *types, unsigned int size,
 }
 
 static void
-process_i386_operand_type (FILE *table, char *op, int macro,
+process_i386_operand_type (FILE *table, char *op, enum stage stage,
                           const char *indent, int lineno)
 {
   char *str, *next, *last;
@@ -1047,15 +1082,32 @@ process_i386_operand_type (FILE *table, char *op, int macro,
 
   if (strcmp (op, "0"))
     {
+      int baseindex = 0;
+
       last = op + strlen (op);
       for (next = op; next && next < last; )
        {
          str = next_field (next, '|', &next, last);
          if (str)
-           set_bitfield (str, types, 1, ARRAY_SIZE (types), lineno);
+           {
+             set_bitfield (str, types, 1, ARRAY_SIZE (types), lineno);
+             if (strcasecmp(str, "BaseIndex") == 0)
+               baseindex = 1;
+           }
+       }
+
+      if (stage == stage_opcodes && baseindex && !active_isstring)
+       {
+         set_bitfield("Disp8", types, 1, ARRAY_SIZE (types), lineno);
+         if (!active_cpu_flags.bitfield.cpu64
+             && !active_cpu_flags.bitfield.cpumpx)
+           set_bitfield("Disp16", types, 1, ARRAY_SIZE (types), lineno);
+         set_bitfield("Disp32", types, 1, ARRAY_SIZE (types), lineno);
+         if (!active_cpu_flags.bitfield.cpuno64)
+           set_bitfield("Disp32S", types, 1, ARRAY_SIZE (types), lineno);
        }
     }
-  output_operand_type (table, types, ARRAY_SIZE (types), macro,
+  output_operand_type (table, types, ARRAY_SIZE (types), stage,
                       indent);
 }
 
@@ -1143,14 +1195,15 @@ output_i386_opcode (FILE *table, const char *name, char *str,
       if (operand_types[i] == NULL || *operand_types[i] == '0')
        {
          if (i == 0)
-           process_i386_operand_type (table, "0", 0, "\t  ", lineno);
+           process_i386_operand_type (table, "0", stage_opcodes, "\t  ",
+                                      lineno);
          break;
        }
 
       if (i != 0)
        fprintf (table, ",\n      ");
 
-      process_i386_operand_type (table, operand_types[i], 0,
+      process_i386_operand_type (table, operand_types[i], stage_opcodes,
                                 "\t  ", lineno);
     }
   fprintf (table, " } },\n");
@@ -1312,7 +1365,7 @@ process_i386_opcodes (FILE *table)
   process_i386_opcode_modifier (table, "0", -1);
 
   fprintf (table, "    { ");
-  process_i386_operand_type (table, "0", 0, "\t  ", -1);
+  process_i386_operand_type (table, "0", stage_opcodes, "\t  ", -1);
   fprintf (table, " } }\n");
 
   fprintf (table, "};\n");
@@ -1381,7 +1434,8 @@ process_i386_registers (FILE *table)
 
       fprintf (table, "  { \"%s\",\n    ", reg_name);
 
-      process_i386_operand_type (table, reg_type, 0, "\t", lineno);
+      process_i386_operand_type (table, reg_type, stage_registers, "\t",
+                                lineno);
 
       /* Find 32-bit Dwarf2 register number.  */
       dw2_32_num = next_field (str, ',', &str, last);
@@ -1425,7 +1479,7 @@ process_i386_initializers (void)
     {
       fprintf (fp, "\n\n#define %s \\\n  ", operand_type_init[i].name);
       init = xstrdup (operand_type_init[i].init);
-      process_i386_operand_type (fp, init, 1, "      ", -1);
+      process_i386_operand_type (fp, init, stage_macros, "      ", -1);
       free (init);
     }
   fprintf (fp, "\n");