x86: introduce %BW to avoid going through vex_w_table[]

This parallels %LW and %XW.

4 files changed, 27 insertions, 77 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index e02d8e5..32bc8e7 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,16 @@
+2020-07-07  Jan Beulich  <jbeulich@suse.com>
+
+	* i386-dis.c (EVEX_W_0F3826_P_1, EVEX_W_0F3826_P_2,
+	EVEX_W_0F3828_P_1, EVEX_W_0F3829_P_1, EVEX_W_0F3854_P_2,
+	EVEX_W_0F3866_P_2, EVEX_W_0F3875_P_2, EVEX_W_0F387D_P_2,
+	EVEX_W_0F388D_P_2, EVEX_W_0F3A3E_P_2, EVEX_W_0F3A3F_P_2):
+	Delete.
+	(putop): Handle "BW".
+	* i386-dis-evex-w.h: Move entries for opcodes 0F3826, 0F3826,
+	0F3828, 0F3829, 0F3854, 0F3866, 0F3875, 0F387D, 0F388D, 0F3A3E,
+	and 0F3A3F ...
+	* i386-dis-evex-prefix.h: ... here.
+
 2020-07-06  Jan Beulich  <jbeulich@suse.com>
 
 	* i386-dis.c (VEX_LEN_0FXOP_09_80, VEX_LEN_0FXOP_09_81): Delete.
