x86: re-arrange order of decode for various EVEX opcodes

The order of decodes influences the overall number of table entries.
Reduce table size quite a bit by first decoding few-alternatives
attributes common to all valid leaves.

This also adds a PREFIX_DATA 7531c61332db ("x86: simplify decode of
opcodes valid with (embedded) 66 prefix only") missed to apply to
vbroadcastf64x4.

1 files changed, 43 insertions, 218 deletions

diff --git a/opcodes/i386-dis-evex-len.h b/opcodes/i386-dis-evex-len.h
index ebe0945d5fc..cef8ad9c2dd 100644
--- a/opcodes/i386-dis-evex-len.h
+++ b/opcodes/i386-dis-evex-len.h
@@ -36,46 +36,25 @@ static const struct dis386 evex_len_table[][3] = {
     { "vpermp%XW",	{ XM, Vex, EXx }, PREFIX_DATA },
   },
 
-  /* EVEX_LEN_0F3819_W_0 */
+  /* EVEX_LEN_0F3819 */
   {
     { Bad_Opcode },
-    { "vbroadcastf32x2",	{ XM, EXxmm_mq }, PREFIX_DATA },
-    { "vbroadcastf32x2",	{ XM, EXxmm_mq }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F3819_L_n) },
+    { VEX_W_TABLE (EVEX_W_0F3819_L_n) },
   },
 
-  /* EVEX_LEN_0F3819_W_1 */
+  /* EVEX_LEN_0F381A_M_0 */
   {
     { Bad_Opcode },
-    { "vbroadcastsd",	{ XM, EXxmm_mq }, PREFIX_DATA },
-    { "vbroadcastsd",	{ XM, EXxmm_mq }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F381A_M_0_L_n) },
+    { VEX_W_TABLE (EVEX_W_0F381A_M_0_L_n) },
   },
 
