x86/APX: Remove KEYLOCKER and SHA promotions from EVEX MAP4

APX spec removed KEYLOCKER and SHA promotions from EVEX MAP4.
https://www.intel.com/content/www/us/en/developer/articles/technical/advanced-performance-extensions-apx.html

gas/ChangeLog:

        * NEWS: Mention that remove KEYLOCKER and SHA promotions from EVEX
	* MAP4.
        * config/tc-i386.c (process_operands): Removed special handling of
	* KEYLOCKER and SHA.
        * testsuite/gas/i386/x86-64-apx-egpr-promote-inval.l: Removed KEYLOCKER
        * and SHA instructions.
        * testsuite/gas/i386/x86-64-apx-egpr-promote-inval.s: Ditto.
        * testsuite/gas/i386/x86-64-apx-evex-promoted-bad.d: Ditto.
        * testsuite/gas/i386/x86-64-apx-evex-promoted-bad.s: Ditto.
        * testsuite/gas/i386/x86-64-apx-evex-promoted-intel.d: Ditto.
        * testsuite/gas/i386/x86-64-apx-evex-promoted-wig.d: Ditto.
        * testsuite/gas/i386/x86-64-apx-evex-promoted.d: Ditto.
        * testsuite/gas/i386/x86-64-apx-evex-promoted.s: Ditto.

opcodes/ChangeLog:

        * i386-dis-evex-prefix.h: Removed KEYLOCKER and SHA instructions.
        * i386-dis-evex.h: Ditto.
        * i386-opc.tbl: Ditto.
        * i386-dis.c (print_vector_reg): Removed special handling of KEYLOCKER
	*  and SHA.

diff --git a/gas/NEWS b/gas/NEWS
index f48edd4b8c3024572a6acece0454b14fd2d69f2d..d130d08b7dac9268e06694b469a960c53292cccc 100644 (file)
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -1,5 +1,7 @@
 -*- text -*-
 
+* Remove KEYLOCKER and SHA promotions from EVEX MAP4.
+
 * References to FB and dollar labels, when supported, are no longer permitted
   in a radix other than 10.  (Note that definitions of such labels were already
   thus restricted, except that leading zeroes were permitted.)

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 7467cef18cdf796e3c9b9b9cc5a5de42da842076..b022efa4f6f2baae160976b1b83a9c84932650be 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -10015,13 +10015,6 @@ process_operands (void)
   for (unsigned int j = 0; j < i.operands; j++)
     if (i.types[j].bitfield.instance != InstanceNone)
       i.reg_operands--;
-    else if (i.tm.opcode_space == SPACE_EVEXMAP4
-            && i.types[j].bitfield.class == RegSIMD
-            && (i.op[j].regs->reg_flags & RegVRex)
-            && !dot_insn ())
-      /* Just raise an error, but continue processing.  */
-      as_bad (_("`%s%s' cannot be used with `%s'"),
-             register_prefix, i.op[j].regs->reg_name, insn_name (&i.tm));
 
   if (i.tm.opcode_modifier.sse2avx)
     {

diff --git a/gas/testsuite/gas/i386/x86-64-apx-egpr-promote-inval.l b/gas/testsuite/gas/i386/x86-64-apx-egpr-promote-inval.l
index 547b98f5778303a90811b7b1ff9e5467b35cc2b4..6f06df919056aaa937ad880fcb55321e50db48b0 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-apx-egpr-promote-inval.l
+++ b/gas/testsuite/gas/i386/x86-64-apx-egpr-promote-inval.l
@@ -13,16 +13,13 @@
 .*:25: Error: `andn' is not supported on `x86_64.nobmi'
 .*:28: Error: `bzhi' is not supported on `x86_64.nobmi2'
 .*:29: Error: `bzhi' is not supported on `x86_64.nobmi2'
-.*:32: Error: .*`%?xmm20'.*`aesenc128kl'.*
-.*:33: Error: .*`%?xmm20'.*`sha1msg1'.*
-.*:34: Error: .*`%?xmm20'.*`sha256msg2'.*
-.*:37: Error: .*`andn'.*
-.*:38: Error: .*`bzhi'.*
-.*:39: Error: .*`kmovw'.*
-.*:40: Error: .*`kmovq'.*
-.*:41: Error: .*`kmovb'.*
-.*:42: Error: .*`ldtilecfg'.*
-.*:43: Error: .*`cmpexadd'.*
+.*:33: Error: .*`andn'.*
+.*:34: Error: .*`bzhi'.*
+.*:35: Error: .*`kmovw'.*
+.*:36: Error: .*`kmovq'.*
+.*:37: Error: .*`kmovb'.*
+.*:38: Error: .*`ldtilecfg'.*
+.*:39: Error: .*`cmpexadd'.*
 GAS LISTING .*
 #...
 [      ]*1[    ]+\# Check illegal 64bit APX EVEX promoted instructions

diff --git a/gas/testsuite/gas/i386/x86-64-apx-egpr-promote-inval.s b/gas/testsuite/gas/i386/x86-64-apx-egpr-promote-inval.s
index 8065b1a9710cb5296f43838fa94c3bf02d1869e1..5e4e08fa2fdedefeb1e6a7eae73e150dd7b475c9 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-apx-egpr-promote-inval.s
+++ b/gas/testsuite/gas/i386/x86-64-apx-egpr-promote-inval.s
@@ -29,10 +29,6 @@
        bzhi %r15,%r15,%r11
 
        .arch default
-       aesenc128kl (%rax), %xmm20
-       sha1msg1 %xmm20, %xmm0
-       sha256msg2 (%rax), %xmm20
-
        .arch .noapx_f
        {evex} andn %r15, %r15, %r11
        {evex} bzhi %r15, %r15, %r11

diff --git a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.d b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.d
index 5f96df95a35777c58cbe54ec42a4a093a1411993..c0ee62185610a149e6582fdc1a7165dcbc41fdb2 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.d
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.d
@@ -40,7 +40,4 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:[   ]+62 74 7c 18 8f c0[    ]+pop2   %rax,\(bad\)
 [      ]*[a-f0-9]+:[   ]+62 d4 24 18 8f[       ]+\(bad\)
 [      ]*[a-f0-9]+:[   ]+c3[   ]+.*
-[      ]*[a-f0-9]+:[   ]+62 e4 7e 08 dc 20[    ]+aesenc128kl \(%rax\),%xmm20\(bad\)
-[      ]*[a-f0-9]+:[   ]+62 b4 7c 08 d9 c4[    ]+sha1msg1 %xmm20\(bad\),%xmm0
-[      ]*[a-f0-9]+:[   ]+62 e4 7c 08 d9 20[    ]+sha1msg1 \(%rax\),%xmm20\(bad\)
 #pass

diff --git a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.s b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.s
index 668e4a29f06a066bad0530ede97fc15739c3ace3..10ec4d618a5bda34cd703d6c8ff0f1653878c36b 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.s
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.s
@@ -48,12 +48,3 @@ _start:
 
        # pop2 %r11, %r11
        .insn EVEX.L0.NP.M4.W0 0x8f/0, {sae}, %xmm11, %xmm11
-
-       # aesenc128kl (%rax), %xmm20
-       .insn EVEX.L0.F3.M4.W0 0xdc, (%rax), %xmm20
-
-       # sha1msg1 %xmm20, %xmm0
-       .insn EVEX.L0.NP.M4.W0 0xd9, %xmm20, %xmm0
-
-       # sha1msg1 (%rax), %xmm20
-       .insn EVEX.L0.NP.M4.W0 0xd9, (%rax), %xmm20

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 9c88880191b7b6b2cccf8671bb33ebfb2216596d..d049c099daf45728ed23029e28084ad63b88da12 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-intel.d
@@ -12,14 +12,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 4c fc 08 fc bc 87 23 01 00 00[     ]+aadd[         ]+QWORD PTR \[r31\+rax\*4\+0x123\],r31
 [       ]*[a-f0-9]+:[   ]*62 4c 7d 08 fc 8c 87 23 01 00 00[     ]+aand[         ]+DWORD PTR \[r31\+rax\*4\+0x123\],r25d
 [       ]*[a-f0-9]+:[   ]*62 4c fd 08 fc bc 87 23 01 00 00[     ]+aand[         ]+QWORD PTR \[r31\+rax\*4\+0x123\],r31
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 dd a4 87 23 01 00 00[     ]+aesdec128kl xmm12,\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 df a4 87 23 01 00 00[     ]+aesdec256kl xmm12,\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 8c 87 23 01 00 00[     ]+aesdecwide128kl[      ]+\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 9c 87 23 01 00 00[     ]+aesdecwide256kl[      ]+\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 dc a4 87 23 01 00 00[     ]+aesenc128kl xmm12,\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 de a4 87 23 01 00 00[     ]+aesenc256kl xmm12,\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 84 87 23 01 00 00[     ]+aesencwide128kl[      ]+\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 94 87 23 01 00 00[     ]+aesencwide256kl[      ]+\[r31\+rax\*4\+0x123\]
 [       ]*[a-f0-9]+:[   ]*62 4c 7f 08 fc 8c 87 23 01 00 00[     ]+aor[  ]+DWORD PTR \[r31\+rax\*4\+0x123\],r25d
 [       ]*[a-f0-9]+:[   ]*62 4c ff 08 fc bc 87 23 01 00 00[     ]+aor[  ]+QWORD PTR \[r31\+rax\*4\+0x123\],r31
 [       ]*[a-f0-9]+:[   ]*62 4c 7e 08 fc 8c 87 23 01 00 00[     ]+axor[         ]+DWORD PTR \[r31\+rax\*4\+0x123\],r25d
@@ -84,8 +76,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 ef[    ]+crc32[        ]+r21d,r31w
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 2f[    ]+crc32[        ]+r21d,WORD PTR \[r31\]
 [       ]*[a-f0-9]+:[   ]*62 e4 fc 08 f1 d0[    ]+crc32[        ]+r18,rax
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 da d1[    ]+encodekey128[         ]+edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 db d1[    ]+encodekey256[         ]+edx,r25d
 [       ]*[a-f0-9]+:[   ]*67 62 4c 7f 08 f8 8c 87 23 01 00 00[  ]+enqcmd[       ]+r25d,\[r31d\+eax\*4\+0x123\]
 [       ]*[a-f0-9]+:[   ]*62 4c 7f 08 f8 bc 87 23 01 00 00[     ]+enqcmd[       ]+r31,\[r31\+rax\*4\+0x123\]
 [       ]*[a-f0-9]+:[   ]*67 62 4c 7e 08 f8 8c 87 23 01 00 00[  ]+enqcmds[      ]+r25d,\[r31d\+eax\*4\+0x123\]
@@ -133,13 +123,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 86 08 f5 df[    ]+pext[         ]+r11,r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 36 00 f5 94 87 23 01 00 00[     ]+pext[         ]+edx,r25d,DWORD PTR \[r31\+rax\*4\+0x123\]
 [       ]*[a-f0-9]+:[   ]*62 5a 86 00 f5 bc 87 23 01 00 00[     ]+pext[         ]+r15,r31,QWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d9 a4 87 23 01 00 00[     ]+sha1msg1 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 da a4 87 23 01 00 00[     ]+sha1msg2 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d8 a4 87 23 01 00 00[     ]+sha1nexte xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d4 a4 87 23 01 00 00 7b[  ]+sha1rnds4 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\],0x7b
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 dc a4 87 23 01 00 00[     ]+sha256msg1 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 dd a4 87 23 01 00 00[     ]+sha256msg2 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 db a4 87 23 01 00 00[     ]+sha256rnds2 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\],xmm0
 [       ]*[a-f0-9]+:[   ]*62 72 35 00 f7 d2[    ]+shlx[         ]+r10d,edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 f7 94 87 23 01 00 00[     ]+shlx[         ]+edx,DWORD PTR \[r31\+rax\*4\+0x123\],r25d
 [       ]*[a-f0-9]+:[   ]*62 52 85 00 f7 df[    ]+shlx[         ]+r11,r15,r31
