Fix tests to avoid cldemote encoding.

gas/
	* testsuite/gas/i386/nops.s: Revert back deleted lines and
	change encoding to 0x0f1c /1 to map to NOP.
	* testsuite/gas/i386/x86-64-nops.s: Likewise.
	* testsuite/gas/i386/nops.d: Likewise.
	* testsuite/gas/i386/x86-64-nops.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops.d: Likewis.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ca54c4d66fbb3d72069782ebdfb562133174fd38..c16ea00655dd40e2eef8abd5256874dad94fac11 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2018-04-17  Igor Tsimbalist  <igor.v.tsimbalist@intel.com>
+
+       * testsuite/gas/i386/nops.s: Revert back deleted lines and
+       change encoding to 0x0f1c /1 to map to NOP.
+       * testsuite/gas/i386/x86-64-nops.s: Likewise.
+       * testsuite/gas/i386/nops.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops.d: Likewis.
+
 2018-04-17  Igor Tsimbalist  <igor.v.tsimbalist@intel.com>
 
        * config/tc-i386.c (cpu_arch): Add .cldemote.

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops.d
index 5461611778fa904ac339963ae41f7d4f61b4b8d7..a497115b4ec0707251a9e53ea01c9afa96c9fdcd 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops.d
@@ -33,10 +33,12 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    0f 1e 9c 1d 11 22 33 44         nopl   0x44332211\(%rbp,%rbx,1\)
 [      ]*[a-f0-9]+:    0f 1f 9c 1d 11 22 33 44         nopl   0x44332211\(%rbp,%rbx,1\)
 [      ]*[a-f0-9]+:    0f 19 04 60             nopl   \(%rax,%riz,2\)
+[      ]*[a-f0-9]+:    0f 1c 0c 60             nopl   \(%rax,%riz,2\)
 [      ]*[a-f0-9]+:    0f 1d 04 60             nopl   \(%rax,%riz,2\)
 [      ]*[a-f0-9]+:    0f 1e 04 60             nopl   \(%rax,%riz,2\)
 [      ]*[a-f0-9]+:    0f 1f 04 60             nopl   \(%rax,%riz,2\)
 [      ]*[a-f0-9]+:    0f 19 04 59             nopl   \(%rcx,%rbx,2\)
+[      ]*[a-f0-9]+:    0f 1c 0c 59             nopl   \(%rcx,%rbx,2\)
 [      ]*[a-f0-9]+:    0f 1d 04 59             nopl   \(%rcx,%rbx,2\)
 [      ]*[a-f0-9]+:    0f 1e 04 59             nopl   \(%rcx,%rbx,2\)
 [      ]*[a-f0-9]+:    0f 1f 04 59             nopl   \(%rcx,%rbx,2\)

diff --git a/gas/testsuite/gas/i386/nops.d b/gas/testsuite/gas/i386/nops.d
index e6212e41024a46cf7b2f065764abb102176b0c2d..5275973bc3c61f2550a53a69006e89e97ef87fdf 100644 (file)
--- a/gas/testsuite/gas/i386/nops.d
+++ b/gas/testsuite/gas/i386/nops.d
@@ -32,10 +32,12 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    0f 1e 9c 1d 11 22 33 44         nopl   0x44332211\(%ebp,%ebx,1\)
 [      ]*[a-f0-9]+:    0f 1f 9c 1d 11 22 33 44         nopl   0x44332211\(%ebp,%ebx,1\)
 [      ]*[a-f0-9]+:    0f 19 04 60             nopl   \(%eax,%eiz,2\)
+[      ]*[a-f0-9]+:    0f 1c 0c 60             nopl   \(%eax,%eiz,2\)
 [      ]*[a-f0-9]+:    0f 1d 04 60             nopl   \(%eax,%eiz,2\)
 [      ]*[a-f0-9]+:    0f 1e 04 60             nopl   \(%eax,%eiz,2\)
 [      ]*[a-f0-9]+:    0f 1f 04 60             nopl   \(%eax,%eiz,2\)
 [      ]*[a-f0-9]+:    0f 19 04 59             nopl   \(%ecx,%ebx,2\)
+[      ]*[a-f0-9]+:    0f 1c 0c 59             nopl   \(%ecx,%ebx,2\)
 [      ]*[a-f0-9]+:    0f 1d 04 59             nopl   \(%ecx,%ebx,2\)
 [      ]*[a-f0-9]+:    0f 1e 04 59             nopl   \(%ecx,%ebx,2\)
 [      ]*[a-f0-9]+:    0f 1f 04 59             nopl   \(%ecx,%ebx,2\)

