x86: also test alternative VMGEXIT encoding

gas/

	* testsuite/gas/i386/arch-13.s: Add alternative VMGEXIT case.
	* testsuite/gas/i386/arch-13.d: Extend -march=. Adjust
	expectations.

opcodes/

	* i386-dis.c (prefix_table): Revert the last vmgexit change.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5b2b1065b6fc9ea041cdfe6de400c8a74966af52..3e16a19e1c843c985a624b85757af6fb992f9126 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2020-06-18  Jan Beulich  <jbeulich@suse.com>
+
+       * testsuite/gas/i386/arch-13.s: Add alternative VMGEXIT case.
+       * testsuite/gas/i386/arch-13.d: Extend -march=. Adjust
+       expectations.
+
 2020-06-16  Lili Cui  <lili.cui@intel.com>
 
        * config/tc-i386.c (cpu_arch): Correct noavx512_vp2intersect

diff --git a/gas/testsuite/gas/i386/arch-13.d b/gas/testsuite/gas/i386/arch-13.d
index cbfc4a226824bd52dc8f3935bb486453fd6c5a0e..7a1278f86372a00356170226e8d590d320366421 100644 (file)
--- a/gas/testsuite/gas/i386/arch-13.d
+++ b/gas/testsuite/gas/i386/arch-13.d
@@ -1,4 +1,4 @@
-#as: -march=i686+smap+adx+rdseed+clzero+xsavec+xsaves+clflushopt+mwaitx+rdpid+clwb+wbnoinvd+rdpru+mcommit+sev_es
+#as: -march=i686+smap+adx+rdseed+clzero+xsavec+xsaves+clflushopt+mwaitx+rdpid+clwb+wbnoinvd+rdpru+mcommit+svme+sev_es
 #objdump: -dw
 #name: i386 arch 13
 
@@ -29,5 +29,6 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:[   ]*f3 0f c7 f8[  ]*rdpid  %eax
 [      ]*[a-f0-9]+:[   ]*0f 01 fd[     ]*rdpru[        ]*
 [      ]*[a-f0-9]+:[   ]*f3 0f 01 d9[  ]*vmgexit[      ]*
+[      ]*[a-f0-9]+:[   ]*f2 0f 01 d9[  ]*vmgexit[      ]*
 [      ]*[a-f0-9]+:[   ]*f3 0f 09[     ]*wbnoinvd[     ]*
 #pass

diff --git a/gas/testsuite/gas/i386/arch-13.s b/gas/testsuite/gas/i386/arch-13.s
index 5372d8555bb9e4b5a619386eade3d2a1de4a1a48..3a8074144063db38a7ea65b969c31c11b078fd0f 100644 (file)
--- a/gas/testsuite/gas/i386/arch-13.s
+++ b/gas/testsuite/gas/i386/arch-13.s
@@ -40,6 +40,7 @@
 
 # vmgexit instruction
        vmgexit
+       repne; vmmcall # vmgexit alternative encoding
 
 # wbnoinvd instruction
        wbnoinvd

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index f604f6e3f789623dc8ba78ca0bb7f3b676c1977b..542b2c10867340da358bca88e5bd470cba7597da 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * i386-dis.c (prefix_table): Revert the last vmgexit change.
+
 2020-06-17  Lili Cui  <lili.cui@intel.com>
 
        * i386-dis.c (prefix_table): Delete the incorrect vmgexit.

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 6ac1d7416a9b1d2cea2a726ca4849de235ba52d3..441866d6c978c4458c58585383c6337814f7017e 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -3576,6 +3576,8 @@ static const struct dis386 prefix_table[][4] = {
   {
     { "vmmcall",       { Skip_MODRM }, 0 },
     { "vmgexit",       { Skip_MODRM }, 0 },
+    { Bad_Opcode },
+    { "vmgexit",       { Skip_MODRM }, 0 },
   },
 
   /* PREFIX_0F01_REG_5_MOD_0 */