@@ -170,14 +153,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 4c fc 08 fc bc 87 23 01 00 00[     ]+aadd[         ]+QWORD PTR \[r31\+rax\*4\+0x123\],r31
 [       ]*[a-f0-9]+:[   ]*62 4c 7d 08 fc 8c 87 23 01 00 00[     ]+aand[         ]+DWORD PTR \[r31\+rax\*4\+0x123\],r25d
 [       ]*[a-f0-9]+:[   ]*62 4c fd 08 fc bc 87 23 01 00 00[     ]+aand[         ]+QWORD PTR \[r31\+rax\*4\+0x123\],r31
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 dd a4 87 23 01 00 00[     ]+aesdec128kl xmm12,\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 df a4 87 23 01 00 00[     ]+aesdec256kl xmm12,\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 8c 87 23 01 00 00[     ]+aesdecwide128kl[      ]+\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 9c 87 23 01 00 00[     ]+aesdecwide256kl[      ]+\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 dc a4 87 23 01 00 00[     ]+aesenc128kl xmm12,\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 de a4 87 23 01 00 00[     ]+aesenc256kl xmm12,\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 84 87 23 01 00 00[     ]+aesencwide128kl[      ]+\[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 94 87 23 01 00 00[     ]+aesencwide256kl[      ]+\[r31\+rax\*4\+0x123\]
 [       ]*[a-f0-9]+:[   ]*62 4c 7f 08 fc 8c 87 23 01 00 00[     ]+aor[  ]+DWORD PTR \[r31\+rax\*4\+0x123\],r25d
 [       ]*[a-f0-9]+:[   ]*62 4c ff 08 fc bc 87 23 01 00 00[     ]+aor[  ]+QWORD PTR \[r31\+rax\*4\+0x123\],r31
 [       ]*[a-f0-9]+:[   ]*62 4c 7e 08 fc 8c 87 23 01 00 00[     ]+axor[         ]+DWORD PTR \[r31\+rax\*4\+0x123\],r25d
@@ -242,8 +217,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 ef[    ]+crc32[        ]+r21d,r31w
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 2f[    ]+crc32[        ]+r21d,WORD PTR \[r31\]
 [       ]*[a-f0-9]+:[   ]*62 e4 fc 08 f1 d0[    ]+crc32[        ]+r18,rax
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 da d1[    ]+encodekey128[         ]+edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 db d1[    ]+encodekey256[         ]+edx,r25d
 [       ]*[a-f0-9]+:[   ]*67 62 4c 7f 08 f8 8c 87 23 01 00 00[  ]+enqcmd[       ]+r25d,\[r31d\+eax\*4\+0x123\]
 [       ]*[a-f0-9]+:[   ]*62 4c 7f 08 f8 bc 87 23 01 00 00[     ]+enqcmd[       ]+r31,\[r31\+rax\*4\+0x123\]
 [       ]*[a-f0-9]+:[   ]*67 62 4c 7e 08 f8 8c 87 23 01 00 00[  ]+enqcmds[      ]+r25d,\[r31d\+eax\*4\+0x123\]
@@ -291,13 +264,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 86 08 f5 df[    ]+pext[         ]+r11,r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 36 00 f5 94 87 23 01 00 00[     ]+pext[         ]+edx,r25d,DWORD PTR \[r31\+rax\*4\+0x123\]
 [       ]*[a-f0-9]+:[   ]*62 5a 86 00 f5 bc 87 23 01 00 00[     ]+pext[         ]+r15,r31,QWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d9 a4 87 23 01 00 00[     ]+sha1msg1 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 da a4 87 23 01 00 00[     ]+sha1msg2 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d8 a4 87 23 01 00 00[     ]+sha1nexte xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d4 a4 87 23 01 00 00 7b[  ]+sha1rnds4 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\],0x7b
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 dc a4 87 23 01 00 00[     ]+sha256msg1 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 dd a4 87 23 01 00 00[     ]+sha256msg2 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\]
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 db a4 87 23 01 00 00[     ]+sha256rnds2 xmm12,XMMWORD PTR \[r31\+rax\*4\+0x123\],xmm0
 [       ]*[a-f0-9]+:[   ]*62 72 35 00 f7 d2[    ]+shlx[         ]+r10d,edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 f7 94 87 23 01 00 00[     ]+shlx[         ]+edx,DWORD PTR \[r31\+rax\*4\+0x123\],r25d
 [       ]*[a-f0-9]+:[   ]*62 52 85 00 f7 df[    ]+shlx[         ]+r11,r15,r31

