x86/APX: VROUND{P,S}{S,D} can generally be encoded

VRNDSCALE{P,S}{S,D} is the AVX512 generalization of these AVX insns. As
long as the immediate has the top 4 bits clear, they are equivalent to
the earlier VEX-encoded insns, and hence can be used to permit use of
eGPR-s in the memory operand. Since this is the normal way of using
these insns, also alter the resulting diagnostic to complain about the
immediate, not the eGPR use.

8 files changed, 227 insertions, 157 deletions

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 4262e1e..51166ef 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -8156,7 +8156,8 @@ check_VecOperands (const insn_template *t)
     }
 
   /* Check the special Imm4 cases; must be the first operand.  */
-  if (is_cpu (t, CpuXOP) && t->operands == 5)
+  if ((is_cpu (t, CpuXOP) && t->operands == 5)
+      || (is_cpu (t, CpuAPX_F) && t->opcode_space == SPACE_0F3A))
     {
       if (i.op[0].imms->X_op != O_constant
 	  || !fits_in_imm4 (i.op[0].imms->X_add_number))
@@ -8166,7 +8167,8 @@ check_VecOperands (const insn_template *t)
 	}
 
       /* Turn off Imm<N> so that update_imm won't complain.  */
-      operand_type_set (&i.types[0], 0);
+      if (t->operands == 5)
+	operand_type_set (&i.types[0], 0);
     }
 
   /* Check vector Disp8 operand.  */
diff --git a/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.l b/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.l
index 0472748..5cabe61 100644
--- a/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.l
+++ b/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.l
@@ -187,10 +187,10 @@
 .*:195: Error: extended GPR cannot be used as base/index for `vrcpps'
 .*:196: Error: extended GPR cannot be used as base/index for `vrcpps'
 .*:197: Error: extended GPR cannot be used as base/index for `vrcpss'
-.*:198: Error: extended GPR cannot be used as base/index for `vroundpd'
-.*:199: Error: extended GPR cannot be used as base/index for `vroundps'
-.*:200: Error: extended GPR cannot be used as base/index for `vroundsd'
-.*:201: Error: extended GPR cannot be used as base/index for `vroundss'
+.*:198: Error: .* 4 bits for `vroundpd'
+.*:199: Error: .* 4 bits for `vroundps'
+.*:200: Error: .* 4 bits for `vroundsd'
+.*:201: Error: .* 4 bits for `vroundss'
 .*:202: Error: extended GPR cannot be used as base/index for `vrsqrtps'
 .*:203: Error: extended GPR cannot be used as base/index for `vrsqrtps'
 .*:204: Error: extended GPR cannot be used as base/index for `vrsqrtss'
diff --git a/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.s b/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.s
index fde038d..76f0a1b 100644
--- a/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.s
+++ b/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.s
@@ -195,10 +195,10 @@
 	vrcpps (%r27),%xmm6
 	vrcpps (%r27),%ymm6
 	vrcpss (%r27),%xmm6,%xmm6
-	vroundpd $1,(%r24),%xmm6
-	vroundps $2,(%r24),%xmm6
-	vroundsd $3,(%r24),%xmm6,%xmm3
-	vroundss $4,(%r24),%xmm6,%xmm3
+	vroundpd $0x11,(%r24),%xmm6
+	vroundps $0x22,(%r24),%xmm6
+	vroundsd $0x33,(%r24),%xmm6,%xmm3
+	vroundss $0x44,(%r24),%xmm6,%xmm3
 	vrsqrtps (%r27),%xmm6
 	vrsqrtps (%r27),%ymm6
 	vrsqrtss (%r27),%xmm6,%xmm6
diff --git a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-intel.d b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-intel.d
index 02e811d..354c85c 100644
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-intel.d
@@ -158,6 +158,10 @@ Disassembly of section \.text:
 [	 ]*[a-f0-9]+:[	 ]*62 da 7f 08 4b b4 87 23 01 00 00[	 ]+tileloadd tmm6,\[r31\+rax\*4\+0x123\]
 [	 ]*[a-f0-9]+:[	 ]*62 da 7d 08 4b b4 87 23 01 00 00[	 ]+tileloaddt1 tmm6,\[r31\+rax\*4\+0x123\]
 [	 ]*[a-f0-9]+:[	 ]*62 da 7e 08 4b b4 87 23 01 00 00[	 ]+tilestored[	 ]+\[r31\+rax\*4\+0x123\],tmm6
