x86: disassembler macro for condition code

Both CMPccXADD and APX'es {,CF}CMOVcc have almost identical entries
replicated 16 times each. Fold those to just one each by introducing a
%CC macro. (Note that the recording of ->condition_code in print_insn()
is merely for completeness for now; it's not used as long as only
VEX/EVEX encodings would consume it.)

This then also renders condition codes printed consistent across all
respective insns; CMPxxXADD had a number of outliers so far.

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 5e7b695df0125c0b83456ac897f45b04246f1d00..76664548d8081ac3137755cc2fc26da03782dc87 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
@@ -42,30 +42,30 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e2 bc 87 23 01 00 00[     ]+cmpbxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ec 94 87 23 01 00 00[     ]+cmplxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ec bc 87 23 01 00 00[     ]+cmplxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpnbexadd[   ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpnbexadd[   ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpnbxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpnbxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpnlexadd[   ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpnlexadd[   ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpnlxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpnlxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpaxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpaxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpaexadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpaexadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpgxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpgxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpgexadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpgexadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e1 94 87 23 01 00 00[     ]+cmpnoxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e1 bc 87 23 01 00 00[     ]+cmpnoxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 eb 94 87 23 01 00 00[     ]+cmpnpxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 eb bc 87 23 01 00 00[     ]+cmpnpxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e9 94 87 23 01 00 00[     ]+cmpnsxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e9 bc 87 23 01 00 00[     ]+cmpnsxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnzxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnzxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnexadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnexadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e0 94 87 23 01 00 00[     ]+cmpoxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e0 bc 87 23 01 00 00[     ]+cmpoxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ea 94 87 23 01 00 00[     ]+cmppxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ea bc 87 23 01 00 00[     ]+cmppxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e8 94 87 23 01 00 00[     ]+cmpsxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e8 bc 87 23 01 00 00[     ]+cmpsxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpzxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpzxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpexadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpexadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 f7[    ]+crc32[        ]+r22,r31
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 37[    ]+crc32[        ]+r22,QWORD PTR \[r31\]
 [       ]*[a-f0-9]+:[   ]*62 ec fc 08 f0 cb[    ]+crc32[        ]+r17,r19b
@@ -186,30 +186,30 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e2 bc 87 23 01 00 00[     ]+cmpbxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ec 94 87 23 01 00 00[     ]+cmplxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ec bc 87 23 01 00 00[     ]+cmplxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpnbexadd[   ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpnbexadd[   ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpnbxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpnbxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpnlexadd[   ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpnlexadd[   ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpnlxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpnlxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpaxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpaxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpaexadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpaexadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpgxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpgxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpgexadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpgexadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e1 94 87 23 01 00 00[     ]+cmpnoxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e1 bc 87 23 01 00 00[     ]+cmpnoxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 eb 94 87 23 01 00 00[     ]+cmpnpxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 eb bc 87 23 01 00 00[     ]+cmpnpxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e9 94 87 23 01 00 00[     ]+cmpnsxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e9 bc 87 23 01 00 00[     ]+cmpnsxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnzxadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnzxadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnexadd[    ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnexadd[    ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e0 94 87 23 01 00 00[     ]+cmpoxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e0 bc 87 23 01 00 00[     ]+cmpoxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ea 94 87 23 01 00 00[     ]+cmppxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ea bc 87 23 01 00 00[     ]+cmppxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e8 94 87 23 01 00 00[     ]+cmpsxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e8 bc 87 23 01 00 00[     ]+cmpsxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpzxadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpzxadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpexadd[     ]+DWORD PTR \[r31\+rax\*4\+0x123\],edx,r25d
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpexadd[     ]+QWORD PTR \[r31\+rax\*4\+0x123\],r15,r31
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 f7[    ]+crc32[        ]+r22,r31
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 37[    ]+crc32[        ]+r22,QWORD PTR \[r31\]
 [       ]*[a-f0-9]+:[   ]*62 ec fc 08 f0 cb[    ]+crc32[        ]+r17,r19b

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 88840a1c96f619954e997141389f0b940a89cb78..e800205c0e39d6939b6679071fa77e5260fed856 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
@@ -42,30 +42,30 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e2 bc 87 23 01 00 00[     ]+cmpbxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ec 94 87 23 01 00 00[     ]+cmplxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ec bc 87 23 01 00 00[     ]+cmplxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpnbexadd[   ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpnbexadd[   ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpnbxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpnbxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpnlexadd[   ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpnlexadd[   ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpnlxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpnlxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpaxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpaxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpaexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpaexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpgxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpgxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpgexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpgexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e1 94 87 23 01 00 00[     ]+cmpnoxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e1 bc 87 23 01 00 00[     ]+cmpnoxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 eb 94 87 23 01 00 00[     ]+cmpnpxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 eb bc 87 23 01 00 00[     ]+cmpnpxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e9 94 87 23 01 00 00[     ]+cmpnsxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e9 bc 87 23 01 00 00[     ]+cmpnsxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnzxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnzxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e0 94 87 23 01 00 00[     ]+cmpoxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e0 bc 87 23 01 00 00[     ]+cmpoxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ea 94 87 23 01 00 00[     ]+cmppxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ea bc 87 23 01 00 00[     ]+cmppxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e8 94 87 23 01 00 00[     ]+cmpsxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e8 bc 87 23 01 00 00[     ]+cmpsxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpzxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpzxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpexadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpexadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 f7[    ]+crc32  %r31,%r22
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 37[    ]+crc32q \(%r31\),%r22
 [       ]*[a-f0-9]+:[   ]*62 ec fc 08 f0 cb[    ]+crc32  %r19b,%r17
@@ -186,30 +186,30 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e2 bc 87 23 01 00 00[     ]+cmpbxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ec 94 87 23 01 00 00[     ]+cmplxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ec bc 87 23 01 00 00[     ]+cmplxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpnbexadd[   ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpnbexadd[   ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpnbxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpnbxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpnlexadd[   ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpnlexadd[   ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpnlxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpnlxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpaxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpaxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpaexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpaexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpgxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpgxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpgexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpgexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e1 94 87 23 01 00 00[     ]+cmpnoxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e1 bc 87 23 01 00 00[     ]+cmpnoxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 eb 94 87 23 01 00 00[     ]+cmpnpxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 eb bc 87 23 01 00 00[     ]+cmpnpxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e9 94 87 23 01 00 00[     ]+cmpnsxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e9 bc 87 23 01 00 00[     ]+cmpnsxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnzxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnzxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e0 94 87 23 01 00 00[     ]+cmpoxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e0 bc 87 23 01 00 00[     ]+cmpoxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ea 94 87 23 01 00 00[     ]+cmppxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ea bc 87 23 01 00 00[     ]+cmppxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e8 94 87 23 01 00 00[     ]+cmpsxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e8 bc 87 23 01 00 00[     ]+cmpsxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpzxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpzxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpexadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpexadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 f7[    ]+crc32  %r31,%r22
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 37[    ]+crc32q \(%r31\),%r22
 [       ]*[a-f0-9]+:[   ]*62 ec fc 08 f0 cb[    ]+crc32  %r19b,%r17

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 bdffa30504081a18c83a86cdc68264bee9885499..a8f9231b5b0c54c472281f56ab85bcdec296c8b9 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d
@@ -42,30 +42,30 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e2 bc 87 23 01 00 00[     ]+cmpbxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ec 94 87 23 01 00 00[     ]+cmplxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ec bc 87 23 01 00 00[     ]+cmplxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpnbexadd[   ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpnbexadd[   ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpnbxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpnbxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpnlexadd[   ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpnlexadd[   ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpnlxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpnlxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpaxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpaxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpaexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpaexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpgxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpgxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpgexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpgexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e1 94 87 23 01 00 00[     ]+cmpnoxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e1 bc 87 23 01 00 00[     ]+cmpnoxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 eb 94 87 23 01 00 00[     ]+cmpnpxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 eb bc 87 23 01 00 00[     ]+cmpnpxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e9 94 87 23 01 00 00[     ]+cmpnsxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e9 bc 87 23 01 00 00[     ]+cmpnsxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnzxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnzxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e0 94 87 23 01 00 00[     ]+cmpoxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e0 bc 87 23 01 00 00[     ]+cmpoxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ea 94 87 23 01 00 00[     ]+cmppxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ea bc 87 23 01 00 00[     ]+cmppxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e8 94 87 23 01 00 00[     ]+cmpsxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e8 bc 87 23 01 00 00[     ]+cmpsxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpzxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpzxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpexadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpexadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 f7[    ]+crc32  %r31,%r22
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 37[    ]+crc32q \(%r31\),%r22
 [       ]*[a-f0-9]+:[   ]*62 ec fc 08 f0 cb[    ]+crc32  %r19b,%r17
@@ -186,30 +186,30 @@ Disassembly of section \.text:
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e2 bc 87 23 01 00 00[     ]+cmpbxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ec 94 87 23 01 00 00[     ]+cmplxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ec bc 87 23 01 00 00[     ]+cmplxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpnbexadd[   ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpnbexadd[   ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpnbxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpnbxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpnlexadd[   ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpnlexadd[   ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpnlxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpnlxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e7 94 87 23 01 00 00[     ]+cmpaxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e7 bc 87 23 01 00 00[     ]+cmpaxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e3 94 87 23 01 00 00[     ]+cmpaexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e3 bc 87 23 01 00 00[     ]+cmpaexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ef 94 87 23 01 00 00[     ]+cmpgxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ef bc 87 23 01 00 00[     ]+cmpgxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 ed 94 87 23 01 00 00[     ]+cmpgexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 ed bc 87 23 01 00 00[     ]+cmpgexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e1 94 87 23 01 00 00[     ]+cmpnoxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e1 bc 87 23 01 00 00[     ]+cmpnoxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 eb 94 87 23 01 00 00[     ]+cmpnpxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 eb bc 87 23 01 00 00[     ]+cmpnpxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e9 94 87 23 01 00 00[     ]+cmpnsxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e9 bc 87 23 01 00 00[     ]+cmpnsxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnzxadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnzxadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e5 94 87 23 01 00 00[     ]+cmpnexadd[    ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e5 bc 87 23 01 00 00[     ]+cmpnexadd[    ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e0 94 87 23 01 00 00[     ]+cmpoxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e0 bc 87 23 01 00 00[     ]+cmpoxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 ea 94 87 23 01 00 00[     ]+cmppxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 ea bc 87 23 01 00 00[     ]+cmppxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 da 35 00 e8 94 87 23 01 00 00[     ]+cmpsxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 5a 85 00 e8 bc 87 23 01 00 00[     ]+cmpsxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpzxadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
-[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpzxadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 da 35 00 e4 94 87 23 01 00 00[     ]+cmpexadd[     ]+%r25d,%edx,0x123\(%r31,%rax,4\)
+[       ]*[a-f0-9]+:[   ]*62 5a 85 00 e4 bc 87 23 01 00 00[     ]+cmpexadd[     ]+%r31,%r15,0x123\(%r31,%rax,4\)
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 f7[    ]+crc32  %r31,%r22
 [       ]*[a-f0-9]+:[   ]*62 cc fc 08 f1 37[    ]+crc32q \(%r31\),%r22
 [       ]*[a-f0-9]+:[   ]*62 ec fc 08 f0 cb[    ]+crc32  %r19b,%r17

diff --git a/gas/testsuite/gas/i386/x86-64-apx_f-evex.d b/gas/testsuite/gas/i386/x86-64-apx_f-evex.d
index 12326f568ed3b83969e3c328426d76cafc934f19..8253d3470d66d36749044ae150a85e0dcf42157b 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-apx_f-evex.d
+++ b/gas/testsuite/gas/i386/x86-64-apx_f-evex.d
@@ -116,30 +116,30 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*62 d2 05 08 ee 94 80 23 01 00 00\s+\{evex\} cmplexadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 52 85 08 ec bc 80 23 01 00 00\s+\{evex\} cmplxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 d2 05 08 ec 94 80 23 01 00 00\s+\{evex\} cmplxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 52 85 08 e7 bc 80 23 01 00 00\s+\{evex\} cmpnbexadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 d2 05 08 e7 94 80 23 01 00 00\s+\{evex\} cmpnbexadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 52 85 08 e3 bc 80 23 01 00 00\s+\{evex\} cmpnbxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 d2 05 08 e3 94 80 23 01 00 00\s+\{evex\} cmpnbxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 52 85 08 ef bc 80 23 01 00 00\s+\{evex\} cmpnlexadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 d2 05 08 ef 94 80 23 01 00 00\s+\{evex\} cmpnlexadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 52 85 08 ed bc 80 23 01 00 00\s+\{evex\} cmpnlxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 d2 05 08 ed 94 80 23 01 00 00\s+\{evex\} cmpnlxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 52 85 08 e7 bc 80 23 01 00 00\s+\{evex\} cmpaxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 d2 05 08 e7 94 80 23 01 00 00\s+\{evex\} cmpaxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 52 85 08 e3 bc 80 23 01 00 00\s+\{evex\} cmpaexadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 d2 05 08 e3 94 80 23 01 00 00\s+\{evex\} cmpaexadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 52 85 08 ef bc 80 23 01 00 00\s+\{evex\} cmpgxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 d2 05 08 ef 94 80 23 01 00 00\s+\{evex\} cmpgxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 52 85 08 ed bc 80 23 01 00 00\s+\{evex\} cmpgexadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 d2 05 08 ed 94 80 23 01 00 00\s+\{evex\} cmpgexadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 52 85 08 e1 bc 80 23 01 00 00\s+\{evex\} cmpnoxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 d2 05 08 e1 94 80 23 01 00 00\s+\{evex\} cmpnoxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 52 85 08 eb bc 80 23 01 00 00\s+\{evex\} cmpnpxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 d2 05 08 eb 94 80 23 01 00 00\s+\{evex\} cmpnpxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 52 85 08 e9 bc 80 23 01 00 00\s+\{evex\} cmpnsxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 d2 05 08 e9 94 80 23 01 00 00\s+\{evex\} cmpnsxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 52 85 08 e5 bc 80 23 01 00 00\s+\{evex\} cmpnzxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 d2 05 08 e5 94 80 23 01 00 00\s+\{evex\} cmpnzxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 52 85 08 e5 bc 80 23 01 00 00\s+\{evex\} cmpnexadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 d2 05 08 e5 94 80 23 01 00 00\s+\{evex\} cmpnexadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 52 85 08 e0 bc 80 23 01 00 00\s+\{evex\} cmpoxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 d2 05 08 e0 94 80 23 01 00 00\s+\{evex\} cmpoxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 52 85 08 ea bc 80 23 01 00 00\s+\{evex\} cmppxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 d2 05 08 ea 94 80 23 01 00 00\s+\{evex\} cmppxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 52 85 08 e8 bc 80 23 01 00 00\s+\{evex\} cmpsxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 d2 05 08 e8 94 80 23 01 00 00\s+\{evex\} cmpsxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 52 85 08 e4 bc 80 23 01 00 00\s+\{evex\} cmpzxadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
-\s*[a-f0-9]+:\s*62 d2 05 08 e4 94 80 23 01 00 00\s+\{evex\} cmpzxadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 52 85 08 e4 bc 80 23 01 00 00\s+\{evex\} cmpexadd\s+%r15,%r15,0x123\(%r8,%rax,4\)
+\s*[a-f0-9]+:\s*62 d2 05 08 e4 94 80 23 01 00 00\s+\{evex\} cmpexadd\s+%r15d,%edx,0x123\(%r8,%rax,4\)
 \s*[a-f0-9]+:\s*62 d4 fc 08 ff cf\s+\{evex\} dec\s+%r15
 \s*[a-f0-9]+:\s*62 d4 7c 08 ff cf\s+\{evex\} dec\s+%r15d
 \s*[a-f0-9]+:\s*62 d4 7d 08 ff cf\s+\{evex\} dec\s+%r15w

diff --git a/gas/testsuite/gas/i386/x86-64-cmpccxadd-intel.d b/gas/testsuite/gas/i386/x86-64-cmpccxadd-intel.d
index bb810c9584fd7d88e108f193d84400e973c956df..0bc0f54baa645878f016ab9415db5f8307d52ba2 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-cmpccxadd-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-cmpccxadd-intel.d
@@ -39,38 +39,38 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 ec 09\s+cmplxadd QWORD PTR \[r9\],rcx,rbx
 \s*[a-f0-9]+:\s*c4 e2 f9 ec 89 f8 03 00 00\s+cmplxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
 \s*[a-f0-9]+:\s*c4 e2 e1 ec 8a 00 fc ff ff\s+cmplxadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 e7 8c f5 00 00 00 10\s+cmpnbexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 e7 09\s+cmpnbexadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 e7 89 fc 01 00 00\s+cmpnbexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 e7 8a 00 fe ff ff\s+cmpnbexadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 e7 8c f5 00 00 00 10\s+cmpnbexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 e7 09\s+cmpnbexadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 e7 89 f8 03 00 00\s+cmpnbexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 e7 8a 00 fc ff ff\s+cmpnbexadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 e3 8c f5 00 00 00 10\s+cmpnbxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 e3 09\s+cmpnbxadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 e3 89 fc 01 00 00\s+cmpnbxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 e3 8a 00 fe ff ff\s+cmpnbxadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 e3 8c f5 00 00 00 10\s+cmpnbxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 e3 09\s+cmpnbxadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 e3 89 f8 03 00 00\s+cmpnbxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 e3 8a 00 fc ff ff\s+cmpnbxadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 ef 8c f5 00 00 00 10\s+cmpnlexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 ef 09\s+cmpnlexadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 ef 89 fc 01 00 00\s+cmpnlexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 ef 8a 00 fe ff ff\s+cmpnlexadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 ef 8c f5 00 00 00 10\s+cmpnlexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 ef 09\s+cmpnlexadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 ef 89 f8 03 00 00\s+cmpnlexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 ef 8a 00 fc ff ff\s+cmpnlexadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 ed 8c f5 00 00 00 10\s+cmpnlxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 ed 09\s+cmpnlxadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 ed 89 fc 01 00 00\s+cmpnlxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 ed 8a 00 fe ff ff\s+cmpnlxadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 ed 8c f5 00 00 00 10\s+cmpnlxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 ed 09\s+cmpnlxadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 ed 89 f8 03 00 00\s+cmpnlxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 ed 8a 00 fc ff ff\s+cmpnlxadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 e7 8c f5 00 00 00 10\s+cmpaxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 e7 09\s+cmpaxadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 e7 89 fc 01 00 00\s+cmpaxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 e7 8a 00 fe ff ff\s+cmpaxadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 e7 8c f5 00 00 00 10\s+cmpaxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 e7 09\s+cmpaxadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 e7 89 f8 03 00 00\s+cmpaxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 e7 8a 00 fc ff ff\s+cmpaxadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 e3 8c f5 00 00 00 10\s+cmpaexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 e3 09\s+cmpaexadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 e3 89 fc 01 00 00\s+cmpaexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 e3 8a 00 fe ff ff\s+cmpaexadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 e3 8c f5 00 00 00 10\s+cmpaexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 e3 09\s+cmpaexadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 e3 89 f8 03 00 00\s+cmpaexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 e3 8a 00 fc ff ff\s+cmpaexadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 ef 8c f5 00 00 00 10\s+cmpgxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 ef 09\s+cmpgxadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 ef 89 fc 01 00 00\s+cmpgxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 ef 8a 00 fe ff ff\s+cmpgxadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 ef 8c f5 00 00 00 10\s+cmpgxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 ef 09\s+cmpgxadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 ef 89 f8 03 00 00\s+cmpgxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 ef 8a 00 fc ff ff\s+cmpgxadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 ed 8c f5 00 00 00 10\s+cmpgexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 ed 09\s+cmpgexadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 ed 89 fc 01 00 00\s+cmpgexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 ed 8a 00 fe ff ff\s+cmpgexadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 ed 8c f5 00 00 00 10\s+cmpgexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 ed 09\s+cmpgexadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 ed 89 f8 03 00 00\s+cmpgexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 ed 8a 00 fc ff ff\s+cmpgexadd QWORD PTR \[rdx-0x400\],rcx,rbx
 \s*[a-f0-9]+:\s*c4 a2 79 e1 8c f5 00 00 00 10\s+cmpnoxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
 \s*[a-f0-9]+:\s*c4 c2 61 e1 09\s+cmpnoxadd DWORD PTR \[r9\],ecx,ebx
 \s*[a-f0-9]+:\s*c4 e2 79 e1 89 fc 01 00 00\s+cmpnoxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
@@ -95,14 +95,14 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 e9 09\s+cmpnsxadd QWORD PTR \[r9\],rcx,rbx
 \s*[a-f0-9]+:\s*c4 e2 f9 e9 89 f8 03 00 00\s+cmpnsxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
 \s*[a-f0-9]+:\s*c4 e2 e1 e9 8a 00 fc ff ff\s+cmpnsxadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 e5 8c f5 00 00 00 10\s+cmpnzxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 e5 09\s+cmpnzxadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 e5 89 fc 01 00 00\s+cmpnzxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 e5 8a 00 fe ff ff\s+cmpnzxadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 e5 8c f5 00 00 00 10\s+cmpnzxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 e5 09\s+cmpnzxadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 e5 89 f8 03 00 00\s+cmpnzxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 e5 8a 00 fc ff ff\s+cmpnzxadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 e5 8c f5 00 00 00 10\s+cmpnexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 e5 09\s+cmpnexadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 e5 89 fc 01 00 00\s+cmpnexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 e5 8a 00 fe ff ff\s+cmpnexadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 e5 8c f5 00 00 00 10\s+cmpnexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 e5 09\s+cmpnexadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 e5 89 f8 03 00 00\s+cmpnexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 e5 8a 00 fc ff ff\s+cmpnexadd QWORD PTR \[rdx-0x400\],rcx,rbx
 \s*[a-f0-9]+:\s*c4 a2 79 e0 8c f5 00 00 00 10\s+cmpoxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
 \s*[a-f0-9]+:\s*c4 c2 61 e0 09\s+cmpoxadd DWORD PTR \[r9\],ecx,ebx
 \s*[a-f0-9]+:\s*c4 e2 79 e0 89 fc 01 00 00\s+cmpoxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
@@ -127,14 +127,14 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 e8 09\s+cmpsxadd QWORD PTR \[r9\],rcx,rbx
 \s*[a-f0-9]+:\s*c4 e2 f9 e8 89 f8 03 00 00\s+cmpsxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
 \s*[a-f0-9]+:\s*c4 e2 e1 e8 8a 00 fc ff ff\s+cmpsxadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 e4 8c f5 00 00 00 10\s+cmpzxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 e4 09\s+cmpzxadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 e4 89 fc 01 00 00\s+cmpzxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 e4 8a 00 fe ff ff\s+cmpzxadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 e4 8c f5 00 00 00 10\s+cmpzxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 e4 09\s+cmpzxadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 e4 89 f8 03 00 00\s+cmpzxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 e4 8a 00 fc ff ff\s+cmpzxadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 e4 8c f5 00 00 00 10\s+cmpexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 e4 09\s+cmpexadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 e4 89 fc 01 00 00\s+cmpexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 e4 8a 00 fe ff ff\s+cmpexadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 e4 8c f5 00 00 00 10\s+cmpexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 e4 09\s+cmpexadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 e4 89 f8 03 00 00\s+cmpexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 e4 8a 00 fc ff ff\s+cmpexadd QWORD PTR \[rdx-0x400\],rcx,rbx
 \s*[a-f0-9]+:\s*c4 a2 79 e6 8c f5 00 00 00 10\s+cmpbexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
 \s*[a-f0-9]+:\s*c4 c2 61 e6 09\s+cmpbexadd DWORD PTR \[r9\],ecx,ebx
 \s*[a-f0-9]+:\s*c4 e2 79 e6 89 fc 01 00 00\s+cmpbexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
@@ -167,38 +167,38 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 ec 09\s+cmplxadd QWORD PTR \[r9\],rcx,rbx
 \s*[a-f0-9]+:\s*c4 e2 f9 ec 89 f8 03 00 00\s+cmplxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
 \s*[a-f0-9]+:\s*c4 e2 e1 ec 8a 00 fc ff ff\s+cmplxadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 e7 8c f5 00 00 00 10\s+cmpnbexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 e7 09\s+cmpnbexadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 e7 89 fc 01 00 00\s+cmpnbexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 e7 8a 00 fe ff ff\s+cmpnbexadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 e7 8c f5 00 00 00 10\s+cmpnbexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 e7 09\s+cmpnbexadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 e7 89 f8 03 00 00\s+cmpnbexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 e7 8a 00 fc ff ff\s+cmpnbexadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 e3 8c f5 00 00 00 10\s+cmpnbxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 e3 09\s+cmpnbxadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 e3 89 fc 01 00 00\s+cmpnbxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 e3 8a 00 fe ff ff\s+cmpnbxadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 e3 8c f5 00 00 00 10\s+cmpnbxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 e3 09\s+cmpnbxadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 e3 89 f8 03 00 00\s+cmpnbxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 e3 8a 00 fc ff ff\s+cmpnbxadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 ef 8c f5 00 00 00 10\s+cmpnlexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 ef 09\s+cmpnlexadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 ef 89 fc 01 00 00\s+cmpnlexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 ef 8a 00 fe ff ff\s+cmpnlexadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 ef 8c f5 00 00 00 10\s+cmpnlexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 ef 09\s+cmpnlexadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 ef 89 f8 03 00 00\s+cmpnlexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 ef 8a 00 fc ff ff\s+cmpnlexadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 ed 8c f5 00 00 00 10\s+cmpnlxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 ed 09\s+cmpnlxadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 ed 89 fc 01 00 00\s+cmpnlxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 ed 8a 00 fe ff ff\s+cmpnlxadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 ed 8c f5 00 00 00 10\s+cmpnlxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 ed 09\s+cmpnlxadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 ed 89 f8 03 00 00\s+cmpnlxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 ed 8a 00 fc ff ff\s+cmpnlxadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 e7 8c f5 00 00 00 10\s+cmpaxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 e7 09\s+cmpaxadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 e7 89 fc 01 00 00\s+cmpaxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 e7 8a 00 fe ff ff\s+cmpaxadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 e7 8c f5 00 00 00 10\s+cmpaxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 e7 09\s+cmpaxadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 e7 89 f8 03 00 00\s+cmpaxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 e7 8a 00 fc ff ff\s+cmpaxadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 e3 8c f5 00 00 00 10\s+cmpaexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 e3 09\s+cmpaexadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 e3 89 fc 01 00 00\s+cmpaexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 e3 8a 00 fe ff ff\s+cmpaexadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 e3 8c f5 00 00 00 10\s+cmpaexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 e3 09\s+cmpaexadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 e3 89 f8 03 00 00\s+cmpaexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 e3 8a 00 fc ff ff\s+cmpaexadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 ef 8c f5 00 00 00 10\s+cmpgxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 ef 09\s+cmpgxadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 ef 89 fc 01 00 00\s+cmpgxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 ef 8a 00 fe ff ff\s+cmpgxadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 ef 8c f5 00 00 00 10\s+cmpgxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 ef 09\s+cmpgxadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 ef 89 f8 03 00 00\s+cmpgxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 ef 8a 00 fc ff ff\s+cmpgxadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 ed 8c f5 00 00 00 10\s+cmpgexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 ed 09\s+cmpgexadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 ed 89 fc 01 00 00\s+cmpgexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 ed 8a 00 fe ff ff\s+cmpgexadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 ed 8c f5 00 00 00 10\s+cmpgexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 ed 09\s+cmpgexadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 ed 89 f8 03 00 00\s+cmpgexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 ed 8a 00 fc ff ff\s+cmpgexadd QWORD PTR \[rdx-0x400\],rcx,rbx
 \s*[a-f0-9]+:\s*c4 a2 79 e1 8c f5 00 00 00 10\s+cmpnoxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
 \s*[a-f0-9]+:\s*c4 c2 61 e1 09\s+cmpnoxadd DWORD PTR \[r9\],ecx,ebx
 \s*[a-f0-9]+:\s*c4 e2 79 e1 89 fc 01 00 00\s+cmpnoxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
@@ -223,14 +223,14 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 e9 09\s+cmpnsxadd QWORD PTR \[r9\],rcx,rbx
 \s*[a-f0-9]+:\s*c4 e2 f9 e9 89 f8 03 00 00\s+cmpnsxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
 \s*[a-f0-9]+:\s*c4 e2 e1 e9 8a 00 fc ff ff\s+cmpnsxadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 e5 8c f5 00 00 00 10\s+cmpnzxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 e5 09\s+cmpnzxadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 e5 89 fc 01 00 00\s+cmpnzxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 e5 8a 00 fe ff ff\s+cmpnzxadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 e5 8c f5 00 00 00 10\s+cmpnzxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 e5 09\s+cmpnzxadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 e5 89 f8 03 00 00\s+cmpnzxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 e5 8a 00 fc ff ff\s+cmpnzxadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 e5 8c f5 00 00 00 10\s+cmpnexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 e5 09\s+cmpnexadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 e5 89 fc 01 00 00\s+cmpnexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 e5 8a 00 fe ff ff\s+cmpnexadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 e5 8c f5 00 00 00 10\s+cmpnexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 e5 09\s+cmpnexadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 e5 89 f8 03 00 00\s+cmpnexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 e5 8a 00 fc ff ff\s+cmpnexadd QWORD PTR \[rdx-0x400\],rcx,rbx
 \s*[a-f0-9]+:\s*c4 a2 79 e0 8c f5 00 00 00 10\s+cmpoxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
 \s*[a-f0-9]+:\s*c4 c2 61 e0 09\s+cmpoxadd DWORD PTR \[r9\],ecx,ebx
 \s*[a-f0-9]+:\s*c4 e2 79 e0 89 fc 01 00 00\s+cmpoxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
@@ -255,12 +255,12 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 e8 09\s+cmpsxadd QWORD PTR \[r9\],rcx,rbx
 \s*[a-f0-9]+:\s*c4 e2 f9 e8 89 f8 03 00 00\s+cmpsxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
 \s*[a-f0-9]+:\s*c4 e2 e1 e8 8a 00 fc ff ff\s+cmpsxadd QWORD PTR \[rdx-0x400\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 a2 79 e4 8c f5 00 00 00 10\s+cmpzxadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
-\s*[a-f0-9]+:\s*c4 c2 61 e4 09\s+cmpzxadd DWORD PTR \[r9\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 e2 79 e4 89 fc 01 00 00\s+cmpzxadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
-\s*[a-f0-9]+:\s*c4 e2 61 e4 8a 00 fe ff ff\s+cmpzxadd DWORD PTR \[rdx-0x200\],ecx,ebx
-\s*[a-f0-9]+:\s*c4 a2 f9 e4 8c f5 00 00 00 10\s+cmpzxadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
-\s*[a-f0-9]+:\s*c4 c2 e1 e4 09\s+cmpzxadd QWORD PTR \[r9\],rcx,rbx
-\s*[a-f0-9]+:\s*c4 e2 f9 e4 89 f8 03 00 00\s+cmpzxadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
-\s*[a-f0-9]+:\s*c4 e2 e1 e4 8a 00 fc ff ff\s+cmpzxadd QWORD PTR \[rdx-0x400\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 a2 79 e4 8c f5 00 00 00 10\s+cmpexadd DWORD PTR \[rbp\+r14\*8\+0x10000000\],ecx,eax
+\s*[a-f0-9]+:\s*c4 c2 61 e4 09\s+cmpexadd DWORD PTR \[r9\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 e2 79 e4 89 fc 01 00 00\s+cmpexadd DWORD PTR \[rcx\+0x1fc\],ecx,eax
+\s*[a-f0-9]+:\s*c4 e2 61 e4 8a 00 fe ff ff\s+cmpexadd DWORD PTR \[rdx-0x200\],ecx,ebx
+\s*[a-f0-9]+:\s*c4 a2 f9 e4 8c f5 00 00 00 10\s+cmpexadd QWORD PTR \[rbp\+r14\*8\+0x10000000\],rcx,rax
+\s*[a-f0-9]+:\s*c4 c2 e1 e4 09\s+cmpexadd QWORD PTR \[r9\],rcx,rbx
+\s*[a-f0-9]+:\s*c4 e2 f9 e4 89 f8 03 00 00\s+cmpexadd QWORD PTR \[rcx\+0x3f8\],rcx,rax
+\s*[a-f0-9]+:\s*c4 e2 e1 e4 8a 00 fc ff ff\s+cmpexadd QWORD PTR \[rdx-0x400\],rcx,rbx
 #pass

diff --git a/gas/testsuite/gas/i386/x86-64-cmpccxadd.d b/gas/testsuite/gas/i386/x86-64-cmpccxadd.d
index 793ad1aca3ac36d9e2828bb79998f98322657edc..f8d29a746cdd6e46feef3158cf4531530777b91c 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-cmpccxadd.d
+++ b/gas/testsuite/gas/i386/x86-64-cmpccxadd.d
@@ -39,38 +39,38 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 ec 09\s+cmplxadd %rbx,%rcx,\(%r9\)
 \s*[a-f0-9]+:\s*c4 e2 f9 ec 89 f8 03 00 00\s+cmplxadd %rax,%rcx,0x3f8\(%rcx\)
 \s*[a-f0-9]+:\s*c4 e2 e1 ec 8a 00 fc ff ff\s+cmplxadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 e7 8c f5 00 00 00 10\s+cmpnbexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 e7 09\s+cmpnbexadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 e7 89 fc 01 00 00\s+cmpnbexadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 e7 8a 00 fe ff ff\s+cmpnbexadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 e7 8c f5 00 00 00 10\s+cmpnbexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 e7 09\s+cmpnbexadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 e7 89 f8 03 00 00\s+cmpnbexadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 e7 8a 00 fc ff ff\s+cmpnbexadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 e3 8c f5 00 00 00 10\s+cmpnbxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 e3 09\s+cmpnbxadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 e3 89 fc 01 00 00\s+cmpnbxadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 e3 8a 00 fe ff ff\s+cmpnbxadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 e3 8c f5 00 00 00 10\s+cmpnbxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 e3 09\s+cmpnbxadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 e3 89 f8 03 00 00\s+cmpnbxadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 e3 8a 00 fc ff ff\s+cmpnbxadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 ef 8c f5 00 00 00 10\s+cmpnlexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 ef 09\s+cmpnlexadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 ef 89 fc 01 00 00\s+cmpnlexadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 ef 8a 00 fe ff ff\s+cmpnlexadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 ef 8c f5 00 00 00 10\s+cmpnlexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 ef 09\s+cmpnlexadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 ef 89 f8 03 00 00\s+cmpnlexadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 ef 8a 00 fc ff ff\s+cmpnlexadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 ed 8c f5 00 00 00 10\s+cmpnlxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 ed 09\s+cmpnlxadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 ed 89 fc 01 00 00\s+cmpnlxadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 ed 8a 00 fe ff ff\s+cmpnlxadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 ed 8c f5 00 00 00 10\s+cmpnlxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 ed 09\s+cmpnlxadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 ed 89 f8 03 00 00\s+cmpnlxadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 ed 8a 00 fc ff ff\s+cmpnlxadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 e7 8c f5 00 00 00 10\s+cmpaxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 e7 09\s+cmpaxadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 e7 89 fc 01 00 00\s+cmpaxadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 e7 8a 00 fe ff ff\s+cmpaxadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 e7 8c f5 00 00 00 10\s+cmpaxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 e7 09\s+cmpaxadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 e7 89 f8 03 00 00\s+cmpaxadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 e7 8a 00 fc ff ff\s+cmpaxadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 e3 8c f5 00 00 00 10\s+cmpaexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 e3 09\s+cmpaexadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 e3 89 fc 01 00 00\s+cmpaexadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 e3 8a 00 fe ff ff\s+cmpaexadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 e3 8c f5 00 00 00 10\s+cmpaexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 e3 09\s+cmpaexadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 e3 89 f8 03 00 00\s+cmpaexadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 e3 8a 00 fc ff ff\s+cmpaexadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 ef 8c f5 00 00 00 10\s+cmpgxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 ef 09\s+cmpgxadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 ef 89 fc 01 00 00\s+cmpgxadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 ef 8a 00 fe ff ff\s+cmpgxadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 ef 8c f5 00 00 00 10\s+cmpgxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 ef 09\s+cmpgxadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 ef 89 f8 03 00 00\s+cmpgxadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 ef 8a 00 fc ff ff\s+cmpgxadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 ed 8c f5 00 00 00 10\s+cmpgexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 ed 09\s+cmpgexadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 ed 89 fc 01 00 00\s+cmpgexadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 ed 8a 00 fe ff ff\s+cmpgexadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 ed 8c f5 00 00 00 10\s+cmpgexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 ed 09\s+cmpgexadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 ed 89 f8 03 00 00\s+cmpgexadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 ed 8a 00 fc ff ff\s+cmpgexadd %rbx,%rcx,-0x400\(%rdx\)
 \s*[a-f0-9]+:\s*c4 a2 79 e1 8c f5 00 00 00 10\s+cmpnoxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
 \s*[a-f0-9]+:\s*c4 c2 61 e1 09\s+cmpnoxadd %ebx,%ecx,\(%r9\)
 \s*[a-f0-9]+:\s*c4 e2 79 e1 89 fc 01 00 00\s+cmpnoxadd %eax,%ecx,0x1fc\(%rcx\)
@@ -95,14 +95,14 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 e9 09\s+cmpnsxadd %rbx,%rcx,\(%r9\)
 \s*[a-f0-9]+:\s*c4 e2 f9 e9 89 f8 03 00 00\s+cmpnsxadd %rax,%rcx,0x3f8\(%rcx\)
 \s*[a-f0-9]+:\s*c4 e2 e1 e9 8a 00 fc ff ff\s+cmpnsxadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 e5 8c f5 00 00 00 10\s+cmpnzxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 e5 09\s+cmpnzxadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 e5 89 fc 01 00 00\s+cmpnzxadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 e5 8a 00 fe ff ff\s+cmpnzxadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 e5 8c f5 00 00 00 10\s+cmpnzxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 e5 09\s+cmpnzxadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 e5 89 f8 03 00 00\s+cmpnzxadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 e5 8a 00 fc ff ff\s+cmpnzxadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 e5 8c f5 00 00 00 10\s+cmpnexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 e5 09\s+cmpnexadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 e5 89 fc 01 00 00\s+cmpnexadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 e5 8a 00 fe ff ff\s+cmpnexadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 e5 8c f5 00 00 00 10\s+cmpnexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 e5 09\s+cmpnexadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 e5 89 f8 03 00 00\s+cmpnexadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 e5 8a 00 fc ff ff\s+cmpnexadd %rbx,%rcx,-0x400\(%rdx\)
 \s*[a-f0-9]+:\s*c4 a2 79 e0 8c f5 00 00 00 10\s+cmpoxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
 \s*[a-f0-9]+:\s*c4 c2 61 e0 09\s+cmpoxadd %ebx,%ecx,\(%r9\)
 \s*[a-f0-9]+:\s*c4 e2 79 e0 89 fc 01 00 00\s+cmpoxadd %eax,%ecx,0x1fc\(%rcx\)
@@ -127,14 +127,14 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 e8 09\s+cmpsxadd %rbx,%rcx,\(%r9\)
 \s*[a-f0-9]+:\s*c4 e2 f9 e8 89 f8 03 00 00\s+cmpsxadd %rax,%rcx,0x3f8\(%rcx\)
 \s*[a-f0-9]+:\s*c4 e2 e1 e8 8a 00 fc ff ff\s+cmpsxadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 e4 8c f5 00 00 00 10\s+cmpzxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 e4 09\s+cmpzxadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 e4 89 fc 01 00 00\s+cmpzxadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 e4 8a 00 fe ff ff\s+cmpzxadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 e4 8c f5 00 00 00 10\s+cmpzxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 e4 09\s+cmpzxadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 e4 89 f8 03 00 00\s+cmpzxadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 e4 8a 00 fc ff ff\s+cmpzxadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 e4 8c f5 00 00 00 10\s+cmpexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 e4 09\s+cmpexadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 e4 89 fc 01 00 00\s+cmpexadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 e4 8a 00 fe ff ff\s+cmpexadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 e4 8c f5 00 00 00 10\s+cmpexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 e4 09\s+cmpexadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 e4 89 f8 03 00 00\s+cmpexadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 e4 8a 00 fc ff ff\s+cmpexadd %rbx,%rcx,-0x400\(%rdx\)
 \s*[a-f0-9]+:\s*c4 a2 79 e6 8c f5 00 00 00 10\s+cmpbexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
 \s*[a-f0-9]+:\s*c4 c2 61 e6 09\s+cmpbexadd %ebx,%ecx,\(%r9\)
 \s*[a-f0-9]+:\s*c4 e2 79 e6 89 fc 01 00 00\s+cmpbexadd %eax,%ecx,0x1fc\(%rcx\)
@@ -167,38 +167,38 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 ec 09\s+cmplxadd %rbx,%rcx,\(%r9\)
 \s*[a-f0-9]+:\s*c4 e2 f9 ec 89 f8 03 00 00\s+cmplxadd %rax,%rcx,0x3f8\(%rcx\)
 \s*[a-f0-9]+:\s*c4 e2 e1 ec 8a 00 fc ff ff\s+cmplxadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 e7 8c f5 00 00 00 10\s+cmpnbexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 e7 09\s+cmpnbexadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 e7 89 fc 01 00 00\s+cmpnbexadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 e7 8a 00 fe ff ff\s+cmpnbexadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 e7 8c f5 00 00 00 10\s+cmpnbexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 e7 09\s+cmpnbexadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 e7 89 f8 03 00 00\s+cmpnbexadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 e7 8a 00 fc ff ff\s+cmpnbexadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 e3 8c f5 00 00 00 10\s+cmpnbxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 e3 09\s+cmpnbxadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 e3 89 fc 01 00 00\s+cmpnbxadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 e3 8a 00 fe ff ff\s+cmpnbxadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 e3 8c f5 00 00 00 10\s+cmpnbxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 e3 09\s+cmpnbxadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 e3 89 f8 03 00 00\s+cmpnbxadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 e3 8a 00 fc ff ff\s+cmpnbxadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 ef 8c f5 00 00 00 10\s+cmpnlexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 ef 09\s+cmpnlexadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 ef 89 fc 01 00 00\s+cmpnlexadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 ef 8a 00 fe ff ff\s+cmpnlexadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 ef 8c f5 00 00 00 10\s+cmpnlexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 ef 09\s+cmpnlexadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 ef 89 f8 03 00 00\s+cmpnlexadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 ef 8a 00 fc ff ff\s+cmpnlexadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 ed 8c f5 00 00 00 10\s+cmpnlxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 ed 09\s+cmpnlxadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 ed 89 fc 01 00 00\s+cmpnlxadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 ed 8a 00 fe ff ff\s+cmpnlxadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 ed 8c f5 00 00 00 10\s+cmpnlxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 ed 09\s+cmpnlxadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 ed 89 f8 03 00 00\s+cmpnlxadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 ed 8a 00 fc ff ff\s+cmpnlxadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 e7 8c f5 00 00 00 10\s+cmpaxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 e7 09\s+cmpaxadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 e7 89 fc 01 00 00\s+cmpaxadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 e7 8a 00 fe ff ff\s+cmpaxadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 e7 8c f5 00 00 00 10\s+cmpaxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 e7 09\s+cmpaxadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 e7 89 f8 03 00 00\s+cmpaxadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 e7 8a 00 fc ff ff\s+cmpaxadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 e3 8c f5 00 00 00 10\s+cmpaexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 e3 09\s+cmpaexadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 e3 89 fc 01 00 00\s+cmpaexadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 e3 8a 00 fe ff ff\s+cmpaexadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 e3 8c f5 00 00 00 10\s+cmpaexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 e3 09\s+cmpaexadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 e3 89 f8 03 00 00\s+cmpaexadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 e3 8a 00 fc ff ff\s+cmpaexadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 ef 8c f5 00 00 00 10\s+cmpgxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 ef 09\s+cmpgxadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 ef 89 fc 01 00 00\s+cmpgxadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 ef 8a 00 fe ff ff\s+cmpgxadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 ef 8c f5 00 00 00 10\s+cmpgxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 ef 09\s+cmpgxadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 ef 89 f8 03 00 00\s+cmpgxadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 ef 8a 00 fc ff ff\s+cmpgxadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 ed 8c f5 00 00 00 10\s+cmpgexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 ed 09\s+cmpgexadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 ed 89 fc 01 00 00\s+cmpgexadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 ed 8a 00 fe ff ff\s+cmpgexadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 ed 8c f5 00 00 00 10\s+cmpgexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 ed 09\s+cmpgexadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 ed 89 f8 03 00 00\s+cmpgexadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 ed 8a 00 fc ff ff\s+cmpgexadd %rbx,%rcx,-0x400\(%rdx\)
 \s*[a-f0-9]+:\s*c4 a2 79 e1 8c f5 00 00 00 10\s+cmpnoxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
 \s*[a-f0-9]+:\s*c4 c2 61 e1 09\s+cmpnoxadd %ebx,%ecx,\(%r9\)
 \s*[a-f0-9]+:\s*c4 e2 79 e1 89 fc 01 00 00\s+cmpnoxadd %eax,%ecx,0x1fc\(%rcx\)
@@ -223,14 +223,14 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 e9 09\s+cmpnsxadd %rbx,%rcx,\(%r9\)
 \s*[a-f0-9]+:\s*c4 e2 f9 e9 89 f8 03 00 00\s+cmpnsxadd %rax,%rcx,0x3f8\(%rcx\)
 \s*[a-f0-9]+:\s*c4 e2 e1 e9 8a 00 fc ff ff\s+cmpnsxadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 e5 8c f5 00 00 00 10\s+cmpnzxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 e5 09\s+cmpnzxadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 e5 89 fc 01 00 00\s+cmpnzxadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 e5 8a 00 fe ff ff\s+cmpnzxadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 e5 8c f5 00 00 00 10\s+cmpnzxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 e5 09\s+cmpnzxadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 e5 89 f8 03 00 00\s+cmpnzxadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 e5 8a 00 fc ff ff\s+cmpnzxadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 e5 8c f5 00 00 00 10\s+cmpnexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 e5 09\s+cmpnexadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 e5 89 fc 01 00 00\s+cmpnexadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 e5 8a 00 fe ff ff\s+cmpnexadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 e5 8c f5 00 00 00 10\s+cmpnexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 e5 09\s+cmpnexadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 e5 89 f8 03 00 00\s+cmpnexadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 e5 8a 00 fc ff ff\s+cmpnexadd %rbx,%rcx,-0x400\(%rdx\)
 \s*[a-f0-9]+:\s*c4 a2 79 e0 8c f5 00 00 00 10\s+cmpoxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
 \s*[a-f0-9]+:\s*c4 c2 61 e0 09\s+cmpoxadd %ebx,%ecx,\(%r9\)
 \s*[a-f0-9]+:\s*c4 e2 79 e0 89 fc 01 00 00\s+cmpoxadd %eax,%ecx,0x1fc\(%rcx\)
@@ -255,12 +255,12 @@ Disassembly of section \.text:
 \s*[a-f0-9]+:\s*c4 c2 e1 e8 09\s+cmpsxadd %rbx,%rcx,\(%r9\)
 \s*[a-f0-9]+:\s*c4 e2 f9 e8 89 f8 03 00 00\s+cmpsxadd %rax,%rcx,0x3f8\(%rcx\)
 \s*[a-f0-9]+:\s*c4 e2 e1 e8 8a 00 fc ff ff\s+cmpsxadd %rbx,%rcx,-0x400\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 79 e4 8c f5 00 00 00 10\s+cmpzxadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 61 e4 09\s+cmpzxadd %ebx,%ecx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 79 e4 89 fc 01 00 00\s+cmpzxadd %eax,%ecx,0x1fc\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 61 e4 8a 00 fe ff ff\s+cmpzxadd %ebx,%ecx,-0x200\(%rdx\)
-\s*[a-f0-9]+:\s*c4 a2 f9 e4 8c f5 00 00 00 10\s+cmpzxadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*c4 c2 e1 e4 09\s+cmpzxadd %rbx,%rcx,\(%r9\)
-\s*[a-f0-9]+:\s*c4 e2 f9 e4 89 f8 03 00 00\s+cmpzxadd %rax,%rcx,0x3f8\(%rcx\)
-\s*[a-f0-9]+:\s*c4 e2 e1 e4 8a 00 fc ff ff\s+cmpzxadd %rbx,%rcx,-0x400\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 79 e4 8c f5 00 00 00 10\s+cmpexadd %eax,%ecx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 61 e4 09\s+cmpexadd %ebx,%ecx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 79 e4 89 fc 01 00 00\s+cmpexadd %eax,%ecx,0x1fc\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 61 e4 8a 00 fe ff ff\s+cmpexadd %ebx,%ecx,-0x200\(%rdx\)
+\s*[a-f0-9]+:\s*c4 a2 f9 e4 8c f5 00 00 00 10\s+cmpexadd %rax,%rcx,0x10000000\(%rbp,%r14,8\)
+\s*[a-f0-9]+:\s*c4 c2 e1 e4 09\s+cmpexadd %rbx,%rcx,\(%r9\)
+\s*[a-f0-9]+:\s*c4 e2 f9 e4 89 f8 03 00 00\s+cmpexadd %rax,%rcx,0x3f8\(%rcx\)
+\s*[a-f0-9]+:\s*c4 e2 e1 e4 8a 00 fc ff ff\s+cmpexadd %rbx,%rcx,-0x400\(%rdx\)
 #pass

diff --git a/opcodes/i386-dis-evex-prefix.h b/opcodes/i386-dis-evex-prefix.h
index 947fd868dd64ece19ad584926fb0e8359b4657b5..0eba11d87de973d289719ef7ef03205b3e729dde 100644 (file)
--- a/opcodes/i386-dis-evex-prefix.h
+++ b/opcodes/i386-dis-evex-prefix.h
@@ -338,117 +338,12 @@
     { "vcmpp%XH", { MaskG, Vex, EXxh, EXxEVexS, CMP }, 0 },
     { "vcmps%XH", { MaskG, VexScalar, EXw, EXxEVexS, CMP }, 0 },
   },
-  /* PREFIX_EVEX_MAP4_40 */
+  /* PREFIX_EVEX_MAP4_4x */
   {
-    { "%CFcmovoS",     { VexGv, Gv, Ev }, 0 },
+    { "%CFcmov%CCS",   { VexGv, Gv, Ev }, 0 },
     { Bad_Opcode },
-    { "%CFcmovoS",     { VexGv, Gv, Ev }, 0 },
-    { "set%ZUo",       { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_41 */
-  {
-    { "%CFcmovnoS",    { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovnoS",    { VexGv, Gv, Ev }, 0 },
-    { "set%ZUno",      { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_42 */
-  {
-    { "%CFcmovbS",     { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovbS",     { VexGv, Gv, Ev }, 0 },
-    { "set%ZUb",       { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_43 */
-  {
-    { "%CFcmovaeS",    { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovaeS",    { VexGv, Gv, Ev }, 0 },
-    { "set%ZUae",      { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_44 */
-  {
-    { "%CFcmoveS",     { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmoveS",     { VexGv, Gv, Ev }, 0 },
-    { "set%ZUe",       { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_45 */
-  {
-    { "%CFcmovneS",    { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovneS",    { VexGv, Gv, Ev }, 0 },
-    { "set%ZUne",      { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_46 */
-  {
-    { "%CFcmovbeS",    { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovbeS",    { VexGv, Gv, Ev }, 0 },
-    { "set%ZUbe",      { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_47 */
-  {
-    { "%CFcmovaS",     { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovaS",     { VexGv, Gv, Ev }, 0 },
-    { "set%ZUa",       { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_48 */
-  {
-    { "%CFcmovsS",     { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovsS",     { VexGv, Gv, Ev }, 0 },
-    { "set%ZUs",       { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_49 */
-  {
-    { "%CFcmovnsS",    { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovnsS",    { VexGv, Gv, Ev }, 0 },
-    { "set%ZUns",      { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_4A */
-  {
-    { "%CFcmovpS",     { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovpS",     { VexGv, Gv, Ev }, 0 },
-    { "set%ZUp",       { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_4B */
-  {
-    { "%CFcmovnpS",    { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovnpS",    { VexGv, Gv, Ev }, 0 },
-    { "set%ZUnp",      { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_4C */
-  {
-    { "%CFcmovlS",     { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovlS",     { VexGv, Gv, Ev }, 0 },
-    { "set%ZUl",       { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_4D */
-  {
-    { "%CFcmovgeS",    { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovgeS",    { VexGv, Gv, Ev }, 0 },
-    { "set%ZUge",      { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_4E */
-  {
-    { "%CFcmovleS",    { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovleS",    { VexGv, Gv, Ev }, 0 },
-    { "set%ZUle",      { Eb }, 0 },
-  },
-  /* PREFIX_EVEX_MAP4_4F */
-  {
-    { "%CFcmovgS",     { VexGv, Gv, Ev }, 0 },
-    { Bad_Opcode },
-    { "%CFcmovgS",     { VexGv, Gv, Ev }, 0 },
-    { "set%ZUg",       { Eb }, 0 },
+    { "%CFcmov%CCS",   { VexGv, Gv, Ev }, 0 },
+    { "set%ZU%CC",     { Eb }, 0 },
   },
   /* PREFIX_EVEX_MAP4_F0 */
   {

diff --git a/opcodes/i386-dis-evex.h b/opcodes/i386-dis-evex.h
index ebb3cc20aeafa6c1139c94e74aa5dabea08ec08a..a3d3fbe204d7636eb56495eaef60eb38f57be1cc 100644 (file)
--- a/opcodes/i386-dis-evex.h
+++ b/opcodes/i386-dis-evex.h
@@ -545,23 +545,23 @@ static const struct dis386 evex_table[][256] = {
     { "%XEvaesdecY",   { XM, Vex, EXx }, PREFIX_DATA },
     { "%XEvaesdeclastY", { XM, Vex, EXx }, PREFIX_DATA },
     /* E0 */
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38E0) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38E1) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38E2) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38E3) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38E4) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38E5) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38E6) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38E7) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
     /* E8 */
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38E8) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38E9) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38EA) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38EB) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38EC) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38ED) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38EE) },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38EF) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F38Ex) },
     /* F0 */
     { Bad_Opcode },
     { Bad_Opcode },
@@ -947,23 +947,23 @@ static const struct dis386 evex_table[][256] = {
     { Bad_Opcode },
     { Bad_Opcode },
     /* 40 */
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_40) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_41) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_42) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_43) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_44) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_45) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_46) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_47) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
     /* 48 */
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_48) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_49) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4A) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4B) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4C) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4D) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4E) },
-    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4F) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
+    { PREFIX_TABLE (PREFIX_EVEX_MAP4_4x) },
     /* 50 */
     { Bad_Opcode },
     { Bad_Opcode },

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 46441974bb8dbbdfc873cabec3201d2f89e5db75..5e9e53c49393aecb1725af3cafd205b132905c94 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -160,6 +160,7 @@ struct instr_info
   unsigned char rex2_payload;
 
   bool need_modrm;
+  unsigned char condition_code;
   unsigned char need_vex;
   bool has_sib;
 
@@ -1199,22 +1200,7 @@ enum
   PREFIX_EVEX_0F3A67,
   PREFIX_EVEX_0F3AC2,
 
-  PREFIX_EVEX_MAP4_40,
-  PREFIX_EVEX_MAP4_41,
-  PREFIX_EVEX_MAP4_42,
-  PREFIX_EVEX_MAP4_43,
-  PREFIX_EVEX_MAP4_44,
-  PREFIX_EVEX_MAP4_45,
-  PREFIX_EVEX_MAP4_46,
-  PREFIX_EVEX_MAP4_47,
-  PREFIX_EVEX_MAP4_48,
-  PREFIX_EVEX_MAP4_49,
-  PREFIX_EVEX_MAP4_4A,
-  PREFIX_EVEX_MAP4_4B,
-  PREFIX_EVEX_MAP4_4C,
-  PREFIX_EVEX_MAP4_4D,
-  PREFIX_EVEX_MAP4_4E,
-  PREFIX_EVEX_MAP4_4F,
+  PREFIX_EVEX_MAP4_4x,
   PREFIX_EVEX_MAP4_F0,
   PREFIX_EVEX_MAP4_F1,
   PREFIX_EVEX_MAP4_F2,
@@ -1315,22 +1301,7 @@ enum
   X86_64_VEX_0F385C,
   X86_64_VEX_0F385E,
   X86_64_VEX_0F386C,
-  X86_64_VEX_0F38E0,
-  X86_64_VEX_0F38E1,
-  X86_64_VEX_0F38E2,
-  X86_64_VEX_0F38E3,
-  X86_64_VEX_0F38E4,
-  X86_64_VEX_0F38E5,
-  X86_64_VEX_0F38E6,
-  X86_64_VEX_0F38E7,
-  X86_64_VEX_0F38E8,
-  X86_64_VEX_0F38E9,
-  X86_64_VEX_0F38EA,
-  X86_64_VEX_0F38EB,
-  X86_64_VEX_0F38EC,
-  X86_64_VEX_0F38ED,
-  X86_64_VEX_0F38EE,
-  X86_64_VEX_0F38EF,
+  X86_64_VEX_0F38Ex,
 
   X86_64_VEX_MAP7_F8_L_0_W_0_R_0,
 };
@@ -1816,6 +1787,7 @@ struct dis386 {
          nothing otherwise; behave as 'P' in all other cases
 
    2 upper case letter macros:
+   "CC" => print condition code
    "XY" => print 'x' or 'y' if suffix_always is true or no register
           operands and no broadcast.
    "XZ" => print 'x', 'y', or 'z' if suffix_always is true or no
@@ -4512,100 +4484,10 @@ static const struct dis386 x86_64_table[][2] = {
     { VEX_LEN_TABLE (VEX_LEN_0F386C_X86_64) },
   },
 
-  /* X86_64_VEX_0F38E0 */
+  /* X86_64_VEX_0F38Ex */
   {
     { Bad_Opcode },
-    { "%XEcmpoxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38E1 */
-  {
-    { Bad_Opcode },
-    { "%XEcmpnoxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38E2 */
-  {
-    { Bad_Opcode },
-    { "%XEcmpbxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38E3 */
-  {
-    { Bad_Opcode },
-    { "%XEcmpnbxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38E4 */
-  {
-    { Bad_Opcode },
-    { "%XEcmpzxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38E5 */
-  {
-    { Bad_Opcode },
-    { "%XEcmpnzxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38E6 */
-  {
-    { Bad_Opcode },
-    { "%XEcmpbexadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38E7 */
-  {
-    { Bad_Opcode },
-    { "%XEcmpnbexadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38E8 */
-  {
-    { Bad_Opcode },
-    { "%XEcmpsxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38E9 */
-  {
-    { Bad_Opcode },
-    { "%XEcmpnsxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38EA */
-  {
-    { Bad_Opcode },
-    { "%XEcmppxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38EB */
-  {
-    { Bad_Opcode },
-    { "%XEcmpnpxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38EC */
-  {
-    { Bad_Opcode },
-    { "%XEcmplxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38ED */
-  {
-    { Bad_Opcode },
-    { "%XEcmpnlxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38EE */
-  {
-    { Bad_Opcode },
-    { "%XEcmplexadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
-  },
-
-  /* X86_64_VEX_0F38EF */
-  {
-    { Bad_Opcode },
-    { "%XEcmpnlexadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
+    { "%XEcmp%CCxadd", { Mdq, Gdq, VexGdq }, PREFIX_DATA },
   },
 
   /* X86_64_VEX_MAP7_F8_L_0_W_0_R_0 */
@@ -6624,23 +6506,23 @@ static const struct dis386 vex_table[][256] = {
     { "vaesdec",       { XM, Vex, EXx }, PREFIX_DATA },
     { "vaesdeclast",   { XM, Vex, EXx }, PREFIX_DATA },
     /* e0 */
-    { X86_64_TABLE (X86_64_VEX_0F38E0) },
-    { X86_64_TABLE (X86_64_VEX_0F38E1) },
-    { X86_64_TABLE (X86_64_VEX_0F38E2) },
-    { X86_64_TABLE (X86_64_VEX_0F38E3) },
-    { X86_64_TABLE (X86_64_VEX_0F38E4) },
-    { X86_64_TABLE (X86_64_VEX_0F38E5) },
-    { X86_64_TABLE (X86_64_VEX_0F38E6) },
-    { X86_64_TABLE (X86_64_VEX_0F38E7) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
     /* e8 */
-    { X86_64_TABLE (X86_64_VEX_0F38E8) },
-    { X86_64_TABLE (X86_64_VEX_0F38E9) },
-    { X86_64_TABLE (X86_64_VEX_0F38EA) },
-    { X86_64_TABLE (X86_64_VEX_0F38EB) },
-    { X86_64_TABLE (X86_64_VEX_0F38EC) },
-    { X86_64_TABLE (X86_64_VEX_0F38ED) },
-    { X86_64_TABLE (X86_64_VEX_0F38EE) },
-    { X86_64_TABLE (X86_64_VEX_0F38EF) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
+    { X86_64_TABLE (X86_64_VEX_0F38Ex) },
     /* f0 */
     { Bad_Opcode },
     { Bad_Opcode },
@@ -9031,6 +8913,7 @@ get_valid_dis386 (const struct dis386 *dp, instr_info *ins)
       ins->need_vex = 3;
       ins->codep++;
       vindex = *ins->codep++;
+      ins->condition_code = vindex & 0xf;
       if (vex_table_index != VEX_MAP7)
        dp = &vex_table[vex_table_index][vindex];
       else if (vindex == 0xf8)
@@ -9199,6 +9082,7 @@ get_valid_dis386 (const struct dis386 *dp, instr_info *ins)
 
       ins->codep++;
       vindex = *ins->codep++;
+      ins->condition_code = vindex & 0xf;
       if (vex_table_index != EVEX_MAP7)
        dp = &evex_table[vex_table_index][vindex];
       else if (vindex == 0xf8)
@@ -9591,6 +9475,7 @@ print_insn (bfd_vma pc, disassemble_info *info, int intel_syntax)
       dp = &dis386[*ins.codep];
       ins.need_modrm = onebyte_has_modrm[*ins.codep];
     }
+  ins.condition_code = *ins.codep & 0xf;
   ins.codep++;
 
   /* Save sizeflag for printing the extra ins.prefixes later before updating
@@ -10505,6 +10390,16 @@ putop (instr_info *ins, const char *in_template, int sizeflag)
            abort ();
          break;
        case 'C':
+         if (l == 1 && last[0] == 'C')
+           {
+             /* Condition code (taken from the map-0 Jcc entries).  */
+             for (const char *q = dis386[0x70 | ins->condition_code].name + 1;
+                  ISLOWER(*q); ++q)
+               *ins->obufp++ = *q;
+             break;
+           }
+         if (l)
+           abort ();
          if (ins->intel_syntax && !alt)
            break;
          if ((ins->prefixes & PREFIX_DATA) || (sizeflag & SUFFIX_ALWAYS))