x86: fold duplicate code in MOVSXD_Fixup()

[binutils-gdb.git] / opcodes / i386-dis.c

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index f88276ced6bcf53b545f8757fda83c8bdfb403ff..ddb659fb04195dc86bd40ee741bdfe120cec3274 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -50,7 +50,6 @@ static void oappend (const char *);
 static void append_seg (void);
 static void OP_indirE (int, int);
 static void print_operand_value (char *, int, bfd_vma);
-static void OP_E_register (int, int);
 static void OP_E_memory (int, int);
 static void print_displacement (char *, bfd_vma);
 static void OP_E (int, int);
@@ -1476,7 +1475,6 @@ enum
   EVEX_W_0F12_P_3,
   EVEX_W_0F16_P_0_M_1,
   EVEX_W_0F16_P_1,
-  EVEX_W_0F2A_P_3,
   EVEX_W_0F51_P_1,
   EVEX_W_0F51_P_3,
   EVEX_W_0F58_P_1,
@@ -1521,7 +1519,6 @@ enum
   EVEX_W_0F7A_P_2,
   EVEX_W_0F7A_P_3,
   EVEX_W_0F7B_P_2,
-  EVEX_W_0F7B_P_3,
   EVEX_W_0F7E_P_1,
   EVEX_W_0F7F_P_1,
   EVEX_W_0F7F_P_2,
@@ -4182,7 +4179,7 @@ static const struct dis386 x86_64_table[][2] = {
   /* X86_64_63 */
   {
     { "arpl", { Ew, Gw }, 0 },
-    { "movs", { { OP_G, movsxd_mode }, { MOVSXD_Fixup, movsxd_mode } }, 0 },
+    { "movs", { Gv, { MOVSXD_Fixup, movsxd_mode } }, 0 },
   },
 
   /* X86_64_6D */
@@ -11292,21 +11289,14 @@ intel_operand_size (int bytemode, int sizeflag)
 }
 
 static void
-OP_E_register (int bytemode, int sizeflag)
+print_register (unsigned int reg, unsigned int rexmask, int bytemode, int sizeflag)
 {
-  int reg = modrm.rm;
   const char **names;
 
-  USED_REX (REX_B);
-  if ((rex & REX_B))
+  USED_REX (rexmask);
+  if (rex & rexmask)
     reg += 8;
 
-  if ((sizeflag & SUFFIX_ALWAYS)
-      && (bytemode == b_swap_mode
-         || bytemode == bnd_swap_mode
-         || bytemode == v_swap_mode))
-    swap_operand ();
-
   switch (bytemode)
     {
     case b_mode:
@@ -11926,7 +11916,15 @@ OP_E (int bytemode, int sizeflag)
   codep++;
 
   if (modrm.mod == 3)
-    OP_E_register (bytemode, sizeflag);
+    {
+      if ((sizeflag & SUFFIX_ALWAYS)
+         && (bytemode == b_swap_mode
+             || bytemode == bnd_swap_mode
+             || bytemode == v_swap_mode))
+       swap_operand ();
+
+      print_register (modrm.rm, REX_B, bytemode, sizeflag);
+    }
   else
     OP_E_memory (bytemode, sizeflag);
 }
@@ -11934,97 +11932,13 @@ OP_E (int bytemode, int sizeflag)
 static void
 OP_G (int bytemode, int sizeflag)
 {
-  int add = 0;
-  const char **names;
-  USED_REX (REX_R);
-  if (rex & REX_R)
-    add += 8;
-  switch (bytemode)
+  if (vex.evex && !vex.r && address_mode == mode_64bit)
     {
-    case b_mode:
-      if (modrm.reg & 4)
-       USED_REX (0);
-      if (rex)
-       oappend (names8rex[modrm.reg + add]);
-      else
-       oappend (names8[modrm.reg + add]);
-      break;
-    case w_mode:
-      oappend (names16[modrm.reg + add]);
-      break;
-    case d_mode:
-    case db_mode:
-    case dw_mode:
-      oappend (names32[modrm.reg + add]);
-      break;
-    case q_mode:
-      oappend (names64[modrm.reg + add]);
-      break;
-    case bnd_mode:
-      if (modrm.reg > 0x3)
-       {
-         oappend ("(bad)");
-         return;
-       }
-      oappend (names_bnd[modrm.reg]);
-      break;
-    case v_mode:
-    case dq_mode:
-    case dqb_mode:
-    case dqd_mode:
-    case dqw_mode:
-    case movsxd_mode:
-      USED_REX (REX_W);
-      if (rex & REX_W)
-       oappend (names64[modrm.reg + add]);
-      else if (bytemode != v_mode && bytemode != movsxd_mode)
-       oappend (names32[modrm.reg + add]);
-      else
-       {
-         if (sizeflag & DFLAG)
-           oappend (names32[modrm.reg + add]);
-         else
-           oappend (names16[modrm.reg + add]);
-         used_prefixes |= (prefixes & PREFIX_DATA);
-       }
-      break;
-    case va_mode:
-      names = (address_mode == mode_64bit
-              ? names64 : names32);
-      if (!(prefixes & PREFIX_ADDR))
-       {
-         if (address_mode == mode_16bit)
-           names = names16;
-       }
-      else
-       {
-         /* Remove "addr16/addr32".  */
-         all_prefixes[last_addr_prefix] = 0;
-         names = (address_mode != mode_32bit
-                      ? names32 : names16);
-         used_prefixes |= PREFIX_ADDR;
-       }
-      oappend (names[modrm.reg + add]);
-      break;
-    case m_mode:
-      if (address_mode == mode_64bit)
-       oappend (names64[modrm.reg + add]);
-      else
-       oappend (names32[modrm.reg + add]);
-      break;
-    case mask_bd_mode:
-    case mask_mode:
-      if (add || (vex.evex && !vex.r))
-       {
-         oappend ("(bad)");
-         return;
-       }
-      oappend (names_mask[modrm.reg]);
-      break;
-    default:
-      oappend (INTERNAL_DISASSEMBLER_ERROR);
-      break;
+      oappend ("(bad)");
+      return;
     }
+
+  print_register (modrm.reg, REX_R, bytemode, sizeflag);
 }
 
 static bfd_vma
@@ -13687,31 +13601,25 @@ MOVSXD_Fixup (int bytemode, int sizeflag)
   switch (bytemode)
     {
     case movsxd_mode:
-      if (intel_syntax)
+      if (!intel_syntax)
        {
-         *p++ = 'x';
-         *p++ = 'd';
-         goto skip;
+         USED_REX (REX_W);
+         if (rex & REX_W)
+           {
+             *p++ = 'l';
+             *p++ = 'q';
+             break;
+           }
        }
 
-      USED_REX (REX_W);
-      if (rex & REX_W)
-       {
-         *p++ = 'l';
-         *p++ = 'q';
-       }
-      else
-       {
-         *p++ = 'x';
-         *p++ = 'd';
-       }
+      *p++ = 'x';
+      *p++ = 'd';
       break;
     default:
       oappend (INTERNAL_DISASSEMBLER_ERROR);
       break;
     }
 
- skip:
   mnemonicendp = p;
   *p = '\0';
   OP_E (bytemode, sizeflag);
@@ -13724,7 +13632,7 @@ OP_Rounding (int bytemode, int sizeflag ATTRIBUTE_UNUSED)
     switch (bytemode)
       {
       case evex_rounding_64_mode:
-       if (address_mode != mode_64bit)
+       if (address_mode != mode_64bit || !vex.w)
          {
            oappend ("(bad)");
            break;