+[	 ]*[a-f0-9]+:[	 ]*62 db fd 08 09 30 01[	 ]+vrndscalepd xmm6,XMMWORD PTR \[r24\],(0x)?1
+[	 ]*[a-f0-9]+:[	 ]*62 db 7d 08 08 30 02[	 ]+vrndscaleps xmm6,XMMWORD PTR \[r24\],(0x)?2
+[	 ]*[a-f0-9]+:[	 ]*62 db cd 08 0b 18 03[	 ]+vrndscalesd xmm3,xmm6,QWORD PTR \[r24\],(0x)?3
+[	 ]*[a-f0-9]+:[	 ]*62 db 4d 08 0a 18 04[	 ]+vrndscaless xmm3,xmm6,DWORD PTR \[r24\],(0x)?4
 [	 ]*[a-f0-9]+:[	 ]*62 4c 7c 08 66 8c 87 23 01 00 00[	 ]+wrssd[	 ]+\[r31\+rax\*4\+0x123\],r25d
 [	 ]*[a-f0-9]+:[	 ]*62 4c fc 08 66 bc 87 23 01 00 00[	 ]+wrssq[	 ]+\[r31\+rax\*4\+0x123\],r31
 [	 ]*[a-f0-9]+:[	 ]*62 4c 7d 08 65 8c 87 23 01 00 00[	 ]+wrussd[	 ]+\[r31\+rax\*4\+0x123\],r25d
diff --git a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d
index 3a7dffc..a86fa60 100644
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d
@@ -158,6 +158,10 @@ Disassembly of section \.text:
 [	 ]*[a-f0-9]+:[	 ]*62 da 7f 08 4b b4 87 23 01 00 00[	 ]+tileloadd[	 ]+0x123\(%r31,%rax,4\),%tmm6
 [	 ]*[a-f0-9]+:[	 ]*62 da 7d 08 4b b4 87 23 01 00 00[	 ]+tileloaddt1[	 ]+0x123\(%r31,%rax,4\),%tmm6
 [	 ]*[a-f0-9]+:[	 ]*62 da 7e 08 4b b4 87 23 01 00 00[	 ]+tilestored[	 ]+%tmm6,0x123\(%r31,%rax,4\)
+[	 ]*[a-f0-9]+:[	 ]*62 db fd 08 09 30 01[	 ]+vrndscalepd \$0x1,\(%r24\),%xmm6
+[	 ]*[a-f0-9]+:[	 ]*62 db 7d 08 08 30 02[	 ]+vrndscaleps \$0x2,\(%r24\),%xmm6
+[	 ]*[a-f0-9]+:[	 ]*62 db cd 08 0b 18 03[	 ]+vrndscalesd \$0x3,\(%r24\),%xmm6,%xmm3
+[	 ]*[a-f0-9]+:[	 ]*62 db 4d 08 0a 18 04[	 ]+vrndscaless \$0x4,\(%r24\),%xmm6,%xmm3
 [	 ]*[a-f0-9]+:[	 ]*62 4c 7c 08 66 8c 87 23 01 00 00[	 ]+wrssd[	 ]+%r25d,0x123\(%r31,%rax,4\)
 [	 ]*[a-f0-9]+:[	 ]*62 4c fc 08 66 bc 87 23 01 00 00[	 ]+wrssq[	 ]+%r31,0x123\(%r31,%rax,4\)
 [	 ]*[a-f0-9]+:[	 ]*62 4c 7d 08 65 8c 87 23 01 00 00[	 ]+wrussd[	 ]+%r25d,0x123\(%r31,%rax,4\)
diff --git a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.s b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.s
index 39752c2..ac536d3 100644
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.s
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.s
@@ -152,6 +152,10 @@ _start:
 	tileloadd	0x123(%r31,%rax,4),%tmm6
 	tileloaddt1	0x123(%r31,%rax,4),%tmm6
 	tilestored	%tmm6,0x123(%r31,%rax,4)
+	vroundpd $1,(%r24),%xmm6
+	vroundps $2,(%r24),%xmm6
+	vroundsd $3,(%r24),%xmm6,%xmm3
+	vroundss $4,(%r24),%xmm6,%xmm3
 	wrssd	%r25d,0x123(%r31,%rax,4)
 	wrssq	%r31,0x123(%r31,%rax,4)
 	wrussd	%r25d,0x123(%r31,%rax,4)
