x86/Intel: correct CMPSD test cases' regexp closing paren placement

The CMPS test case derivation from their MOVS counterparts I did in
d241b91073 ("x86/Intel: correct MOVSD and CMPSD handling") ended up
with misplaced closing parentheses in som regexps. Correct this.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a442e2a71e3e2ff5ad0b1cc1983a815546a384b6..147d29c9143411cd5db6e29257ef26ae695b8a76 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-14  Jan Beulich  <jbeulich@suse.com>
+
+       * testsuite/gas/i386/intel-cmps32.d,
+       testsuite/gas/i386/intel-cmps64.d: Correct regexp closing
+       parentheses placement.
+
 2019-11-14  Jan Beulich  <jbeulich@suse.com>
 
        * testsuite/gas/i386/intel-cmps.s,

diff --git a/gas/testsuite/gas/i386/intel-cmps32.d b/gas/testsuite/gas/i386/intel-cmps32.d
index 843ba80fc949716877be7be405cb709046f51827..804100f85d94839b4f372da97f66ebfdf38f7a07 100644 (file)
--- a/gas/testsuite/gas/i386/intel-cmps32.d
+++ b/gas/testsuite/gas/i386/intel-cmps32.d
@@ -7,16 +7,16 @@
 Disassembly of section .text:
 
 0+ <cmps>:
-[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\]),(BYTE PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\]),(BYTE PTR )?es:\[edi\]
+[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\])
 [      ]*[a-f0-9]+:    64 a6 * cmps +BYTE PTR fs:\[esi\],(BYTE PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\]),(BYTE PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\]),(BYTE PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\]),(BYTE PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\]),(BYTE PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\]),(BYTE PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\]),(BYTE PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\]),(BYTE PTR )?es:\[edi\]
+[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\])
 [      ]*[a-f0-9]+:    67 a6 * cmps +BYTE PTR (ds:)?\[si\],(BYTE PTR )?es:\[di\]
 [      ]*[a-f0-9]+:    64 67 a6 *      cmps +BYTE PTR fs:\[si\],(BYTE PTR )?es:\[di\]
 [      ]*[a-f0-9]+:    67 a6 * cmps +BYTE PTR (ds:)?\[si\],(BYTE PTR )?es:\[di\]
@@ -26,16 +26,16 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    67 a6 * cmps +BYTE PTR (ds:)?\[si\],(BYTE PTR )?es:\[di\]
 [      ]*[a-f0-9]+:    67 a6 * cmps +BYTE PTR (ds:)?\[si\],(BYTE PTR )?es:\[di\]
 [      ]*[a-f0-9]+:    67 a6 * cmps +BYTE PTR (ds:)?\[si\],(BYTE PTR )?es:\[di\]
-[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\]),(WORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\]),(WORD PTR )?es:\[edi\]
+[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\])
 [      ]*[a-f0-9]+:    64 66 a7 *      cmps +WORD PTR fs:\[esi\],(WORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\]),(WORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\]),(WORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\]),(WORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\]),(WORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\]),(WORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\]),(WORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\]),(WORD PTR )?es:\[edi\]
+[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\])
 [      ]*[a-f0-9]+:    67 66 a7 *      cmps +WORD PTR (ds:)?\[si\],(WORD PTR )?es:\[di\]
 [      ]*[a-f0-9]+:    64 67 66 a7 *   cmps +WORD PTR fs:\[si\],(WORD PTR )?es:\[di\]
 [      ]*[a-f0-9]+:    67 66 a7 *      cmps +WORD PTR (ds:)?\[si\],(WORD PTR )?es:\[di\]
@@ -45,16 +45,16 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    67 66 a7 *      cmps +WORD PTR (ds:)?\[si\],(WORD PTR )?es:\[di\]
 [      ]*[a-f0-9]+:    67 66 a7 *      cmps +WORD PTR (ds:)?\[si\],(WORD PTR )?es:\[di\]
 [      ]*[a-f0-9]+:    67 66 a7 *      cmps +WORD PTR (ds:)?\[si\],(WORD PTR )?es:\[di\]