diff --git a/gas/testsuite/gas/i386/nops.s b/gas/testsuite/gas/i386/nops.s
index c75e8ce15596af0c47ff4b54c8a105d4b8bac0cd..a6177cc01fdaf36bb2a1b8e3aab7febb8c18e05b 100644 (file)
--- a/gas/testsuite/gas/i386/nops.s
+++ b/gas/testsuite/gas/i386/nops.s
@@ -33,13 +33,13 @@
        .byte 0x0f, 0x1f, 0x9C, 0x1D, 0x11, 0x22, 0x33, 0x44
 
        .byte 0x0f, 0x19, 0x04, 0x60
-#      .byte 0x0f, 0x1c, 0x04, 0x60    Now it became cldemote (%eax,%eiz,2)
+       .byte 0x0f, 0x1c, 0x0c, 0x60
        .byte 0x0f, 0x1d, 0x04, 0x60
        .byte 0x0f, 0x1e, 0x04, 0x60
        .byte 0x0f, 0x1f, 0x04, 0x60
 
        .byte 0x0f, 0x19, 0x04, 0x59
-#      .byte 0x0f, 0x1c, 0x04, 0x59    Now it became cldemote (%eax,%ebx,2)
+       .byte 0x0f, 0x1c, 0x0c, 0x59
        .byte 0x0f, 0x1d, 0x04, 0x59
        .byte 0x0f, 0x1e, 0x04, 0x59
        .byte 0x0f, 0x1f, 0x04, 0x59

diff --git a/gas/testsuite/gas/i386/x86-64-nops.d b/gas/testsuite/gas/i386/x86-64-nops.d
index 57091aaf3c455dce158128860caee0a6f8d4ad47..8c6312d08af7217304bfa3acb0d7a66b0a5ad4c0 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops.d
+++ b/gas/testsuite/gas/i386/x86-64-nops.d
@@ -32,10 +32,12 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    0f 1e 9c 1d 11 22 33 44         nopl   0x44332211\(%rbp,%rbx,1\)
 [      ]*[a-f0-9]+:    0f 1f 9c 1d 11 22 33 44         nopl   0x44332211\(%rbp,%rbx,1\)
 [      ]*[a-f0-9]+:    0f 19 04 60             nopl   \(%rax,%riz,2\)
+[      ]*[a-f0-9]+:    0f 1c 0c 60             nopl   \(%rax,%riz,2\)
 [      ]*[a-f0-9]+:    0f 1d 04 60             nopl   \(%rax,%riz,2\)
 [      ]*[a-f0-9]+:    0f 1e 04 60             nopl   \(%rax,%riz,2\)
 [      ]*[a-f0-9]+:    0f 1f 04 60             nopl   \(%rax,%riz,2\)
 [      ]*[a-f0-9]+:    0f 19 04 59             nopl   \(%rcx,%rbx,2\)
+[      ]*[a-f0-9]+:    0f 1c 0c 59             nopl   \(%rcx,%rbx,2\)
 [      ]*[a-f0-9]+:    0f 1d 04 59             nopl   \(%rcx,%rbx,2\)
 [      ]*[a-f0-9]+:    0f 1e 04 59             nopl   \(%rcx,%rbx,2\)
 [      ]*[a-f0-9]+:    0f 1f 04 59             nopl   \(%rcx,%rbx,2\)

diff --git a/gas/testsuite/gas/i386/x86-64-nops.s b/gas/testsuite/gas/i386/x86-64-nops.s
index 57851ee5ca78ea496ef0b8c56cafbca29696c0aa..d954ed1894a51455428ffc3072de8907857612bb 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops.s
+++ b/gas/testsuite/gas/i386/x86-64-nops.s
@@ -33,13 +33,13 @@
        .byte 0x0f, 0x1f, 0x9C, 0x1D, 0x11, 0x22, 0x33, 0x44
 
        .byte 0x0f, 0x19, 0x04, 0x60
-#      .byte 0x0f, 0x1c, 0x04, 0x60    Now it became cldemote (%rcx,%riz,2)
+       .byte 0x0f, 0x1c, 0x0c, 0x60
        .byte 0x0f, 0x1d, 0x04, 0x60
        .byte 0x0f, 0x1e, 0x04, 0x60
        .byte 0x0f, 0x1f, 0x04, 0x60
 
        .byte 0x0f, 0x19, 0x04, 0x59
-#      .byte 0x0f, 0x1c, 0x04, 0x59    Now it became cldemote (%rcx,%rbx,2)
+       .byte 0x0f, 0x1c, 0x0c, 0x59
        .byte 0x0f, 0x1d, 0x04, 0x59
        .byte 0x0f, 0x1e, 0x04, 0x59
        .byte 0x0f, 0x1f, 0x04, 0x59