diff --git a/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl
index 11a77a7..717e208 100644
--- a/opcodes/i386-opc.tbl
+++ b/opcodes/i386-opc.tbl
@@ -1790,6 +1790,10 @@ vrcpps, 0x53, AVX, Modrm|Vex|Space0F|VexWIG|CheckOperandSize|NoSuf, { Unspecifie
 vrcpss, 0xf353, AVX, Modrm|Vex=3|Space0F|VexVVVV|VexWIG|NoSuf, { Dword|Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
 vroundp<sd>, 0x6608 | <sd:opc>, AVX, Modrm|Vex|Space0F3A|VexWIG|CheckOperandSize|NoSuf, { Imm8, Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM }
 vrounds<sd>, 0x660a | <sd:opc>, AVX, Modrm|VexLIG|Space0F3A|VexVVVV|VexWIG|NoSuf, { Imm8, <sd:elem>|Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
+// These are really clones of VRNDSCALE{P,S}{S,D}, with broadcast, masking, SAE,
+// 512-bit operand size, and register sources dropped.
+vroundp<sd>, 0x6608 | <sd:opc>, APX_F, Modrm|Space0F3A|<sd:vexw>|Disp8ShiftVL|CheckOperandSize|NoSuf, { Imm8, Xmmword|Ymmword|Unspecified|BaseIndex, RegXMM|RegYMM }
+vrounds<sd>, 0x660a | <sd:opc>, APX_F, Modrm|EVexLIG|Space0F3A|VexVVVV|<sd:vexw>|Disp8MemShift|NoSuf, { Imm8, <sd:elem>|Unspecified|BaseIndex, RegXMM, RegXMM }
 vrsqrtps, 0x52, AVX, Modrm|Vex|Space0F|VexWIG|CheckOperandSize|NoSuf, { Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM }
 vrsqrtss, 0xf352, AVX, Modrm|Vex=3|Space0F|VexVVVV|VexWIG|NoSuf, { Dword|Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
 vshufp<sd>, 0x<sd:ppfx>c6, AVX, Modrm|Vex|Space0F|VexVVVV|VexWIG|CheckOperandSize|NoSuf, { Imm8|Imm8S, Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM, RegXMM|RegYMM }
diff --git a/opcodes/i386-tbl.h b/opcodes/i386-tbl.h
index c0aab67..72d5b9f 100644
--- a/opcodes/i386-tbl.h
+++ b/opcodes/i386-tbl.h
@@ -25292,6 +25292,18 @@ static const insn_template i386_optab[] =
 	  1, 1, 0, 0, 1, 0 } },
       { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	  1, 1, 0, 0, 0, 0 } } } },
+  { MN_vroundps, 0x08 | 0, 3, SPACE_0F3A, None,
+    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 1, 0, 0, 5, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0,
+      0 },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 0, 0, 0, 0, 0 } },
+      { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+	  1, 1, 0, 0, 1, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  1, 1, 0, 0, 0, 0 } } } },
   { MN_vroundpd, 0x08 | 1, 3, SPACE_0F3A, None,
     { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
       0, 0, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -25304,6 +25316,18 @@ static const insn_template i386_optab[] =
 	  1, 1, 0, 0, 1, 0 } },
       { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	  1, 1, 0, 0, 0, 0 } } } },
+  { MN_vroundpd, 0x08 | 1, 3, SPACE_0F3A, None,
+    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 2, 1, 0, 0, 5, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0,
+      0 },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 0, 0, 0, 0, 0 } },
+      { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+	  1, 1, 0, 0, 1, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  1, 1, 0, 0, 0, 0 } } } },
   { MN_vroundss, 0x0a | 0, 4, SPACE_0F3A, None,
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
       0, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -25318,6 +25342,20 @@ static const insn_template i386_optab[] =
 	  1, 0, 0, 0, 0, 0 } },
       { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	  1, 0, 0, 0, 0, 0 } } } },
+  { MN_vroundss, 0x0a | 0, 4, SPACE_0F3A, None,
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0,
+      0 },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 0, 0, 0, 0, 0 } },
+      { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0,
+	  0, 0, 0, 0, 1, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  1, 0, 0, 0, 0, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  1, 0, 0, 0, 0, 0 } } } },
   { MN_vroundsd, 0x0a | 1, 4, SPACE_0F3A, None,
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
       0, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -25332,6 +25370,20 @@ static const insn_template i386_optab[] =
 	  1, 0, 0, 0, 0, 0 } },
       { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	  1, 0, 0, 0, 0, 0 } } } },