diff --git a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-wig.d b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-wig.d
index db6860f30a6c0755b9cc51b7fcf1730434ee1eef..9237c34c0be0bfcd2e555746ffeb70f4b39bf211 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-wig.d
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-wig.d
@@ -12,14 +12,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 4c fc 08 fc bc 87 23 01 00 00[     ]+aadd[         ]+%r31,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7d 08 fc 8c 87 23 01 00 00[     ]+aand[         ]+%r25d,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c fd 08 fc bc 87 23 01 00 00[     ]+aand[         ]+%r31,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5c .e 08 dd a4 87 23 01 00 00[     ]+aesdec128kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .e 08 df a4 87 23 01 00 00[     ]+aesdec256kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 d8 8c 87 23 01 00 00[     ]+aesdecwide128kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 d8 9c 87 23 01 00 00[     ]+aesdecwide256kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5c .e 08 dc a4 87 23 01 00 00[     ]+aesenc128kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .e 08 de a4 87 23 01 00 00[     ]+aesenc256kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 d8 84 87 23 01 00 00[     ]+aesencwide128kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 d8 94 87 23 01 00 00[     ]+aesencwide256kl[      ]+0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7f 08 fc 8c 87 23 01 00 00[     ]+aor[  ]+%r25d,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c ff 08 fc bc 87 23 01 00 00[     ]+aor[  ]+%r31,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7e 08 fc 8c 87 23 01 00 00[     ]+axor[         ]+%r25d,0x123\(%r31,%rax,4\)
@@ -84,8 +76,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 ef[    ]+crc32  %r31w,%r21d
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 2f[    ]+crc32w \(%r31\),%r21d
 [       ]*[a-f0-9]+:[   ]*62 e4 fc 08 f1 d0[    ]+crc32  %rax,%r18
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 da d1[    ]+encodekey128[         ]+%r25d,%edx
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 db d1[    ]+encodekey256[         ]+%r25d,%edx
 [       ]*[a-f0-9]+:[   ]*67 62 .c 7f 08 f8 8c 87 23 01 00 00[  ]+enqcmd[       ]+0x123\(%r31d,%eax,4\),%r25d
 [       ]*[a-f0-9]+:[   ]*62 4c .f 08 f8 bc 87 23 01 00 00[     ]+enqcmd[       ]+0x123\(%r31,%rax,4\),%r31
 [       ]*[a-f0-9]+:[   ]*67 62 .c 7e 08 f8 8c 87 23 01 00 00[  ]+enqcmds[      ]+0x123\(%r31d,%eax,4\),%r25d
