From bdd7c8fc34dc65806ec14df84c76e17690a16f50 Mon Sep 17 00:00:00 2001 From: Igor Tsimbalist Date: Tue, 17 Apr 2018 13:57:34 +0200 Subject: [PATCH] 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. --- gas/ChangeLog | 9 +++++++++ gas/testsuite/gas/i386/ilp32/x86-64-nops.d | 2 ++ gas/testsuite/gas/i386/nops.d | 2 ++ gas/testsuite/gas/i386/nops.s | 4 ++-- gas/testsuite/gas/i386/x86-64-nops.d | 2 ++ gas/testsuite/gas/i386/x86-64-nops.s | 4 ++-- 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index ca54c4d66f..c16ea00655 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2018-04-17 Igor Tsimbalist + + * 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 * 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 5461611778..a497115b4e 100644 --- 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 e6212e4102..5275973bc3 100644 --- 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 c75e8ce155..a6177cc01f 100644 --- 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 57091aaf3c..8c6312d08a 100644 --- 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 57851ee5ca..d954ed1894 100644 --- 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 -- 2.34.1