x86: make 16-bit ENQCMD test actually test ENQCMD

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c74e63cd13520d97ee051970c0af9071b1561c58..20bf4528983e59ba1935036204ec6c73ec213f2d 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2021-02-16  Jan Beulich  <jbeulich@suse.com>
+
+       * testsuite/gas/i386/enqcmd-16bit.s: Include enqcmd.s, not
+       movdir.s.
+       * testsuite/gas/i386/enqcmd-16bit.d: Adjust expectations.
+
 2021-02-16  Alan Modra  <amodra@gmail.com>
 
        PR 27426

diff --git a/gas/testsuite/gas/i386/enqcmd-16bit.d b/gas/testsuite/gas/i386/enqcmd-16bit.d
index 04e8706d291010b4296e61a49f6df1ed4f854523..544490cdb45d4a74bbba6db45097b98ffca70af5 100644 (file)
--- a/gas/testsuite/gas/i386/enqcmd-16bit.d
+++ b/gas/testsuite/gas/i386/enqcmd-16bit.d
@@ -7,15 +7,20 @@
 Disassembly of section .text:
 
 0+ <_start>:
- +[a-f0-9]+:   67 0f 38 f9 01          movdiri %eax,\(%ecx\)
- +[a-f0-9]+:   67 66 0f 38 f8 01       movdir64b \(%ecx\),%eax
- +[a-f0-9]+:   66 0f 38 f8 04          movdir64b \(%si\),%ax
- +[a-f0-9]+:   66 0f 38 f8 0e 00 00    movdir64b 0x0,%cx
- +[a-f0-9]+:   66 0f 38 f8 0e 34 12    movdir64b 0x1234,%cx
- +[a-f0-9]+:   67 0f 38 f9 01          movdiri %eax,\(%ecx\)
- +[a-f0-9]+:   67 0f 38 f9 01          movdiri %eax,\(%ecx\)
- +[a-f0-9]+:   67 66 0f 38 f8 01       movdir64b \(%ecx\),%eax
- +[a-f0-9]+:   66 0f 38 f8 04          movdir64b \(%si\),%ax
- +[a-f0-9]+:   66 0f 38 f8 0e 00 00    movdir64b 0x0,%cx
- +[a-f0-9]+:   66 0f 38 f8 0e 34 12    movdir64b 0x1234,%cx
+ +[a-f0-9]+:   67 f2 0f 38 f8 01       enqcmd \(%ecx\),%eax
+ +[a-f0-9]+:   f2 0f 38 f8 04          enqcmd \(%si\),%ax
+ +[a-f0-9]+:   67 f3 0f 38 f8 01       enqcmds \(%ecx\),%eax
+ +[a-f0-9]+:   f3 0f 38 f8 04          enqcmds \(%si\),%ax
+ +[a-f0-9]+:   f2 0f 38 f8 0e 00 00    enqcmd 0x0,%cx
+ +[a-f0-9]+:   f2 0f 38 f8 0e 34 12    enqcmd 0x1234,%cx
+ +[a-f0-9]+:   f3 0f 38 f8 0e 00 00    enqcmds 0x0,%cx
+ +[a-f0-9]+:   f3 0f 38 f8 0e 34 12    enqcmds 0x1234,%cx
+ +[a-f0-9]+:   67 f2 0f 38 f8 01       enqcmd \(%ecx\),%eax
+ +[a-f0-9]+:   f2 0f 38 f8 04          enqcmd \(%si\),%ax
+ +[a-f0-9]+:   67 f3 0f 38 f8 01       enqcmds \(%ecx\),%eax
+ +[a-f0-9]+:   f3 0f 38 f8 04          enqcmds \(%si\),%ax
+ +[a-f0-9]+:   f2 0f 38 f8 0e 00 00    enqcmd 0x0,%cx
+ +[a-f0-9]+:   f2 0f 38 f8 0e 34 12    enqcmd 0x1234,%cx
+ +[a-f0-9]+:   f3 0f 38 f8 0e 00 00    enqcmds 0x0,%cx
+ +[a-f0-9]+:   f3 0f 38 f8 0e 34 12    enqcmds 0x1234,%cx
 #pass

diff --git a/gas/testsuite/gas/i386/enqcmd-16bit.s b/gas/testsuite/gas/i386/enqcmd-16bit.s
index 1f21cec363446a5e5ca0d2631ec51ee1896f9b43..48afe674f058843c26d5013c1d430e0370e70a80 100644 (file)
--- a/gas/testsuite/gas/i386/enqcmd-16bit.s
+++ b/gas/testsuite/gas/i386/enqcmd-16bit.s
@@ -1,4 +1,4 @@
 # Check ENQCMD[S] 16-bit instructions
 
        .code16
-.include "movdir.s"
+.include "enqcmd.s"