@@ -133,13 +123,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 86 08 f5 df[    ]+pext[         ]+%r31,%r15,%r11
 [       ]*[a-f0-9]+:[   ]*62 da 36 00 f5 94 87 23 01 00 00[     ]+pext[         ]+0x123\(%r31,%rax,4\),%r25d,%edx
 [       ]*[a-f0-9]+:[   ]*62 5a 86 00 f5 bc 87 23 01 00 00[     ]+pext[         ]+0x123\(%r31,%rax,4\),%r31,%r15
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 d9 a4 87 23 01 00 00[     ]+sha1msg1[     ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 da a4 87 23 01 00 00[     ]+sha1msg2[     ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 d8 a4 87 23 01 00 00[     ]+sha1nexte[    ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 d4 a4 87 23 01 00 00 7b[  ]+sha1rnds4[    ]+\$0x7b,0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 dc a4 87 23 01 00 00[     ]+sha256msg1[   ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 dd a4 87 23 01 00 00[     ]+sha256msg2[   ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 db a4 87 23 01 00 00[     ]+sha256rnds2[  ]+%xmm0,0x123\(%r31,%rax,4\),%xmm12
 [       ]*[a-f0-9]+:[   ]*62 72 35 00 f7 d2[    ]+shlx[         ]+%r25d,%edx,%r10d
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 f7 94 87 23 01 00 00[     ]+shlx[         ]+%r25d,0x123\(%r31,%rax,4\),%edx
 [       ]*[a-f0-9]+:[   ]*62 52 85 00 f7 df[    ]+shlx[         ]+%r31,%r15,%r11
@@ -170,14 +153,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 4c fc 08 fc bc 87 23 01 00 00[     ]+aadd[         ]+%r31,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7d 08 fc 8c 87 23 01 00 00[     ]+aand[         ]+%r25d,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c fd 08 fc bc 87 23 01 00 00[     ]+aand[         ]+%r31,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5c .e 08 dd a4 87 23 01 00 00[     ]+aesdec128kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .e 08 df a4 87 23 01 00 00[     ]+aesdec256kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 d8 8c 87 23 01 00 00[     ]+aesdecwide128kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 d8 9c 87 23 01 00 00[     ]+aesdecwide256kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5c .e 08 dc a4 87 23 01 00 00[     ]+aesenc128kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .e 08 de a4 87 23 01 00 00[     ]+aesenc256kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 d8 84 87 23 01 00 00[     ]+aesencwide128kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 d8 94 87 23 01 00 00[     ]+aesencwide256kl[      ]+0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7f 08 fc 8c 87 23 01 00 00[     ]+aor[  ]+%r25d,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c ff 08 fc bc 87 23 01 00 00[     ]+aor[  ]+%r31,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7e 08 fc 8c 87 23 01 00 00[     ]+axor[         ]+%r25d,0x123\(%r31,%rax,4\)
@@ -242,8 +217,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 ef[    ]+crc32  %r31w,%r21d
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 2f[    ]+crc32w \(%r31\),%r21d
 [       ]*[a-f0-9]+:[   ]*62 e4 fc 08 f1 d0[    ]+crc32  %rax,%r18
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 da d1[    ]+encodekey128[         ]+%r25d,%edx
-[       ]*[a-f0-9]+:[   ]*62 dc .e 08 db d1[    ]+encodekey256[         ]+%r25d,%edx
 [       ]*[a-f0-9]+:[   ]*67 62 .c 7f 08 f8 8c 87 23 01 00 00[  ]+enqcmd[       ]+0x123\(%r31d,%eax,4\),%r25d
 [       ]*[a-f0-9]+:[   ]*62 4c .f 08 f8 bc 87 23 01 00 00[     ]+enqcmd[       ]+0x123\(%r31,%rax,4\),%r31
 [       ]*[a-f0-9]+:[   ]*67 62 .c 7e 08 f8 8c 87 23 01 00 00[  ]+enqcmds[      ]+0x123\(%r31d,%eax,4\),%r25d
@@ -291,13 +264,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 86 08 f5 df[    ]+pext[         ]+%r31,%r15,%r11
 [       ]*[a-f0-9]+:[   ]*62 da 36 00 f5 94 87 23 01 00 00[     ]+pext[         ]+0x123\(%r31,%rax,4\),%r25d,%edx
 [       ]*[a-f0-9]+:[   ]*62 5a 86 00 f5 bc 87 23 01 00 00[     ]+pext[         ]+0x123\(%r31,%rax,4\),%r31,%r15
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 d9 a4 87 23 01 00 00[     ]+sha1msg1[     ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 da a4 87 23 01 00 00[     ]+sha1msg2[     ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 d8 a4 87 23 01 00 00[     ]+sha1nexte[    ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 d4 a4 87 23 01 00 00 7b[  ]+sha1rnds4[    ]+\$0x7b,0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 dc a4 87 23 01 00 00[     ]+sha256msg1[   ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 dd a4 87 23 01 00 00[     ]+sha256msg2[   ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c .c 08 db a4 87 23 01 00 00[     ]+sha256rnds2[  ]+%xmm0,0x123\(%r31,%rax,4\),%xmm12
 [       ]*[a-f0-9]+:[   ]*62 72 35 00 f7 d2[    ]+shlx[         ]+%r25d,%edx,%r10d
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 f7 94 87 23 01 00 00[     ]+shlx[         ]+%r25d,0x123\(%r31,%rax,4\),%edx
 [       ]*[a-f0-9]+:[   ]*62 52 85 00 f7 df[    ]+shlx[         ]+%r31,%r15,%r11

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 3a9d712a3468704e6e351dbfb831ff380e5439f0..9b103f569c04b7d1f81b70ff18a7502e6d302a38 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d
@@ -12,14 +12,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 4c fc 08 fc bc 87 23 01 00 00[     ]+aadd[         ]+%r31,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7d 08 fc 8c 87 23 01 00 00[     ]+aand[         ]+%r25d,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c fd 08 fc bc 87 23 01 00 00[     ]+aand[         ]+%r31,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 dd a4 87 23 01 00 00[     ]+aesdec128kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 df a4 87 23 01 00 00[     ]+aesdec256kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 8c 87 23 01 00 00[     ]+aesdecwide128kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 9c 87 23 01 00 00[     ]+aesdecwide256kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 dc a4 87 23 01 00 00[     ]+aesenc128kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 de a4 87 23 01 00 00[     ]+aesenc256kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 84 87 23 01 00 00[     ]+aesencwide128kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 94 87 23 01 00 00[     ]+aesencwide256kl[      ]+0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7f 08 fc 8c 87 23 01 00 00[     ]+aor[  ]+%r25d,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c ff 08 fc bc 87 23 01 00 00[     ]+aor[  ]+%r31,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7e 08 fc 8c 87 23 01 00 00[     ]+axor[         ]+%r25d,0x123\(%r31,%rax,4\)
@@ -84,8 +76,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 ef[    ]+crc32  %r31w,%r21d
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 2f[    ]+crc32w \(%r31\),%r21d
 [       ]*[a-f0-9]+:[   ]*62 e4 fc 08 f1 d0[    ]+crc32  %rax,%r18
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 da d1[    ]+encodekey128[         ]+%r25d,%edx
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 db d1[    ]+encodekey256[         ]+%r25d,%edx
 [       ]*[a-f0-9]+:[   ]*67 62 4c 7f 08 f8 8c 87 23 01 00 00[  ]+enqcmd[       ]+0x123\(%r31d,%eax,4\),%r25d
 [       ]*[a-f0-9]+:[   ]*62 4c 7f 08 f8 bc 87 23 01 00 00[     ]+enqcmd[       ]+0x123\(%r31,%rax,4\),%r31
 [       ]*[a-f0-9]+:[   ]*67 62 4c 7e 08 f8 8c 87 23 01 00 00[  ]+enqcmds[      ]+0x123\(%r31d,%eax,4\),%r25d
@@ -133,13 +123,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 86 08 f5 df[    ]+pext[         ]+%r31,%r15,%r11
 [       ]*[a-f0-9]+:[   ]*62 da 36 00 f5 94 87 23 01 00 00[     ]+pext[         ]+0x123\(%r31,%rax,4\),%r25d,%edx
 [       ]*[a-f0-9]+:[   ]*62 5a 86 00 f5 bc 87 23 01 00 00[     ]+pext[         ]+0x123\(%r31,%rax,4\),%r31,%r15
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d9 a4 87 23 01 00 00[     ]+sha1msg1[     ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 da a4 87 23 01 00 00[     ]+sha1msg2[     ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d8 a4 87 23 01 00 00[     ]+sha1nexte[    ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d4 a4 87 23 01 00 00 7b[  ]+sha1rnds4[    ]+\$0x7b,0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 dc a4 87 23 01 00 00[     ]+sha256msg1[   ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 dd a4 87 23 01 00 00[     ]+sha256msg2[   ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 db a4 87 23 01 00 00[     ]+sha256rnds2[  ]+%xmm0,0x123\(%r31,%rax,4\),%xmm12
 [       ]*[a-f0-9]+:[   ]*62 72 35 00 f7 d2[    ]+shlx[         ]+%r25d,%edx,%r10d
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 f7 94 87 23 01 00 00[     ]+shlx[         ]+%r25d,0x123\(%r31,%rax,4\),%edx
 [       ]*[a-f0-9]+:[   ]*62 52 85 00 f7 df[    ]+shlx[         ]+%r31,%r15,%r11
@@ -170,14 +153,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 4c fc 08 fc bc 87 23 01 00 00[     ]+aadd[         ]+%r31,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7d 08 fc 8c 87 23 01 00 00[     ]+aand[         ]+%r25d,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c fd 08 fc bc 87 23 01 00 00[     ]+aand[         ]+%r31,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 dd a4 87 23 01 00 00[     ]+aesdec128kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 df a4 87 23 01 00 00[     ]+aesdec256kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 8c 87 23 01 00 00[     ]+aesdecwide128kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 9c 87 23 01 00 00[     ]+aesdecwide256kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 dc a4 87 23 01 00 00[     ]+aesenc128kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7e 08 de a4 87 23 01 00 00[     ]+aesenc256kl[  ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 84 87 23 01 00 00[     ]+aesencwide128kl[      ]+0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 d8 94 87 23 01 00 00[     ]+aesencwide256kl[      ]+0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7f 08 fc 8c 87 23 01 00 00[     ]+aor[  ]+%r25d,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c ff 08 fc bc 87 23 01 00 00[     ]+aor[  ]+%r31,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 4c 7e 08 fc 8c 87 23 01 00 00[     ]+axor[         ]+%r25d,0x123\(%r31,%rax,4\)
@@ -242,8 +217,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 ef[    ]+crc32  %r31w,%r21d
 [       ]*[a-f0-9]+:[   ]*62 cc 7d 08 f1 2f[    ]+crc32w \(%r31\),%r21d
 [       ]*[a-f0-9]+:[   ]*62 e4 fc 08 f1 d0[    ]+crc32  %rax,%r18
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 da d1[    ]+encodekey128[         ]+%r25d,%edx
-[       ]*[a-f0-9]+:[   ]*62 dc 7e 08 db d1[    ]+encodekey256[         ]+%r25d,%edx
 [       ]*[a-f0-9]+:[   ]*67 62 4c 7f 08 f8 8c 87 23 01 00 00[  ]+enqcmd[       ]+0x123\(%r31d,%eax,4\),%r25d
 [       ]*[a-f0-9]+:[   ]*62 4c 7f 08 f8 bc 87 23 01 00 00[     ]+enqcmd[       ]+0x123\(%r31,%rax,4\),%r31
 [       ]*[a-f0-9]+:[   ]*67 62 4c 7e 08 f8 8c 87 23 01 00 00[  ]+enqcmds[      ]+0x123\(%r31d,%eax,4\),%r25d
@@ -291,13 +264,6 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 86 08 f5 df[    ]+pext[         ]+%r31,%r15,%r11
 [       ]*[a-f0-9]+:[   ]*62 da 36 00 f5 94 87 23 01 00 00[     ]+pext[         ]+0x123\(%r31,%rax,4\),%r25d,%edx
 [       ]*[a-f0-9]+:[   ]*62 5a 86 00 f5 bc 87 23 01 00 00[     ]+pext[         ]+0x123\(%r31,%rax,4\),%r31,%r15
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d9 a4 87 23 01 00 00[     ]+sha1msg1[     ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 da a4 87 23 01 00 00[     ]+sha1msg2[     ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d8 a4 87 23 01 00 00[     ]+sha1nexte[    ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 d4 a4 87 23 01 00 00 7b[  ]+sha1rnds4[    ]+\$0x7b,0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 dc a4 87 23 01 00 00[     ]+sha256msg1[   ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 dd a4 87 23 01 00 00[     ]+sha256msg2[   ]+0x123\(%r31,%rax,4\),%xmm12
-[       ]*[a-f0-9]+:[   ]*62 5c 7c 08 db a4 87 23 01 00 00[     ]+sha256rnds2[  ]+%xmm0,0x123\(%r31,%rax,4\),%xmm12
 [       ]*[a-f0-9]+:[   ]*62 72 35 00 f7 d2[    ]+shlx[         ]+%r25d,%edx,%r10d
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 f7 94 87 23 01 00 00[     ]+shlx[         ]+%r25d,0x123\(%r31,%rax,4\),%edx
 [       ]*[a-f0-9]+:[   ]*62 52 85 00 f7 df[    ]+shlx[         ]+%r31,%r15,%r11

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 0773dc562abd5394c1cfd548c2ae75c909f2df2d..83806782e5eab727dffceeb2f142c08da2d179b6 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.s
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.s
@@ -6,14 +6,6 @@ _start:
        aadd    %r31,0x123(%r31,%rax,4)
        aand    %r25d,0x123(%r31,%rax,4)
        aand    %r31,0x123(%r31,%rax,4)
-       aesdec128kl     0x123(%r31,%rax,4),%xmm12
-       aesdec256kl     0x123(%r31,%rax,4),%xmm12
-       aesdecwide128kl 0x123(%r31,%rax,4)
-       aesdecwide256kl 0x123(%r31,%rax,4)
-       aesenc128kl     0x123(%r31,%rax,4),%xmm12
-       aesenc256kl     0x123(%r31,%rax,4),%xmm12
-       aesencwide128kl 0x123(%r31,%rax,4)
-       aesencwide256kl 0x123(%r31,%rax,4)
        aor     %r25d,0x123(%r31,%rax,4)
        aor     %r31,0x123(%r31,%rax,4)
        axor    %r25d,0x123(%r31,%rax,4)
@@ -78,8 +70,6 @@ _start:
        crc32w  %r31w, %r21d
        crc32w  (%r31),%r21d
        crc32   %rax, %r18
-       encodekey128    %r25d,%edx
-       encodekey256    %r25d,%edx
        enqcmd  0x123(%r31d,%eax,4),%r25d
        enqcmd  0x123(%r31,%rax,4),%r31
        enqcmds 0x123(%r31d,%eax,4),%r25d
@@ -127,13 +117,6 @@ _start:
        pext    %r31,%r15,%r11
        pext    0x123(%r31,%rax,4),%r25d,%edx
        pext    0x123(%r31,%rax,4),%r31,%r15
-       sha1msg1        0x123(%r31,%rax,4),%xmm12
-       sha1msg2        0x123(%r31,%rax,4),%xmm12
-       sha1nexte       0x123(%r31,%rax,4),%xmm12
-       sha1rnds4       $0x7b,0x123(%r31,%rax,4),%xmm12
-       sha256msg1      0x123(%r31,%rax,4),%xmm12
-       sha256msg2      0x123(%r31,%rax,4),%xmm12
-       sha256rnds2     0x123(%r31,%rax,4),%xmm12
        shlx    %r25d,%edx,%r10d
        shlx    %r25d,0x123(%r31,%rax,4),%edx
        shlx    %r31,%r15,%r11
@@ -166,14 +149,6 @@ _start:
        aadd    [r31+rax*4+0x123],r31
        aand    [r31+rax*4+0x123],r25d
        aand    [r31+rax*4+0x123],r31
-       aesdec128kl     xmm12,[r31+rax*4+0x123]
-       aesdec256kl     xmm12,[r31+rax*4+0x123]
-       aesdecwide128kl [r31+rax*4+0x123]
-       aesdecwide256kl [r31+rax*4+0x123]
-       aesenc128kl     xmm12,[r31+rax*4+0x123]
-       aesenc256kl     xmm12,[r31+rax*4+0x123]
-       aesencwide128kl [r31+rax*4+0x123]
-       aesencwide256kl [r31+rax*4+0x123]
        aor     [r31+rax*4+0x123],r25d
        aor     [r31+rax*4+0x123],r31
        axor    [r31+rax*4+0x123],r25d
@@ -238,8 +213,6 @@ _start:
        crc32   r21d,r31w
        crc32   r21d,WORD PTR [r31]
        crc32   r18,rax
-       encodekey128    edx,r25d
-       encodekey256    edx,r25d
        enqcmd  r25d,[r31d+eax*4+0x123]
        enqcmd  r31,[r31+rax*4+0x123]
        enqcmds r25d,[r31d+eax*4+0x123]
@@ -287,13 +260,6 @@ _start:
        pext    r11,r15,r31
        pext    edx,r25d,DWORD PTR [r31+rax*4+0x123]
        pext    r15,r31,QWORD PTR [r31+rax*4+0x123]
-       sha1msg1        xmm12,XMMWORD PTR [r31+rax*4+0x123]
-       sha1msg2        xmm12,XMMWORD PTR [r31+rax*4+0x123]
-       sha1nexte       xmm12,XMMWORD PTR [r31+rax*4+0x123]
-       sha1rnds4       xmm12,XMMWORD PTR [r31+rax*4+0x123],0x7b
-       sha256msg1      xmm12,XMMWORD PTR [r31+rax*4+0x123]
-       sha256msg2      xmm12,XMMWORD PTR [r31+rax*4+0x123]
-       sha256rnds2     xmm12,XMMWORD PTR [r31+rax*4+0x123]
        shlx    r10d,edx,r25d
        shlx    edx,DWORD PTR [r31+rax*4+0x123],r25d
        shlx    r11,r15,r31

diff --git a/opcodes/i386-dis-evex-prefix.h b/opcodes/i386-dis-evex-prefix.h
index 37e64607ae677a8669fa44bc027eb4de07eaf080..5e6423790b570869b87a358e03790ff13f75cf08 100644 (file)
--- a/opcodes/i386-dis-evex-prefix.h
+++ b/opcodes/i386-dis-evex-prefix.h
@@ -338,41 +338,6 @@
     { "vcmpp%XH", { MaskG, Vex, EXxh, EXxEVexS, CMP }, 0 },
     { "vcmps%XH", { MaskG, VexScalar, EXw, EXxEVexS, CMP }, 0 },
   },
-  /* PREFIX_EVEX_MAP4_D8 */
-  {
-    { "sha1nexte", { XM, EXxmm }, 0 },
-    { REG_TABLE (REG_0F38D8_PREFIX_1) },
-  },
-  /* PREFIX_EVEX_MAP4_DA */
-  {
-    { "sha1msg2", { XM, EXxmm }, 0 },
-    { "encodekey128", { Gd, Rd }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_DB */
-  {
-    { "sha256rnds2", { XM, EXxmm, XMM0 }, 0 },
-    { "encodekey256", { Gd, Rd }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_DC */
-  {
-    { "sha256msg1", { XM, EXxmm }, 0 },
-    { "aesenc128kl", { XM, M }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_DD */
-  {
-    { "sha256msg2", { XM, EXxmm }, 0 },
-    { "aesdec128kl", { XM, M }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_DE */
-  {
-    { Bad_Opcode },
-    { "aesenc256kl", { XM, M }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_DF */
-  {
-    { Bad_Opcode },
-    { "aesdec256kl", { XM, M }, 0 },
-  },
   /* PREFIX_EVEX_MAP4_F0 */
   {
     { "crc32A", { Gdq, Eb }, 0 },

diff --git a/opcodes/i386-dis-evex.h b/opcodes/i386-dis-evex.h
index 45b52653808be98184be552fe8d0a4e37145d01f..b3258afa733918a91d6b928a22942c71faa4ae64 100644 (file)
--- a/opcodes/i386-dis-evex.h
+++ b/opcodes/i386-dis-evex.h
@@ -1113,19 +1113,19 @@ static const struct dis386 evex_table[][256] = {
     { REG_TABLE (REG_D1) },
     { REG_TABLE (REG_D2) },
     { REG_TABLE (REG_D3) },
-    { "sha1rnds4",     { XM, EXxmm, Ib }, NO_PREFIX },
+    { Bad_Opcode },
     { Bad_Opcode },
     { Bad_Opcode },
     { Bad_Opcode },
     /* D8 */
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_D8) },
-    { "sha1msg1",      { XM, EXxmm }, NO_PREFIX },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_DA) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_DB) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_DC) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_DD) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_DE) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_DF) },
+    { Bad_Opcode },
+    { Bad_Opcode },
+    { Bad_Opcode },
+    { Bad_Opcode },
+    { Bad_Opcode },
+    { Bad_Opcode },
+    { Bad_Opcode },
+    { Bad_Opcode },
     /* E0 */
     { Bad_Opcode },
     { Bad_Opcode },

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index d06a918449c7263f0d7c8ff746a5ab54f66386f6..b86e6ff6045e68efc1503029f1dcddafb3e71da7 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -1198,13 +1198,6 @@ enum
   PREFIX_EVEX_0F3A67,
   PREFIX_EVEX_0F3AC2,
 
-  PREFIX_EVEX_MAP4_D8,
-  PREFIX_EVEX_MAP4_DA,
-  PREFIX_EVEX_MAP4_DB,
-  PREFIX_EVEX_MAP4_DC,
-  PREFIX_EVEX_MAP4_DD,
-  PREFIX_EVEX_MAP4_DE,
-  PREFIX_EVEX_MAP4_DF,
   PREFIX_EVEX_MAP4_F0,
   PREFIX_EVEX_MAP4_F1,
   PREFIX_EVEX_MAP4_F2,
@@ -12828,11 +12821,6 @@ print_vector_reg (instr_info *ins, unsigned int reg, int bytemode)
   else
     names = att_names_xmm;
   oappend_register (ins, names[reg]);
-
-  /* Legacy insns promoted to EVEX, like the legacy insns themselves, don't
-     allow use of the upper 16 vector registers.  */
-  if (ins->evex_type == evex_from_legacy && reg >= 16)
-    oappend (ins, "(bad)");
 }
 
 static bool

diff --git a/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl
index 8aeb316b96bfb8598854f16d4dd8ab8f509f8e35..e3123e77bfb42a273f457ecd7e0387ee7dcc0a2e 100644 (file)
--- a/opcodes/i386-opc.tbl
+++ b/opcodes/i386-opc.tbl
@@ -2074,21 +2074,13 @@ bndldx, 0x0f1a, MPX, Modrm|Anysize|IgnoreSize|NoSuf, { BaseIndex, RegBND }
 
 // SHA instructions.
 sha1rnds4, 0xf3acc, SHA, Modrm|NoSuf, { Imm8|Imm8S, RegXMM|Unspecified|BaseIndex, RegXMM }
-sha1rnds4, 0xd4, SHA&APX_F, Modrm|NoSuf|EVexMap4, { Imm8|Imm8S, RegXMM|Unspecified|BaseIndex, RegXMM }
 sha1nexte, 0xf38c8, SHA, Modrm|NoSuf, { RegXMM|Unspecified|BaseIndex, RegXMM }
-sha1nexte, 0xd8, SHA&APX_F, Modrm|NoSuf|EVexMap4, { RegXMM|Unspecified|BaseIndex, RegXMM }
 sha1msg1, 0xf38c9, SHA, Modrm|NoSuf, { RegXMM|Unspecified|BaseIndex, RegXMM }
-sha1msg1, 0xd9, SHA&APX_F, Modrm|NoSuf|EVexMap4, { RegXMM|Unspecified|BaseIndex, RegXMM }
 sha1msg2, 0xf38ca, SHA, Modrm|NoSuf, { RegXMM|Unspecified|BaseIndex, RegXMM }
-sha1msg2, 0xda, SHA&APX_F, Modrm|NoSuf|EVexMap4, { RegXMM|Unspecified|BaseIndex, RegXMM }
 sha256rnds2, 0xf38cb, SHA, Modrm|NoSuf, { Acc|Xmmword, RegXMM|Unspecified|BaseIndex, RegXMM }
-sha256rnds2, 0xdb, SHA&APX_F, Modrm|NoSuf|EVexMap4, { Acc|Xmmword, RegXMM|Unspecified|BaseIndex, RegXMM }
 sha256rnds2, 0xf38cb, SHA, Modrm|NoSuf, { RegXMM|Unspecified|BaseIndex, RegXMM }
-sha256rnds2, 0xdb, SHA&APX_F, Modrm|NoSuf|EVexMap4, { RegXMM|Unspecified|BaseIndex, RegXMM }
 sha256msg1, 0xf38cc, SHA, Modrm|NoSuf, { RegXMM|Unspecified|BaseIndex, RegXMM }
-sha256msg1, 0xdc, SHA&APX_F, Modrm|NoSuf|EVexMap4, { RegXMM|Unspecified|BaseIndex, RegXMM }
 sha256msg2, 0xf38cd, SHA, Modrm|NoSuf, { RegXMM|Unspecified|BaseIndex, RegXMM }
-sha256msg2, 0xdd, SHA&APX_F, Modrm|NoSuf|EVexMap4, { RegXMM|Unspecified|BaseIndex, RegXMM }
 
 // SHA512 instructions.
 
@@ -3203,25 +3195,15 @@ tilezero, 0xf249, AMX_TILE, Modrm|Vex128|Space0F38|VexW0|NoSuf, { RegTMM }
 
 loadiwkey, 0xf30f38dc, KL, Load|Modrm|NoSuf, { RegXMM, RegXMM }
 encodekey128, 0xf30f38fa, KL, Modrm|NoSuf, { Reg32, Reg32 }
-encodekey128, 0xf3da, KL&APX_F, Modrm|NoSuf|EVexMap4, { Reg32, Reg32 }
 encodekey256, 0xf30f38fb, KL, Modrm|NoSuf, { Reg32, Reg32 }
-encodekey256, 0xf3db, KL&APX_F, Modrm|NoSuf|EVexMap4, { Reg32, Reg32 }
 aesenc128kl, 0xf30f38dc, KL, Modrm|NoSuf, { Unspecified|BaseIndex, RegXMM }
-aesenc128kl, 0xf3dc, KL&APX_F, Modrm|NoSuf|EVexMap4, { Unspecified|BaseIndex, RegXMM }
 aesdec128kl, 0xf30f38dd, KL, Modrm|NoSuf, { Unspecified|BaseIndex, RegXMM }
-aesdec128kl, 0xf3dd, KL&APX_F, Modrm|NoSuf|EVexMap4, { Unspecified|BaseIndex, RegXMM }
 aesenc256kl, 0xf30f38de, KL, Modrm|NoSuf, { Unspecified|BaseIndex, RegXMM }
-aesenc256kl, 0xf3de, KL&APX_F, Modrm|NoSuf|EVexMap4, { Unspecified|BaseIndex, RegXMM }
 aesdec256kl, 0xf30f38df, KL, Modrm|NoSuf, { Unspecified|BaseIndex, RegXMM }
-aesdec256kl, 0xf3df, KL&APX_F, Modrm|NoSuf|EVexMap4, { Unspecified|BaseIndex, RegXMM }
 aesencwide128kl, 0xf30f38d8/0, WideKL, Modrm|NoSuf, { Unspecified|BaseIndex }
-aesencwide128kl, 0xf3d8/0, WideKL&APX_F, Modrm|NoSuf|EVexMap4, { Unspecified|BaseIndex }
 aesdecwide128kl, 0xf30f38d8/1, WideKL, Modrm|NoSuf, { Unspecified|BaseIndex }
-aesdecwide128kl, 0xf3d8/1, WideKL&APX_F, Modrm|NoSuf|EVexMap4, { Unspecified|BaseIndex }
 aesencwide256kl, 0xf30f38d8/2, WideKL, Modrm|NoSuf, { Unspecified|BaseIndex }
-aesencwide256kl, 0xf3d8/2, WideKL&APX_F, Modrm|NoSuf|EVexMap4, { Unspecified|BaseIndex }
 aesdecwide256kl, 0xf30f38d8/3, WideKL, Modrm|NoSuf, { Unspecified|BaseIndex }
-aesdecwide256kl, 0xf3d8/3, WideKL&APX_F, Modrm|NoSuf|EVexMap4, { Unspecified|BaseIndex }
 
 // KEYLOCKER instructions end.
 

diff --git a/opcodes/i386-tbl.h b/opcodes/i386-tbl.h
index cff95db45dc200bef11dffc59b31ea535b5f2a27..2f4a615c27edf07d3e822fc7e454c948d9b5ff5e 100644 (file)
--- a/opcodes/i386-tbl.h
+++ b/opcodes/i386-tbl.h
@@ -31412,18 +31412,6 @@ static const insn_template i386_optab[] =
          1, 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 } } } },
-  { MN_sha1rnds4, 0xd4, 3, SPACE_EVEXMAP4, 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, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 64, 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, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0 } },
-      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         1, 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 } } } },
   { MN_sha1nexte, 0xc8, 2, SPACE_0F38, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -31434,16 +31422,6 @@ static const insn_template i386_optab[] =
          1, 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 } } } },
-  { MN_sha1nexte, 0xd8, 2, SPACE_EVEXMAP4, 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, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 64, 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 } },
-    { { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         1, 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 } } } },
   { MN_sha1msg1, 0xc9, 2, SPACE_0F38, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -31454,16 +31432,6 @@ static const insn_template i386_optab[] =
          1, 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 } } } },
-  { MN_sha1msg1, 0xd9, 2, SPACE_EVEXMAP4, 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, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 64, 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 } },
-    { { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         1, 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 } } } },
   { MN_sha1msg2, 0xca, 2, SPACE_0F38, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -31474,16 +31442,6 @@ static const insn_template i386_optab[] =
          1, 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 } } } },