-  /* EVEX_LEN_0F381A_W_0_M_0 */
-  {
-    { Bad_Opcode },
-    { "vbroadcastf32x4",	{ XM, EXxmm }, PREFIX_DATA },
-    { "vbroadcastf32x4",	{ XM, EXxmm }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F381A_W_1_M_0 */
-  {
-    { Bad_Opcode },
-    { "vbroadcastf64x2",	{ XM, EXxmm }, PREFIX_DATA },
-    { "vbroadcastf64x2",	{ XM, EXxmm }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F381B_W_0_M_0 */
+  /* EVEX_LEN_0F381B_M_0 */
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { "vbroadcastf32x8",	{ XM, EXymm }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F381B_P_2_W_1_M_0 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vbroadcastf64x4",	{ XM, EXymm }, 0 },
+    { VEX_W_TABLE (EVEX_W_0F381B_M_0_L_2) },
   },
 
   /* EVEX_LEN_0F3836 */
@@ -85,116 +64,32 @@ static const struct dis386 evex_len_table[][3] = {
     { "vperm%DQ",	{ XM, Vex, EXx }, PREFIX_DATA },
   },
 
-  /* EVEX_LEN_0F385A_W_0_M_0 */
-  {
-    { Bad_Opcode },
-    { "vbroadcasti32x4",	{ XM, EXxmm }, PREFIX_DATA },
-    { "vbroadcasti32x4",	{ XM, EXxmm }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F385A_W_1_M_0 */
-  {
-    { Bad_Opcode },
-    { "vbroadcasti64x2",	{ XM, EXxmm }, PREFIX_DATA },
-    { "vbroadcasti64x2",	{ XM, EXxmm }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F385B_W_0_M_0 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vbroadcasti32x8",	{ XM, EXymm }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F385B_W_1_M_0 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vbroadcasti64x4",	{ XM, EXymm }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F38C6_R_1_M_0 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vgatherpf0dp%XW",  { MVexVSIBDWpX }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F38C6_R_2_M_0 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vgatherpf1dp%XW",  { MVexVSIBDWpX }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F38C6_R_5_M_0 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vscatterpf0dp%XW",  { MVexVSIBDWpX }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F38C6_R_6_M_0 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vscatterpf1dp%XW",  { MVexVSIBDWpX }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F38C7_R_1_M_0_W_0 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vgatherpf0qps",  { MVexVSIBDQWpX }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F38C7_R_1_M_0_W_1 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vgatherpf0qpd",  { MVexVSIBQWpX }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F38C7_R_2_M_0_W_0 */
+  /* EVEX_LEN_0F385A_M_0 */
   {
     { Bad_Opcode },
-    { Bad_Opcode },
-    { "vgatherpf1qps",  { MVexVSIBDQWpX }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F385A_M_0_L_n) },
+    { VEX_W_TABLE (EVEX_W_0F385A_M_0_L_n) },
   },
 
-  /* EVEX_LEN_0F38C7_R_2_M_0_W_1 */
+  /* EVEX_LEN_0F385B_M_0 */
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { "vgatherpf1qpd",  { MVexVSIBQWpX }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F385B_M_0_L_2) },
   },
 
-  /* EVEX_LEN_0F38C7_R_5_M_0_W_0 */
+  /* EVEX_LEN_0F38C6_M_0 */
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { "vscatterpf0qps",  { MVexVSIBDQWpX }, PREFIX_DATA },
+    { REG_TABLE (REG_EVEX_0F38C6_M_0_L_2) },
   },
 
-  /* EVEX_LEN_0F38C7_R_5_M_0_W_1 */
+  /* EVEX_LEN_0F38C7_M_0 */
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { "vscatterpf0qpd",  { MVexVSIBQWpX }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F38C7_R_6_M_0_W_0 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vscatterpf1qps",  { MVexVSIBDQWpX }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F38C7_R_6_M_0_W_1 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vscatterpf1qpd",  { MVexVSIBQWpX }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F38C7_M_0_L_2) },
   },
 
   /* EVEX_LEN_0F3A00_W_1 */
@@ -231,60 +126,32 @@ static const struct dis386 evex_len_table[][3] = {
     { "vextractps",	{ Edqd, XMM, Ib }, PREFIX_DATA },
   },
 
-  /* EVEX_LEN_0F3A18_W_0 */
-  {
-    { Bad_Opcode },
-    { "vinsertf32x4",	{ XM, Vex, EXxmm, Ib }, PREFIX_DATA },
-    { "vinsertf32x4",	{ XM, Vex, EXxmm, Ib }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F3A18_W_1 */
-  {
-    { Bad_Opcode },
-    { "vinsertf64x2",	{ XM, Vex, EXxmm, Ib }, PREFIX_DATA },
-    { "vinsertf64x2",	{ XM, Vex, EXxmm, Ib }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F3A19_W_0 */
-  {
-    { Bad_Opcode },
-    { "vextractf32x4",	{ EXxmm, XM, Ib }, PREFIX_DATA },
-    { "vextractf32x4",	{ EXxmm, XM, Ib }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F3A19_W_1 */
-  {
-    { Bad_Opcode },
-    { "vextractf64x2",	{ EXxmm, XM, Ib }, PREFIX_DATA },
-    { "vextractf64x2",	{ EXxmm, XM, Ib }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F3A1A_W_0 */
+  /* EVEX_LEN_0F3A18 */
   {
     { Bad_Opcode },
-    { Bad_Opcode },
-    { "vinsertf32x8",	{ XM, Vex, EXymm, Ib }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F3A18_L_n) },
+    { VEX_W_TABLE (EVEX_W_0F3A18_L_n) },
   },
 
-  /* EVEX_LEN_0F3A1A_W_1 */
+  /* EVEX_LEN_0F3A19 */
   {
     { Bad_Opcode },
-    { Bad_Opcode },
-    { "vinsertf64x4",	{ XM, Vex, EXymm, Ib }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F3A19_L_n) },
+    { VEX_W_TABLE (EVEX_W_0F3A19_L_n) },
   },
 
-  /* EVEX_LEN_0F3A1B_W_0 */
+  /* EVEX_LEN_0F3A1A */
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { "vextractf32x8",	{ EXymm, XM, Ib }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F3A1A_L_2) },
   },
 
-  /* EVEX_LEN_0F3A1B_W_1 */
+  /* EVEX_LEN_0F3A1B */
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { "vextractf64x4",	{ EXymm, XM, Ib }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F3A1B_L_2) },
   },
 
   /* EVEX_LEN_0F3A20 */
@@ -302,87 +169,45 @@ static const struct dis386 evex_len_table[][3] = {
     { "vpinsrK",	{ XM, Vex, Edq, Ib }, PREFIX_DATA },
   },
 
-  /* EVEX_LEN_0F3A23_W_0 */
-  {
-    { Bad_Opcode },
-    { "vshuff32x4",	{ XM, Vex, EXx, Ib }, PREFIX_DATA },
-    { "vshuff32x4",	{ XM, Vex, EXx, Ib }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F3A23_W_1 */
-  {
-    { Bad_Opcode },
-    { "vshuff64x2",	{ XM, Vex, EXx, Ib }, PREFIX_DATA },
-    { "vshuff64x2",	{ XM, Vex, EXx, Ib }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F3A38_W_0 */
-  {
-    { Bad_Opcode },
-    { "vinserti32x4",	{ XM, Vex, EXxmm, Ib }, PREFIX_DATA },
-    { "vinserti32x4",	{ XM, Vex, EXxmm, Ib }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F3A38_W_1 */
+  /* EVEX_LEN_0F3A23 */
   {
     { Bad_Opcode },
-    { "vinserti64x2",	{ XM, Vex, EXxmm, Ib }, PREFIX_DATA },
-    { "vinserti64x2",	{ XM, Vex, EXxmm, Ib }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F3A23_L_n) },
+    { VEX_W_TABLE (EVEX_W_0F3A23_L_n) },
   },
 
-  /* EVEX_LEN_0F3A39_W_0 */
+  /* EVEX_LEN_0F3A38 */
   {
     { Bad_Opcode },
-    { "vextracti32x4",	{ EXxmm, XM, Ib }, PREFIX_DATA },
-    { "vextracti32x4",	{ EXxmm, XM, Ib }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F3A38_L_n) },
+    { VEX_W_TABLE (EVEX_W_0F3A38_L_n) },
   },
 
-  /* EVEX_LEN_0F3A39_W_1 */
+  /* EVEX_LEN_0F3A39 */
   {
     { Bad_Opcode },
-    { "vextracti64x2",	{ EXxmm, XM, Ib }, PREFIX_DATA },
-    { "vextracti64x2",	{ EXxmm, XM, Ib }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F3A39_L_n) },
+    { VEX_W_TABLE (EVEX_W_0F3A39_L_n) },
   },
 
-  /* EVEX_LEN_0F3A3A_W_0 */
+  /* EVEX_LEN_0F3A3A */
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { "vinserti32x8",	{ XM, Vex, EXymm, Ib }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F3A3A_L_2) },
   },
 
-  /* EVEX_LEN_0F3A3A_W_1 */
+  /* EVEX_LEN_0F3A3B */
   {
     { Bad_Opcode },
     { Bad_Opcode },
-    { "vinserti64x4",	{ XM, Vex, EXymm, Ib }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F3A3B_W_0 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vextracti32x8",	{ EXymm, XM, Ib }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F3A3B_W_1 */
-  {
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vextracti64x4",	{ EXymm, XM, Ib }, PREFIX_DATA },
-  },
-
-  /* EVEX_LEN_0F3A43_W_0 */
-  {
-    { Bad_Opcode },
-    { "vshufi32x4",	{ XM, Vex, EXx, Ib }, PREFIX_DATA },
-    { "vshufi32x4",	{ XM, Vex, EXx, Ib }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F3A3B_L_2) },
   },
 
-  /* EVEX_LEN_0F3A43_W_1 */
+  /* EVEX_LEN_0F3A43 */
   {
     { Bad_Opcode },
-    { "vshufi64x2",	{ XM, Vex, EXx, Ib }, PREFIX_DATA },
-    { "vshufi64x2",	{ XM, Vex, EXx, Ib }, PREFIX_DATA },
+    { VEX_W_TABLE (EVEX_W_0F3A43_L_n) },
+    { VEX_W_TABLE (EVEX_W_0F3A43_L_n) },
   },
 };