+  { MN_vroundsd, 0x0a | 1, 4, SPACE_0F3A, None,
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 1, 2, 1, 0, 0, 4, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0,
+      0 },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 0, 0, 0, 0, 0 } },
+      { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0,
+	  0, 0, 0, 0, 1, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  1, 0, 0, 0, 0, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  1, 0, 0, 0, 0, 0 } } } },
   { MN_vrsqrtps, 0x52, 2, SPACE_0F, None,
     { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
       0, 0, 0, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -41396,153 +41448,153 @@ static const i386_op_off_t i386_op_sets[] =
   2373, 2377, 2379, 2383, 2387, 2391, 2395, 2399,
   2401, 2405, 2407, 2409, 2411, 2413, 2415, 2417,
   2419, 2421, 2422, 2424, 2426, 2428, 2430, 2432,
-  2434, 2436, 2438, 2439, 2440, 2441, 2442, 2443,
-  2444, 2445, 2446, 2447, 2449, 2451, 2453, 2455,
-  2457, 2459, 2460, 2462, 2464, 2466, 2468, 2469,
-  2470, 2472, 2474, 2476, 2478, 2480, 2482, 2484,
-  2486, 2487, 2488, 2489, 2490, 2493, 2496, 2498,
-  2501, 2502, 2503, 2505, 2506, 2508, 2509, 2510,
-  2512, 2514, 2515, 2516, 2517, 2518, 2519, 2522,
-  2527, 2532, 2537, 2542, 2545, 2550, 2555, 2557,
-  2559, 2561, 2563, 2564, 2565, 2567, 2569, 2571,
-  2573, 2575, 2577, 2579, 2580, 2581, 2582, 2583,
-  2584, 2585, 2590, 2595, 2596, 2597, 2598, 2599,
-  2600, 2601, 2602, 2603, 2604, 2605, 2606, 2607,
-  2608, 2609, 2610, 2611, 2612, 2613, 2614, 2615,
-  2616, 2617, 2618, 2619, 2620, 2621, 2622, 2623,
-  2624, 2625, 2626, 2627, 2628, 2629, 2630, 2631,
-  2632, 2633, 2634, 2635, 2636, 2637, 2638, 2639,
-  2640, 2641, 2642, 2643, 2644, 2645, 2646, 2647,
-  2648, 2649, 2650, 2651, 2652, 2653, 2654, 2655,
-  2656, 2657, 2658, 2659, 2660, 2661, 2662, 2663,
-  2664, 2665, 2666, 2667, 2668, 2669, 2670, 2671,
-  2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679,
-  2680, 2681, 2682, 2683, 2684, 2685, 2686, 2687,
-  2688, 2689, 2690, 2691, 2692, 2693, 2694, 2695,
-  2696, 2697, 2698, 2699, 2700, 2701, 2702, 2703,
-  2704, 2705, 2706, 2707, 2708, 2709, 2710, 2711,
-  2712, 2713, 2714, 2715, 2716, 2717, 2718, 2719,
-  2720, 2721, 2722, 2723, 2724, 2725, 2726, 2727,
-  2728, 2729, 2730, 2731, 2732, 2733, 2734, 2735,
-  2736, 2737, 2738, 2739, 2740, 2741, 2742, 2743,
-  2744, 2745, 2746, 2747, 2748, 2749, 2750, 2751,
-  2752, 2753, 2754, 2755, 2756, 2757, 2758, 2759,
-  2760, 2761, 2762, 2763, 2764, 2765, 2766, 2767,
-  2768, 2769, 2770, 2771, 2772, 2773, 2774, 2775,
-  2776, 2777, 2778, 2779, 2780, 2781, 2782, 2783,
-  2784, 2785, 2786, 2787, 2788, 2789, 2790, 2791,
-  2792, 2793, 2794, 2795, 2796, 2798, 2800, 2801,
-  2802, 2803, 2804, 2805, 2806, 2807, 2808, 2809,
-  2810, 2811, 2812, 2813, 2814, 2815, 2816, 2817,
-  2818, 2819, 2820, 2821, 2822, 2823, 2824, 2825,
-  2826, 2827, 2828, 2830, 2832, 2834, 2836, 2837,
-  2838, 2839, 2840, 2841, 2842, 2843, 2844, 2845,
-  2846, 2847, 2848, 2849, 2851, 2852, 2853, 2854,
-  2855, 2856, 2857, 2858, 2859, 2860, 2861, 2862,
-  2863, 2864, 2865, 2866, 2867, 2868, 2869, 2870,
-  2871, 2872, 2873, 2874, 2875, 2876, 2877, 2878,
-  2879, 2880, 2881, 2882, 2883, 2884, 2885, 2886,
-  2887, 2888, 2889, 2890, 2891, 2892, 2893, 2894,
-  2895, 2896, 2898, 2900, 2901, 2902, 2904, 2905,
-  2907, 2909, 2910, 2911, 2913, 2915, 2916, 2917,
-  2918, 2919, 2920, 2921, 2922, 2923, 2924, 2925,
-  2926, 2927, 2928, 2929, 2930, 2931, 2932, 2933,
-  2936, 2939, 2940, 2941, 2942, 2943, 2944, 2945,
-  2947, 2949, 2951, 2952, 2953, 2955, 2957, 2959,
-  2961, 2965, 2967, 2969, 2970, 2971, 2972, 2973,
-  2974, 2975, 2976, 2977, 2978, 2979, 2980, 2981,
-  2982, 2983, 2984, 2985, 2986, 2987, 2990, 2993,
-  2994, 2995, 2996, 2997, 2998, 2999, 3000, 3001,
-  3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009,
-  3010, 3011, 3012, 3013, 3014, 3015, 3016, 3017,
-  3018, 3019, 3020, 3021, 3022, 3023, 3024, 3025,
-  3026, 3027, 3028, 3029, 3030, 3031, 3032, 3033,
-  3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041,
-  3042, 3043, 3044, 3045, 3046, 3047, 3050, 3052,
-  3055, 3058, 3060, 3063, 3066, 3069, 3072, 3073,
-  3076, 3077, 3078, 3079, 3080, 3081, 3085, 3087,
-  3090, 3091, 3092, 3093, 3094, 3095, 3096, 3097,
-  3098, 3099, 3100, 3101, 3102, 3103, 3104, 3105,
-  3106, 3107, 3108, 3109, 3110, 3111, 3112, 3113,
-  3114, 3115, 3116, 3117, 3118, 3119, 3120, 3121,
-  3122, 3123, 3124, 3125, 3126, 3127, 3128, 3129,
-  3130, 3131, 3132, 3133, 3134, 3135, 3136, 3137,
-  3138, 3139, 3140, 3141, 3142, 3143, 3144, 3145,
-  3147, 3148, 3149, 3150, 3151, 3152, 3153, 3154,
-  3155, 3156, 3157, 3158, 3159, 3160, 3161, 3162,
-  3163, 3164, 3165, 3166, 3167, 3168, 3169, 3170,
-  3171, 3172, 3173, 3174, 3175, 3176, 3177, 3178,
-  3179, 3180, 3181, 3182, 3183, 3184, 3185, 3186,
-  3189, 3192, 3195, 3198, 3201, 3204, 3207, 3210,
-  3213, 3216, 3219, 3222, 3225, 3228, 3231, 3232,
-  3233, 3234, 3235, 3237, 3238, 3239, 3240, 3241,
-  3242, 3243, 3244, 3245, 3246, 3247, 3248, 3249,
-  3250, 3251, 3252, 3253, 3254, 3255, 3256, 3257,
-  3258, 3259, 3260, 3261, 3262, 3263, 3264, 3265,
-  3266, 3267, 3268, 3269, 3270, 3271, 3272, 3273,
-  3274, 3275, 3276, 3277, 3278, 3279, 3280, 3281,
-  3282, 3283, 3284, 3285, 3286, 3287, 3288, 3289,
-  3290, 3291, 3292, 3293, 3294, 3295, 3296, 3297,
-  3298, 3301, 3304, 3305, 3306, 3307, 3308, 3309,
-  3310, 3311, 3312, 3313, 3314, 3315, 3316, 3317,
-  3318, 3319, 3320, 3321, 3322, 3323, 3324, 3325,
-  3326, 3327, 3328, 3329, 3330, 3331, 3332, 3333,
-  3334, 3335, 3336, 3337, 3338, 3339, 3340, 3341,
-  3342, 3343, 3344, 3345, 3346, 3347, 3348, 3349,
-  3350, 3351, 3352, 3353, 3354, 3355, 3356, 3357,
-  3358, 3359, 3360, 3361, 3362, 3363, 3364, 3365,
-  3366, 3369, 3372, 3375, 3376, 3377, 3378, 3379,
-  3380, 3381, 3382, 3383, 3384, 3385, 3386, 3387,
-  3388, 3389, 3390, 3391, 3394, 3397, 3398, 3399,
-  3402, 3403, 3404, 3405, 3406, 3409, 3412, 3415,
-  3416, 3417, 3418, 3419, 3420, 3421, 3422, 3423,
-  3424, 3425, 3427, 3429, 3430, 3431, 3432, 3433,
-  3434, 3435, 3436, 3437, 3438, 3439, 3440, 3441,
-  3442, 3443, 3444, 3445, 3446, 3447, 3448, 3449,
-  3450, 3451, 3452, 3453, 3454, 3456, 3458, 3459,
-  3460, 3461, 3462, 3463, 3464, 3465, 3466, 3467,
-  3468, 3469, 3470, 3471, 3472, 3473, 3474, 3475,
-  3476, 3477, 3478, 3479, 3480, 3481, 3482, 3483,
-  3485, 3487, 3489, 3491, 3492, 3493, 3494, 3495,
-  3496, 3497, 3498, 3499, 3500, 3501, 3502, 3503,
-  3504, 3505, 3506, 3508, 3509, 3511, 3514, 3516,
-  3517, 3518, 3520, 3522, 3523, 3524, 3525, 3526,
-  3527, 3528, 3530, 3532, 3534, 3536, 3537, 3538,
-  3539, 3540, 3541, 3542, 3543, 3544, 3545, 3547,
-  3549, 3550, 3552, 3554, 3555, 3560, 3562, 3564,
-  3565, 3566, 3567, 3568, 3569, 3570, 3571, 3573,
-  3575, 3576, 3577, 3578, 3580, 3583, 3586, 3589,
-  3591, 3592, 3593, 3594, 3595, 3596, 3597, 3598,
-  3599, 3600, 3601, 3602, 3603, 3604, 3605, 3606,
-  3607, 3608, 3609, 3610, 3611, 3613, 3615, 3617,
-  3619, 3621, 3623, 3625, 3627, 3629, 3631, 3632,
-  3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640,
-  3641, 3642, 3643, 3644, 3645, 3646, 3647, 3648,
-  3649, 3650, 3651, 3652, 3653, 3654, 3655, 3656,
-  3657, 3658, 3659, 3660, 3661, 3662, 3663, 3664,
-  3665, 3666, 3667, 3668, 3669, 3670, 3671, 3672,
-  3673, 3674, 3675, 3676, 3677, 3678, 3679, 3680,
-  3681, 3682, 3683, 3684, 3685, 3686, 3687, 3688,
-  3689, 3690, 3691, 3692, 3693, 3694, 3695, 3696,
-  3697, 3698, 3699, 3700, 3701, 3702, 3703, 3704,
-  3705, 3706, 3707, 3708, 3709, 3710, 3711, 3712,
-  3713, 3714, 3715, 3716, 3717, 3718, 3719, 3720,
-  3721, 3722, 3723, 3724, 3725, 3726, 3727, 3728,
-  3729, 3730, 3731, 3732, 3733, 3734, 3735, 3736,
-  3737, 3738, 3739, 3740, 3741, 3742, 3743, 3746,
-  3747, 3748, 3751, 3752, 3753, 3755, 3756, 3757,
-  3758, 3760, 3761, 3762, 3763, 3765, 3766, 3767,
-  3768, 3771, 3772, 3773, 3774, 3775, 3778, 3781,
-  3784, 3787, 3790, 3791, 3792, 3793, 3794, 3796,
-  3798, 3799, 3800, 3801, 3804, 3807, 3810, 3813,
-  3816, 3817, 3818, 3819, 3821, 3822, 3823, 3824,
-  3826, 3827, 3828, 3829, 3830, 3831, 3832, 3833,
-  3834, 3835, 3836, 3837, 3838, 3839, 3840, 3841,
-  3842, 3843, 3844, 3845, 3846, 3847, 3848, 3849,
-  3850, 3851, 3852, 3853, 3854, 3855, 3856, 3857,
-  3858, 3859, 3860, 3861, 3862, 3863, 3864, 3865,
-  3867, 3869, 3871, 3873, 3875, 3876, 3877, 3880,
-  3883, 3884, 3885, 3886, 3887
+  2434, 2436, 2438, 2439, 2440, 2441, 2443, 2445,
+  2447, 2449, 2450, 2451, 2453, 2455, 2457, 2459,
+  2461, 2463, 2464, 2466, 2468, 2470, 2472, 2473,
+  2474, 2476, 2478, 2480, 2482, 2484, 2486, 2488,
+  2490, 2491, 2492, 2493, 2494, 2497, 2500, 2502,
+  2505, 2506, 2507, 2509, 2510, 2512, 2513, 2514,
+  2516, 2518, 2519, 2520, 2521, 2522, 2523, 2526,
+  2531, 2536, 2541, 2546, 2549, 2554, 2559, 2561,
+  2563, 2565, 2567, 2568, 2569, 2571, 2573, 2575,
+  2577, 2579, 2581, 2583, 2584, 2585, 2586, 2587,
+  2588, 2589, 2594, 2599, 2600, 2601, 2602, 2603,
+  2604, 2605, 2606, 2607, 2608, 2609, 2610, 2611,
+  2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619,
+  2620, 2621, 2622, 2623, 2624, 2625, 2626, 2627,
+  2628, 2629, 2630, 2631, 2632, 2633, 2634, 2635,
+  2636, 2637, 2638, 2639, 2640, 2641, 2642, 2643,
+  2644, 2645, 2646, 2647, 2648, 2649, 2650, 2651,
+  2652, 2653, 2654, 2655, 2656, 2657, 2658, 2659,
+  2660, 2661, 2662, 2663, 2664, 2665, 2666, 2667,
+  2668, 2669, 2670, 2671, 2672, 2673, 2674, 2675,
+  2676, 2677, 2678, 2679, 2680, 2681, 2682, 2683,
+  2684, 2685, 2686, 2687, 2688, 2689, 2690, 2691,
+  2692, 2693, 2694, 2695, 2696, 2697, 2698, 2699,
+  2700, 2701, 2702, 2703, 2704, 2705, 2706, 2707,
+  2708, 2709, 2710, 2711, 2712, 2713, 2714, 2715,
+  2716, 2717, 2718, 2719, 2720, 2721, 2722, 2723,
+  2724, 2725, 2726, 2727, 2728, 2729, 2730, 2731,
+  2732, 2733, 2734, 2735, 2736, 2737, 2738, 2739,
+  2740, 2741, 2742, 2743, 2744, 2745, 2746, 2747,
+  2748, 2749, 2750, 2751, 2752, 2753, 2754, 2755,
+  2756, 2757, 2758, 2759, 2760, 2761, 2762, 2763,
+  2764, 2765, 2766, 2767, 2768, 2769, 2770, 2771,
+  2772, 2773, 2774, 2775, 2776, 2777, 2778, 2779,
+  2780, 2781, 2782, 2783, 2784, 2785, 2786, 2787,
+  2788, 2789, 2790, 2791, 2792, 2793, 2794, 2795,
+  2796, 2797, 2798, 2799, 2800, 2802, 2804, 2805,
+  2806, 2807, 2808, 2809, 2810, 2811, 2812, 2813,
+  2814, 2815, 2816, 2817, 2818, 2819, 2820, 2821,
+  2822, 2823, 2824, 2825, 2826, 2827, 2828, 2829,
+  2830, 2831, 2832, 2834, 2836, 2838, 2840, 2841,
+  2842, 2843, 2844, 2845, 2846, 2847, 2848, 2849,
+  2850, 2851, 2852, 2853, 2855, 2856, 2857, 2858,
+  2859, 2860, 2861, 2862, 2863, 2864, 2865, 2866,
+  2867, 2868, 2869, 2870, 2871, 2872, 2873, 2874,
+  2875, 2876, 2877, 2878, 2879, 2880, 2881, 2882,
+  2883, 2884, 2885, 2886, 2887, 2888, 2889, 2890,
+  2891, 2892, 2893, 2894, 2895, 2896, 2897, 2898,
+  2899, 2900, 2902, 2904, 2905, 2906, 2908, 2909,
+  2911, 2913, 2914, 2915, 2917, 2919, 2920, 2921,
+  2922, 2923, 2924, 2925, 2926, 2927, 2928, 2929,
+  2930, 2931, 2932, 2933, 2934, 2935, 2936, 2937,
+  2940, 2943, 2944, 2945, 2946, 2947, 2948, 2949,
+  2951, 2953, 2955, 2956, 2957, 2959, 2961, 2963,
+  2965, 2969, 2971, 2973, 2974, 2975, 2976, 2977,
+  2978, 2979, 2980, 2981, 2982, 2983, 2984, 2985,
+  2986, 2987, 2988, 2989, 2990, 2991, 2994, 2997,
+  2998, 2999, 3000, 3001, 3002, 3003, 3004, 3005,
+  3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013,
+  3014, 3015, 3016, 3017, 3018, 3019, 3020, 3021,
+  3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029,
+  3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037,
+  3038, 3039, 3040, 3041, 3042, 3043, 3044, 3045,
+  3046, 3047, 3048, 3049, 3050, 3051, 3054, 3056,
+  3059, 3062, 3064, 3067, 3070, 3073, 3076, 3077,
+  3080, 3081, 3082, 3083, 3084, 3085, 3089, 3091,
+  3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101,
+  3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109,
+  3110, 3111, 3112, 3113, 3114, 3115, 3116, 3117,
+  3118, 3119, 3120, 3121, 3122, 3123, 3124, 3125,
+  3126, 3127, 3128, 3129, 3130, 3131, 3132, 3133,
+  3134, 3135, 3136, 3137, 3138, 3139, 3140, 3141,
+  3142, 3143, 3144, 3145, 3146, 3147, 3148, 3149,
+  3151, 3152, 3153, 3154, 3155, 3156, 3157, 3158,
+  3159, 3160, 3161, 3162, 3163, 3164, 3165, 3166,
+  3167, 3168, 3169, 3170, 3171, 3172, 3173, 3174,
+  3175, 3176, 3177, 3178, 3179, 3180, 3181, 3182,
+  3183, 3184, 3185, 3186, 3187, 3188, 3189, 3190,
+  3193, 3196, 3199, 3202, 3205, 3208, 3211, 3214,
+  3217, 3220, 3223, 3226, 3229, 3232, 3235, 3236,
+  3237, 3238, 3239, 3241, 3242, 3243, 3244, 3245,
+  3246, 3247, 3248, 3249, 3250, 3251, 3252, 3253,
+  3254, 3255, 3256, 3257, 3258, 3259, 3260, 3261,
+  3262, 3263, 3264, 3265, 3266, 3267, 3268, 3269,
+  3270, 3271, 3272, 3273, 3274, 3275, 3276, 3277,
+  3278, 3279, 3280, 3281, 3282, 3283, 3284, 3285,
+  3286, 3287, 3288, 3289, 3290, 3291, 3292, 3293,
+  3294, 3295, 3296, 3297, 3298, 3299, 3300, 3301,
+  3302, 3305, 3308, 3309, 3310, 3311, 3312, 3313,
+  3314, 3315, 3316, 3317, 3318, 3319, 3320, 3321,
+  3322, 3323, 3324, 3325, 3326, 3327, 3328, 3329,
+  3330, 3331, 3332, 3333, 3334, 3335, 3336, 3337,
+  3338, 3339, 3340, 3341, 3342, 3343, 3344, 3345,
+  3346, 3347, 3348, 3349, 3350, 3351, 3352, 3353,
+  3354, 3355, 3356, 3357, 3358, 3359, 3360, 3361,
+  3362, 3363, 3364, 3365, 3366, 3367, 3368, 3369,
+  3370, 3373, 3376, 3379, 3380, 3381, 3382, 3383,
+  3384, 3385, 3386, 3387, 3388, 3389, 3390, 3391,
+  3392, 3393, 3394, 3395, 3398, 3401, 3402, 3403,
+  3406, 3407, 3408, 3409, 3410, 3413, 3416, 3419,
+  3420, 3421, 3422, 3423, 3424, 3425, 3426, 3427,
+  3428, 3429, 3431, 3433, 3434, 3435, 3436, 3437,
+  3438, 3439, 3440, 3441, 3442, 3443, 3444, 3445,
+  3446, 3447, 3448, 3449, 3450, 3451, 3452, 3453,
+  3454, 3455, 3456, 3457, 3458, 3460, 3462, 3463,
+  3464, 3465, 3466, 3467, 3468, 3469, 3470, 3471,
+  3472, 3473, 3474, 3475, 3476, 3477, 3478, 3479,
+  3480, 3481, 3482, 3483, 3484, 3485, 3486, 3487,
+  3489, 3491, 3493, 3495, 3496, 3497, 3498, 3499,
+  3500, 3501, 3502, 3503, 3504, 3505, 3506, 3507,
+  3508, 3509, 3510, 3512, 3513, 3515, 3518, 3520,
+  3521, 3522, 3524, 3526, 3527, 3528, 3529, 3530,
+  3531, 3532, 3534, 3536, 3538, 3540, 3541, 3542,
+  3543, 3544, 3545, 3546, 3547, 3548, 3549, 3551,
+  3553, 3554, 3556, 3558, 3559, 3564, 3566, 3568,
+  3569, 3570, 3571, 3572, 3573, 3574, 3575, 3577,
+  3579, 3580, 3581, 3582, 3584, 3587, 3590, 3593,
+  3595, 3596, 3597, 3598, 3599, 3600, 3601, 3602,
+  3603, 3604, 3605, 3606, 3607, 3608, 3609, 3610,
+  3611, 3612, 3613, 3614, 3615, 3617, 3619, 3621,
+  3623, 3625, 3627, 3629, 3631, 3633, 3635, 3636,
+  3637, 3638, 3639, 3640, 3641, 3642, 3643, 3644,
+  3645, 3646, 3647, 3648, 3649, 3650, 3651, 3652,
+  3653, 3654, 3655, 3656, 3657, 3658, 3659, 3660,
+  3661, 3662, 3663, 3664, 3665, 3666, 3667, 3668,
+  3669, 3670, 3671, 3672, 3673, 3674, 3675, 3676,
+  3677, 3678, 3679, 3680, 3681, 3682, 3683, 3684,
+  3685, 3686, 3687, 3688, 3689, 3690, 3691, 3692,
+  3693, 3694, 3695, 3696, 3697, 3698, 3699, 3700,
+  3701, 3702, 3703, 3704, 3705, 3706, 3707, 3708,
+  3709, 3710, 3711, 3712, 3713, 3714, 3715, 3716,
+  3717, 3718, 3719, 3720, 3721, 3722, 3723, 3724,
+  3725, 3726, 3727, 3728, 3729, 3730, 3731, 3732,
+  3733, 3734, 3735, 3736, 3737, 3738, 3739, 3740,
+  3741, 3742, 3743, 3744, 3745, 3746, 3747, 3750,
+  3751, 3752, 3755, 3756, 3757, 3759, 3760, 3761,
+  3762, 3764, 3765, 3766, 3767, 3769, 3770, 3771,
+  3772, 3775, 3776, 3777, 3778, 3779, 3782, 3785,
+  3788, 3791, 3794, 3795, 3796, 3797, 3798, 3800,
+  3802, 3803, 3804, 3805, 3808, 3811, 3814, 3817,
+  3820, 3821, 3822, 3823, 3825, 3826, 3827, 3828,
+  3830, 3831, 3832, 3833, 3834, 3835, 3836, 3837,
+  3838, 3839, 3840, 3841, 3842, 3843, 3844, 3845,
+  3846, 3847, 3848, 3849, 3850, 3851, 3852, 3853,
+  3854, 3855, 3856, 3857, 3858, 3859, 3860, 3861,
+  3862, 3863, 3864, 3865, 3866, 3867, 3868, 3869,
+  3871, 3873, 3875, 3877, 3879, 3880, 3881, 3884,
+  3887, 3888, 3889, 3890, 3891
 };
 
 /* i386 mnemonics table.  */