-  { MN_sha1msg2, 0xda, 2, SPACE_EVEXMAP4, 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, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 64, 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 } },
-    { { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         1, 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 } } } },
   { MN_sha256rnds2, 0xcb, 3, SPACE_0F38, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -31496,18 +31454,6 @@ static const insn_template i386_optab[] =
          1, 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 } } } },
-  { MN_sha256rnds2, 0xdb, 3, SPACE_EVEXMAP4, 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, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 64, 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, 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 } },
-      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         1, 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 } } } },
   { MN_sha256rnds2, 0xcb, 2, SPACE_0F38, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -31518,16 +31464,6 @@ static const insn_template i386_optab[] =
          1, 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 } } } },
-  { MN_sha256rnds2, 0xdb, 2, SPACE_EVEXMAP4, 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, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 64, 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 } },
-    { { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         1, 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 } } } },
   { MN_sha256msg1, 0xcc, 2, SPACE_0F38, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -31538,16 +31474,6 @@ static const insn_template i386_optab[] =
          1, 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 } } } },
-  { MN_sha256msg1, 0xdc, 2, SPACE_EVEXMAP4, 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, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 64, 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 } },
-    { { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         1, 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 } } } },
   { MN_sha256msg2, 0xcd, 2, SPACE_0F38, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -31558,16 +31484,6 @@ static const insn_template i386_optab[] =
          1, 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 } } } },