diff --git a/opcodes/i386-dis-evex-prefix.h b/opcodes/i386-dis-evex-prefix.h
index bff0a42..02dc75f 100644
--- a/opcodes/i386-dis-evex-prefix.h
+++ b/opcodes/i386-dis-evex-prefix.h
@@ -474,8 +474,8 @@
   /* PREFIX_EVEX_0F3826 */
   {
     { Bad_Opcode },
-    { VEX_W_TABLE (EVEX_W_0F3826_P_1) },
-    { VEX_W_TABLE (EVEX_W_0F3826_P_2) },
+    { "vptestnm%BW",	{ XMask, Vex, EXx }, 0 },
+    { "vptestm%BW",	{ XMask, Vex, EXx }, 0 },
   },
   /* PREFIX_EVEX_0F3827 */
   {
@@ -486,13 +486,13 @@
   /* PREFIX_EVEX_0F3828 */
   {
     { Bad_Opcode },
-    { VEX_W_TABLE (EVEX_W_0F3828_P_1) },
+    { "vpmovm2%BW",	{ XM, MaskR }, 0 },
     { VEX_W_TABLE (EVEX_W_0F3828_P_2) },
   },
   /* PREFIX_EVEX_0F3829 */
   {
     { Bad_Opcode },
-    { VEX_W_TABLE (EVEX_W_0F3829_P_1) },
+    { "vpmov%BW2m",	{ XMask, EXx }, 0 },
     { VEX_W_TABLE (EVEX_W_0F3829_P_2) },
   },
   /* PREFIX_EVEX_0F382A */
@@ -693,7 +693,7 @@
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { VEX_W_TABLE (EVEX_W_0F3854_P_2) },
+    { "vpopcnt%BW",	{ XM, EXx }, 0 },
   },
   /* PREFIX_EVEX_0F3855 */
   {
@@ -747,7 +747,7 @@
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { VEX_W_TABLE (EVEX_W_0F3866_P_2) },
+    { "vpblendm%BW",	{ XM, Vex, EXx }, 0 },
   },
   /* PREFIX_EVEX_0F3868 */
   {
@@ -785,7 +785,7 @@
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { VEX_W_TABLE (EVEX_W_0F3875_P_2) },
+    { "vpermi2%BW",	{ XM, Vex, EXx }, 0 },
   },
   /* PREFIX_EVEX_0F3876 */
   {
@@ -821,7 +821,7 @@
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { VEX_W_TABLE (EVEX_W_0F387D_P_2) },
+    { "vpermt2%BW",	{ XM, Vex, EXx }, 0 },
   },
   /* PREFIX_EVEX_0F387E */
   {
@@ -869,7 +869,7 @@
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { VEX_W_TABLE (EVEX_W_0F388D_P_2) },
+    { "vperm%BW",	{ XM, Vex, EXx }, 0 },
   },
   /* PREFIX_EVEX_0F388F */
   {
@@ -1227,13 +1227,13 @@
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { VEX_W_TABLE (EVEX_W_0F3A3E_P_2) },
+    { "vpcmpu%BW",	{ XMask, Vex, EXx, VPCMP }, 0 },
   },
   /* PREFIX_EVEX_0F3A3F */
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { VEX_W_TABLE (EVEX_W_0F3A3F_P_2) },
+    { "vpcmp%BW",	{ XMask, Vex, EXx, VPCMP }, 0 },
   },
   /* PREFIX_EVEX_0F3A42 */
   {
diff --git a/opcodes/i386-dis-evex-w.h b/opcodes/i386-dis-evex-w.h
index 6d0d48e..ac786fc 100644
--- a/opcodes/i386-dis-evex-w.h
+++ b/opcodes/i386-dis-evex-w.h
@@ -442,31 +442,11 @@
   {
     { "vpmovsxdq",	{ XM, EXxmmq }, 0 },
   },
-  /* EVEX_W_0F3826_P_1 */
-  {
-    { "vptestnmb",	{ XMask, Vex, EXx }, 0 },
-    { "vptestnmw",	{ XMask, Vex, EXx }, 0 },
-  },
-  /* EVEX_W_0F3826_P_2 */
-  {
-    { "vptestmb",	{ XMask, Vex, EXx }, 0 },
-    { "vptestmw",	{ XMask, Vex, EXx }, 0 },
-  },
-  /* EVEX_W_0F3828_P_1 */
-  {
-    { "vpmovm2b",	{ XM, MaskR }, 0 },
-    { "vpmovm2w",	{ XM, MaskR }, 0 },
-  },
   /* EVEX_W_0F3828_P_2 */
   {
     { Bad_Opcode },
     { "vpmuldq",	{ XM, Vex, EXx }, 0 },
   },
-  /* EVEX_W_0F3829_P_1 */
-  {
-    { "vpmovb2m",	{ XMask, EXx }, 0 },
-    { "vpmovw2m",	{ XMask, EXx }, 0 },
-  },
   /* EVEX_W_0F3829_P_2 */
   {
     { Bad_Opcode },
@@ -527,11 +507,6 @@
     { "vdpbf16ps",	{ XM, Vex, EXx }, 0 },
     { Bad_Opcode },
   },
-  /* EVEX_W_0F3854_P_2 */
-  {
-    { "vpopcntb",	{ XM, EXx }, 0 },
-    { "vpopcntw",	{ XM, EXx }, 0 },
-  },
   /* EVEX_W_0F3859_P_2 */
   {
     { "vbroadcasti32x2",	{ XM, EXxmm_mq }, 0 },
@@ -557,11 +532,6 @@
     { "vpcompressb",   { EXbScalar, XM }, 0 },
     { "vpcompressw",   { EXwScalar, XM }, 0 },
   },
-  /* EVEX_W_0F3866_P_2 */
-  {
-    { "vpblendmb",	{ XM, Vex, EXx }, 0 },
-    { "vpblendmw",	{ XM, Vex, EXx }, 0 },
-  },
   /* EVEX_W_0F3870_P_2 */
   {
     { Bad_Opcode },
@@ -582,11 +552,6 @@
     { "vcvtne2ps2bf16", { XM, Vex, EXx}, 0 },
     { Bad_Opcode },
   },
-  /* EVEX_W_0F3875_P_2 */
-  {
-    { "vpermi2b",	{ XM, Vex, EXx }, 0 },
-    { "vpermi2w",	{ XM, Vex, EXx }, 0 },
-  },
   /* EVEX_W_0F387A_P_2 */
   {
     { "vpbroadcastb",	{ XM, Rd }, 0 },
@@ -595,21 +560,11 @@
   {
     { "vpbroadcastw",	{ XM, Rd }, 0 },
   },
-  /* EVEX_W_0F387D_P_2 */
-  {
-    { "vpermt2b",	{ XM, Vex, EXx }, 0 },
-    { "vpermt2w",	{ XM, Vex, EXx }, 0 },
-  },
   /* EVEX_W_0F3883_P_2 */
   {
     { Bad_Opcode },
     { "vpmultishiftqb",	{ XM, Vex, EXx }, 0 },
   },
-  /* EVEX_W_0F388D_P_2 */
-  {
-    { "vpermb",	{ XM, Vex, EXx }, 0 },
-    { "vpermw",	{ XM, Vex, EXx }, 0 },
-  },
   /* EVEX_W_0F3891_P_2 */
   {
     { "vpgatherqd",	{ XMxmmq, MVexVSIBQDWpX }, 0 },
@@ -732,16 +687,6 @@
     { EVEX_LEN_TABLE (EVEX_LEN_0F3A3B_P_2_W_0) },
     { EVEX_LEN_TABLE (EVEX_LEN_0F3A3B_P_2_W_1) },
   },
-  /* EVEX_W_0F3A3E_P_2 */
-  {
-    { "vpcmpub",	{ XMask, Vex, EXx, VPCMP }, 0 },
-    { "vpcmpuw",	{ XMask, Vex, EXx, VPCMP }, 0 },
-  },
-  /* EVEX_W_0F3A3F_P_2 */
-  {
-    { "vpcmpb",	{ XMask, Vex, EXx, VPCMP }, 0 },
-    { "vpcmpw",	{ XMask, Vex, EXx, VPCMP }, 0 },
-  },
   /* EVEX_W_0F3A42_P_2 */
   {
     { "vdbpsadbw",	{ XM, Vex, EXx, Ib }, 0 },
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index da5af42..956e2c3 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -2059,11 +2059,7 @@ enum
   EVEX_W_0F3824_P_1,
   EVEX_W_0F3825_P_1,
   EVEX_W_0F3825_P_2,
-  EVEX_W_0F3826_P_1,
-  EVEX_W_0F3826_P_2,
-  EVEX_W_0F3828_P_1,
   EVEX_W_0F3828_P_2,
-  EVEX_W_0F3829_P_1,
   EVEX_W_0F3829_P_2,
   EVEX_W_0F382A_P_1,
   EVEX_W_0F382A_P_2,
@@ -2078,23 +2074,18 @@ enum
   EVEX_W_0F3837_P_2,
   EVEX_W_0F383A_P_1,
   EVEX_W_0F3852_P_1,
-  EVEX_W_0F3854_P_2,
   EVEX_W_0F3859_P_2,
   EVEX_W_0F385A_P_2,
   EVEX_W_0F385B_P_2,
   EVEX_W_0F3862_P_2,
   EVEX_W_0F3863_P_2,
-  EVEX_W_0F3866_P_2,
   EVEX_W_0F3870_P_2,
   EVEX_W_0F3872_P_1,
   EVEX_W_0F3872_P_2,
   EVEX_W_0F3872_P_3,
-  EVEX_W_0F3875_P_2,
   EVEX_W_0F387A_P_2,
   EVEX_W_0F387B_P_2,
-  EVEX_W_0F387D_P_2,
   EVEX_W_0F3883_P_2,
-  EVEX_W_0F388D_P_2,
   EVEX_W_0F3891_P_2,
   EVEX_W_0F3893_P_2,
   EVEX_W_0F38A1_P_2,
@@ -2121,8 +2112,6 @@ enum
   EVEX_W_0F3A39_P_2,
   EVEX_W_0F3A3A_P_2,
   EVEX_W_0F3A3B_P_2,
-  EVEX_W_0F3A3E_P_2,
-  EVEX_W_0F3A3F_P_2,
   EVEX_W_0F3A42_P_2,
   EVEX_W_0F3A43_P_2,
   EVEX_W_0F3A70_P_2,
@@ -2198,6 +2187,7 @@ struct dis386 {
    "LS" => print "abs" in 64bit mode and behave as 'S' otherwise
    "LV" => print "abs" for 64bit operand and behave as 'S' otherwise
    "LW" => print 'd', 'q' depending on the VEX.W bit
+   "BW" => print 'b' or 'w' depending on the EVEX.W bit
    "LP" => print 'w' or 'l' ('d' in Intel mode) if instruction has
 	   an operand size prefix, or suffix_always is true.  print
 	   'q' if rex prefix is present.
@@ -13129,6 +13119,8 @@ putop (const char *in_template, int sizeflag)
 		*obufp++ = vex.w ? 'd': 's';
 	      else if (last[0] == 'L')
 		*obufp++ = vex.w ? 'q': 'd';
+	      else if (last[0] == 'B')
+		*obufp++ = vex.w ? 'w': 'b';
 	      else
 		abort ();
 	    }