-[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\]),(DWORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\]),(DWORD PTR )?es:\[edi\]
+[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\])
 [      ]*[a-f0-9]+:    64 a7 * cmps +DWORD PTR fs:?\[esi\],(DWORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\]),(DWORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\]),(DWORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\]),(DWORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\]),(DWORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\]),(DWORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\]),(DWORD PTR )?es:\[edi\]
-[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\]),(DWORD PTR )?es:\[edi\]
+[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\])
+[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\])
 [      ]*[a-f0-9]+:    67 a7 * cmps +DWORD PTR (ds:)?\[si\],(DWORD PTR )?es:\[di\]
 [      ]*[a-f0-9]+:    64 67 a7 *      cmps +DWORD PTR fs:?\[si\],(DWORD PTR )?es:\[di\]
 [      ]*[a-f0-9]+:    67 a7 * cmps +DWORD PTR (ds:)?\[si\],(DWORD PTR )?es:\[di\]

diff --git a/gas/testsuite/gas/i386/intel-cmps64.d b/gas/testsuite/gas/i386/intel-cmps64.d
index 2a79197df0af46968fe7e209647731824b8daa69..efd8839e11bf0f0a7ccf5767984cd23dfb5cb003 100644 (file)
--- a/gas/testsuite/gas/i386/intel-cmps64.d
+++ b/gas/testsuite/gas/i386/intel-cmps64.d
@@ -7,7 +7,7 @@
 Disassembly of section .text:
 
 0+ <cmps>:
-[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[rsi\]),(BYTE PTR )?es:\[rdi\]
+[      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
 [      ]*[a-f0-9]+:    67 a6 * cmps +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\]
 [      ]*[a-f0-9]+:    64 67 a6 *      cmps +BYTE PTR fs:\[esi\],(BYTE PTR )?es:\[edi\]
 [      ]*[a-f0-9]+:    67 a6 * cmps +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\]
@@ -26,7 +26,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
 [      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
 [      ]*[a-f0-9]+:    a6 *    cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
-[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\]),(WORD PTR )?es:\[rdi\]
+[      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
 [      ]*[a-f0-9]+:    67 66 a7 *      cmps +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\]
 [      ]*[a-f0-9]+:    64 67 66 a7 *   cmps +WORD PTR fs:\[esi\],(WORD PTR )?es:\[edi\]
 [      ]*[a-f0-9]+:    67 66 a7 *      cmps +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\]
@@ -45,7 +45,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
 [      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
 [      ]*[a-f0-9]+:    66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
-[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[rsi\]),(DWORD PTR )?es:\[rdi\]
+[      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
 [      ]*[a-f0-9]+:    67 a7 * cmps +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\]
 [      ]*[a-f0-9]+:    64 67 a7 *      cmps +DWORD PTR fs:\[esi\],(DWORD PTR )?es:\[edi\]
 [      ]*[a-f0-9]+:    67 a7 * cmps +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\]
@@ -64,16 +64,16 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
 [      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
 [      ]*[a-f0-9]+:    a7 *    cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
-[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\]),(QWORD PTR )?es:\[rdi\]
-[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\]),(QWORD PTR )?es:\[rdi\]
+[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
+[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
 [      ]*[a-f0-9]+:    64 48 a7 *      cmps +QWORD PTR fs:?\[rsi\],(QWORD PTR )?es:\[rdi\]
-[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\]),(QWORD PTR )?es:\[rdi\]
-[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\]),(QWORD PTR )?es:\[rdi\]
-[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\]),(QWORD PTR )?es:\[rdi\]
-[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\]),(QWORD PTR )?es:\[rdi\]
-[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\]),(QWORD PTR )?es:\[rdi\]
-[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\]),(QWORD PTR )?es:\[rdi\]
-[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\]),(QWORD PTR )?es:\[rdi\]
+[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
+[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
+[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
+[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
+[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
+[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
+[      ]*[a-f0-9]+:    48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
 [      ]*[a-f0-9]+:    67 48 a7 *      cmps +QWORD PTR (ds:)?\[esi\],(QWORD PTR )?es:\[edi\]
 [      ]*[a-f0-9]+:    64 67 48 a7 *   cmps +QWORD PTR fs:?\[esi\],(QWORD PTR )?es:\[edi\]
 [      ]*[a-f0-9]+:    67 48 a7 *      cmps +QWORD PTR (ds:)?\[esi\],(QWORD PTR )?es:\[edi\]