-  { MN_sha256msg2, 0xdd, 2, SPACE_EVEXMAP4, 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, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 64, 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 } },
-    { { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         1, 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 } } } },
   { MN_vsha512rnds2, 0xcb, 3, SPACE_0F38, None,
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
       0, 0, 0, 2, 1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -38572,16 +38488,6 @@ static const insn_template i386_optab[] =
          0, 0, 0, 0, 0, 0 } },
       { { 1, 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 } } } },
-  { MN_encodekey128, 0xda, 2, SPACE_EVEXMAP4, 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, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 128, 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 } },
-    { { { 1, 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 } },
-      { { 1, 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 } } } },
   { MN_encodekey256, 0xfb, 2, SPACE_0F38, 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, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -38592,16 +38498,6 @@ static const insn_template i386_optab[] =
          0, 0, 0, 0, 0, 0 } },
       { { 1, 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 } } } },
-  { MN_encodekey256, 0xdb, 2, SPACE_EVEXMAP4, 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, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 128, 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 } },
-    { { { 1, 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 } },
-      { { 1, 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 } } } },
   { MN_aesenc128kl, 0xdc, 2, SPACE_0F38, 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, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -38612,16 +38508,6 @@ static const insn_template i386_optab[] =
          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 } } } },
-  { MN_aesenc128kl, 0xdc, 2, SPACE_EVEXMAP4, 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, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 128, 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, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 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 } } } },
   { MN_aesdec128kl, 0xdd, 2, SPACE_0F38, 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, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -38632,16 +38518,6 @@ static const insn_template i386_optab[] =
          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 } } } },
