[binutils-gdb] x86: make 16-bit ENQCMD test actually test ENQCMD

[Jan Beulich]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c2f1204d1f7ceb36149d053509fce2f93733bd74

commit c2f1204d1f7ceb36149d053509fce2f93733bd74
Author: Jan Beulich <jbeulich@suse.com>
Date:   Tue Feb 16 11:26:58 2021 +0100

    x86: make 16-bit ENQCMD test actually test ENQCMD

Diff:
---
 gas/ChangeLog                         |  6 ++++++
 gas/testsuite/gas/i386/enqcmd-16bit.d | 27 ++++++++++++++++-----------
 gas/testsuite/gas/i386/enqcmd-16bit.s |  2 +-
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c74e63cd135..20bf4528983 100644
--- 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 04e8706d291..544490cdb45 100644
--- 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 1f21cec3634..48afe674f05 100644
--- 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"