x86: move reg_operands adjustment

Ideally we'd do away with this somewhat questionable adjustment (leaving
i.types[] untouched). That's non-trivial though as it looks, so only
- move the logic into process_operands(), putting it closer to related
  logic and eliminating a conditional for operand-less insns,
- make it consistent (i.e. also affect %xmm0), eliminating an ugly
  special case later in the function.

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 985984c71eb0a03eafba20d2ac68f4e41e810d2c..e1f8f65f90bc7cf6aac24fdb8041525b6330f5ba 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -5317,14 +5317,6 @@ md_assemble (char *line)
   if (i.types[0].bitfield.imm1)
     i.imm_operands = 0;        /* kludge for shift insns.  */
 
-  /* We only need to check those implicit registers for instructions
-     with 3 operands or less.  */
-  if (i.operands <= 3)
-    for (j = 0; j < i.operands; j++)
-      if (i.types[j].bitfield.instance != InstanceNone
-         && !i.types[j].bitfield.xmmword)
-       i.reg_operands--;
-
   /* For insns with operands there are more diddles to do to the opcode.  */
   if (i.operands)
     {
@@ -7936,6 +7928,13 @@ process_operands (void)
      unnecessary segment overrides.  */
   const reg_entry *default_seg = NULL;
 
+  /* We only need to check those implicit registers for instructions
+     with 3 operands or less.  */
+  if (i.operands <= 3)
+    for (unsigned int j = 0; j < i.operands; j++)
+      if (i.types[j].bitfield.instance != InstanceNone)
+       i.reg_operands--;
+
   if (i.tm.opcode_modifier.sse2avx)
     {
       /* Legacy encoded insns allow explicit REX prefixes, so these prefixes
@@ -7970,6 +7969,7 @@ process_operands (void)
             sources.  */
          i.tm.operand_types[0].bitfield.instance = InstanceNone;
          i.tm.operand_types[0].bitfield.class = RegSIMD;
+         i.reg_operands++;
          goto duplicate;
        }
 
@@ -8025,11 +8025,6 @@ process_operands (void)
     {
       unsigned int j;
 
-      /* This needs to account for the adjustment already done ahead of
-        calling process_operands().  */
-      if (i.tm.operand_types[0].bitfield.xmmword)
-       i.reg_operands--;
-
       for (j = 1; j < i.operands; j++)
        {
          i.op[j - 1] = i.op[j];
@@ -8042,6 +8037,8 @@ process_operands (void)
          i.flags[j - 1] = i.flags[j];
        }
 
+      /* No adjustment to i.reg_operands: This was already done at the top
+        of the function.  */
       i.operands--;
       i.tm.operands--;
     }