-  { MN_aesdec128kl, 0xdd, 2, SPACE_EVEXMAP4, 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, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 128, 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, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 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 } } } },
   { MN_aesenc256kl, 0xde, 2, SPACE_0F38, 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, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -38652,16 +38528,6 @@ static const insn_template i386_optab[] =
          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 } } } },
-  { MN_aesenc256kl, 0xde, 2, SPACE_EVEXMAP4, 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, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 128, 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, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 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 } } } },
   { MN_aesdec256kl, 0xdf, 2, SPACE_0F38, 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, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -38672,16 +38538,6 @@ static const insn_template i386_optab[] =
          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 } } } },
-  { MN_aesdec256kl, 0xdf, 2, SPACE_EVEXMAP4, 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, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 128, 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, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 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 } } } },
   { MN_aesencwide128kl, 0xd8, 1, SPACE_0F38, 0,
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
       0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -38690,14 +38546,6 @@ static const insn_template i386_optab[] =
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 1, 0 } } } },
-  { MN_aesencwide128kl, 0xd8, 1, SPACE_EVEXMAP4, 0,
-    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 129, 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, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 1, 0 } } } },
   { MN_aesdecwide128kl, 0xd8, 1, SPACE_0F38, 1,
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
       0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -38706,14 +38554,6 @@ static const insn_template i386_optab[] =
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 1, 0 } } } },
-  { MN_aesdecwide128kl, 0xd8, 1, SPACE_EVEXMAP4, 1,
-    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 129, 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, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 1, 0 } } } },
   { MN_aesencwide256kl, 0xd8, 1, SPACE_0F38, 2,
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
       0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -38722,14 +38562,6 @@ static const insn_template i386_optab[] =
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 1, 0 } } } },
-  { MN_aesencwide256kl, 0xd8, 1, SPACE_EVEXMAP4, 2,
-    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 129, 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, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 1, 0 } } } },
   { MN_aesdecwide256kl, 0xd8, 1, SPACE_0F38, 3,
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
       0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
@@ -38738,14 +38570,6 @@ static const insn_template i386_optab[] =
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 1, 0 } } } },
-  { MN_aesdecwide256kl, 0xd8, 1, SPACE_EVEXMAP4, 3,
-    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0 },
-    { { 129, 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, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 1, 0 } } } },
   { MN_tdcall, 0x01cc, 0, SPACE_0F, None,
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 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,
@@ -41772,101 +41596,101 @@ static const i386_op_off_t i386_op_sets[] =
   2948, 2949, 2950, 2951, 2952, 2953, 2954, 2955,
   2956, 2957, 2958, 2959, 2960, 2961, 2962, 2963,
   2966, 2969, 2970, 2971, 2972, 2973, 2974, 2975,
-  2977, 2979, 2981, 2982, 2983, 2985, 2987, 2989,
-  2991, 2995, 2997, 2999, 3000, 3001, 3002, 3003,
-  3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011,
-  3012, 3013, 3014, 3015, 3016, 3017, 3020, 3023,
+  2977, 2979, 2981, 2982, 2983, 2984, 2985, 2986,
+  2987, 2989, 2990, 2991, 2992, 2993, 2994, 2995,
+  2996, 2997, 2998, 2999, 3000, 3001, 3002, 3003,
+  3004, 3005, 3006, 3007, 3008, 3009, 3012, 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, 3052, 3053, 3054, 3055,
   3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063,
-  3064, 3065, 3066, 3067, 3068, 3069, 3070, 3071,
-  3072, 3073, 3074, 3075, 3076, 3077, 3080, 3082,
-  3085, 3088, 3090, 3093, 3096, 3099, 3102, 3103,
-  3106, 3107, 3108, 3109, 3110, 3111, 3115, 3117,
+  3064, 3065, 3066, 3067, 3068, 3069, 3072, 3074,
+  3077, 3080, 3082, 3085, 3088, 3091, 3094, 3095,
+  3098, 3099, 3100, 3101, 3102, 3103, 3107, 3109,
+  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, 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,
+  3169, 3170, 3171, 3172, 3173, 3174, 3175, 3176,
   3177, 3178, 3179, 3180, 3181, 3182, 3183, 3184,
   3185, 3186, 3187, 3188, 3189, 3190, 3191, 3192,
   3193, 3194, 3195, 3196, 3197, 3198, 3199, 3200,
   3201, 3202, 3203, 3204, 3205, 3206, 3207, 3208,
-  3209, 3210, 3211, 3212, 3213, 3214, 3215, 3216,
-  3219, 3222, 3225, 3228, 3231, 3234, 3237, 3240,
-  3243, 3246, 3249, 3252, 3255, 3258, 3261, 3262,
-  3263, 3264, 3265, 3267, 3268, 3269, 3270, 3271,
+  3211, 3214, 3217, 3220, 3223, 3226, 3229, 3232,
+  3235, 3238, 3241, 3244, 3247, 3250, 3253, 3254,
+  3255, 3256, 3257, 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, 3303,
   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, 3331, 3334, 3335, 3336, 3337, 3338, 3339,
+  3320, 3323, 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, 3371,
   3372, 3373, 3374, 3375, 3376, 3377, 3378, 3379,
   3380, 3381, 3382, 3383, 3384, 3385, 3386, 3387,
-  3388, 3389, 3390, 3391, 3392, 3393, 3394, 3395,
-  3396, 3399, 3402, 3405, 3406, 3407, 3408, 3409,
-  3410, 3411, 3412, 3413, 3414, 3415, 3416, 3417,
-  3418, 3419, 3420, 3421, 3424, 3427, 3428, 3429,
-  3432, 3433, 3434, 3435, 3436, 3439, 3442, 3445,
-  3446, 3447, 3448, 3449, 3450, 3451, 3452, 3453,
-  3454, 3455, 3457, 3459, 3460, 3461, 3462, 3463,
+  3388, 3391, 3394, 3397, 3398, 3399, 3400, 3401,
+  3402, 3403, 3404, 3405, 3406, 3407, 3408, 3409,
+  3410, 3411, 3412, 3413, 3416, 3419, 3420, 3421,
+  3424, 3425, 3426, 3427, 3428, 3431, 3434, 3437,
+  3438, 3439, 3440, 3441, 3442, 3443, 3444, 3445,
+  3446, 3447, 3449, 3451, 3452, 3453, 3454, 3455,
+  3456, 3457, 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, 3484, 3486, 3488, 3489,
+  3472, 3473, 3474, 3475, 3476, 3478, 3480, 3481,
+  3482, 3483, 3484, 3485, 3486, 3487, 3488, 3489,
   3490, 3491, 3492, 3493, 3494, 3495, 3496, 3497,
   3498, 3499, 3500, 3501, 3502, 3503, 3504, 3505,
-  3506, 3507, 3508, 3509, 3510, 3511, 3512, 3513,
-  3515, 3517, 3519, 3521, 3522, 3523, 3524, 3525,
-  3526, 3527, 3528, 3529, 3530, 3531, 3532, 3533,
-  3534, 3535, 3536, 3538, 3539, 3541, 3544, 3546,
-  3547, 3548, 3550, 3552, 3553, 3554, 3555, 3556,
-  3557, 3558, 3560, 3562, 3564, 3566, 3567, 3568,
-  3569, 3570, 3571, 3572, 3573, 3574, 3575, 3577,
-  3579, 3580, 3582, 3584, 3585, 3590, 3592, 3594,
-  3595, 3596, 3597, 3598, 3599, 3600, 3601, 3603,
-  3605, 3606, 3607, 3608, 3610, 3613, 3616, 3619,
+  3507, 3509, 3511, 3513, 3514, 3515, 3516, 3517,
+  3518, 3519, 3520, 3521, 3522, 3523, 3524, 3525,
+  3526, 3527, 3528, 3530, 3531, 3533, 3536, 3538,
+  3539, 3540, 3542, 3544, 3545, 3546, 3547, 3548,
+  3549, 3550, 3552, 3554, 3556, 3558, 3559, 3560,
+  3561, 3562, 3563, 3564, 3565, 3566, 3567, 3569,
+  3571, 3572, 3574, 3576, 3577, 3582, 3584, 3586,
+  3587, 3588, 3589, 3590, 3591, 3592, 3593, 3595,
+  3597, 3598, 3599, 3600, 3602, 3605, 3608, 3611,
+  3613, 3614, 3615, 3616, 3617, 3618, 3619, 3620,
   3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628,
   3629, 3630, 3631, 3632, 3633, 3634, 3635, 3636,
-  3637, 3638, 3639, 3640, 3641, 3643, 3645, 3647,
-  3649, 3651, 3653, 3655, 3657, 3659, 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, 3748, 3749, 3750,
-  3751, 3752, 3753, 3754, 3755, 3756, 3757, 3758,
-  3759, 3760, 3761, 3762, 3763, 3764, 3765, 3766,
-  3767, 3768, 3769, 3770, 3771, 3772, 3773, 3776,
-  3777, 3778, 3781, 3782, 3783, 3785, 3786, 3787,
-  3788, 3790, 3791, 3792, 3793, 3795, 3796, 3797,
-  3798, 3801, 3802, 3803, 3804, 3805, 3808, 3811,
-  3814, 3817, 3820, 3821, 3822, 3823, 3824, 3826,
-  3828, 3829, 3830, 3831, 3834, 3837, 3840, 3843,
-  3846, 3847, 3848, 3849, 3851, 3852, 3853, 3854,
-  3856, 3857, 3858, 3859, 3860, 3861, 3862, 3863,
-  3864, 3865, 3866, 3867, 3868, 3869, 3870, 3871,
-  3872, 3873, 3874, 3875, 3876, 3877, 3878, 3879,
-  3880, 3881, 3882, 3883, 3884, 3885, 3886, 3887,
-  3888, 3889, 3890, 3891, 3892, 3893, 3894, 3895,
-  3897, 3899, 3901, 3903, 3905, 3906, 3907, 3910,
-  3913, 3914, 3915, 3916, 3917
+  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, 3748,
+  3749, 3750, 3751, 3752, 3753, 3754, 3755, 3758,
+  3759, 3760, 3763, 3764, 3765, 3767, 3768, 3769,
+  3770, 3772, 3773, 3774, 3775, 3777, 3778, 3779,
+  3780, 3783, 3784, 3785, 3786, 3787, 3790, 3793,
+  3796, 3799, 3802, 3803, 3804, 3805, 3806, 3808,
+  3810, 3811, 3812, 3813, 3816, 3819, 3822, 3825,
+  3828, 3829, 3830, 3831, 3833, 3834, 3835, 3836,
+  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,
+  3870, 3871, 3872, 3873, 3874, 3875, 3876, 3877,
+  3879, 3881, 3883, 3885, 3887, 3888, 3889, 3892,
+  3895, 3896, 3897, 3898, 3899
 };
 
 /* i386 mnemonics table.  */