Replace VEX2SOURCES with XOP2SOURCES.

gas/

2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>

	* config/tc-i386.c (build_modrm_byte): Check XOP2SOURCES
	instead VEX2SOURCES.

opcodes/

2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>

	* i386-opc.h (VEX2SOURCES): Renamed to ...
	(XOP2SOURCES): This.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d57e76a19aa44fa83832e5f1a3e326e5b3030d54..816ce34a5cd5448a8e2b7b003a697891ff149ee5 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * config/tc-i386.c (build_modrm_byte): Check XOP2SOURCES
+       instead VEX2SOURCES.
+
 2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (process_operands): Check vexsources 

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index eb99accd0322695ff23b239e500ea6a1e0dd3bec..0ddf87112621228f1579144ee2df716c4d26a641 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -5311,7 +5311,7 @@ build_modrm_byte (void)
       else
        mem = ~0;
 
-      if (i.tm.opcode_modifier.vexsources == VEX2SOURCES)
+      if (i.tm.opcode_modifier.vexsources == XOP2SOURCES)
        {
          if (operand_type_check (i.types[0], imm))
            i.vex.register_specifier = NULL;

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 01d250e4119b4c7e332c2b3fd000f0f836c774cb..fb780a16360e80d7f82255b5d831a9472bd05286 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * i386-opc.h (VEX2SOURCES): Renamed to ...
+       (XOP2SOURCES): This.
+
 2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        * i386-gen.c (opcode_modifiers): Remove Vex3Sources and

diff --git a/opcodes/i386-opc.h b/opcodes/i386-opc.h
index 08fe068cb062c1072d06ff483ff676f871be34f9..afed367ab6f27da73c9ea487657e62572052d30c 100644 (file)
--- a/opcodes/i386-opc.h
+++ b/opcodes/i386-opc.h
@@ -307,11 +307,11 @@ enum
   /* insn has XOP 0x0A opcode prefix. */
   XOP0A,
   /* number of VEX source operands:
-     0: < 2 source operands.
-     1: 2 source operands.
+     0: <= 2 source operands.
+     1: 2 XOP source operands.
      2: 3 source operands.
    */
-#define VEX2SOURCES    1
+#define XOP2SOURCES    1
 #define VEX3SOURCES    2
   VexSources,
   /* instruction has VEX 8 bit imm */