2007-10-12 H.J. Lu <hongjiu.lu@intel.com>

	* config/tc-i386.c (process_operands): Simplify implicit xmm0
	handling.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6bffb5c9e4634cc32836e4cf8e6b8fe9e5e847c9..82a5d364c32d8331f307afc0167b85f69dc84a33 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * config/tc-i386.c (process_operands): Simplify implicit xmm0
+       handling.
+
 2007-10-12  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (process_operands): Check the firstxmm0

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 89629805ddfcf805f3370dc4639da311f9a4ddd4..0c430eab74ca64aa8ddff4827e00f877343f20aa 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4232,6 +4232,8 @@ process_operands (void)
 
   if (i.tm.opcode_modifier.firstxmm0)
     {
+      unsigned int j;
+
       /* The first operand is implicit and must be xmm0.  */
       assert (i.reg_operands && UINTS_EQUAL (i.types[0], regxmm));
       if (i.op[0].regs->reg_num != 0)
@@ -4244,17 +4246,19 @@ process_operands (void)
                    i.tm.name, register_prefix);
          return 0;
        }
-      i.op[0] = i.op[1];
-      i.op[1] = i.op[2];
-      i.types[0] = i.types[1];
-      i.types[1] = i.types[2];
+
+      for (j = 1; j < i.operands; j++)
+       {
+         i.op[j - 1] = i.op[j];
+         i.types[j - 1] = i.types[j];
+
+         /* We need to adjust fields in i.tm since they are used by
+            build_modrm_byte.  */
+         i.tm.operand_types [j - 1] = i.tm.operand_types [j];
+       }
+
       i.operands--;
       i.reg_operands--;
-
-      /* We need to adjust fields in i.tm since they are used by
-        build_modrm_byte.  */
-      i.tm.operand_types [0] = i.tm.operand_types [1];
-      i.tm.operand_types [1] = i.tm.operand_types [2];
       i.tm.operands--;
     }
   else if (i.tm.opcode_modifier.regkludge)