diff mbox series

[2/2] x86/APX: TILE{RELEASE,ZERO} have no EVEX encodings

Message ID f630b8f6-31bf-442b-8c14-f93cb8c0f9df@suse.com
State Unresolved
Headers
Series x86/APX: disassembler adjustments |

Checks

Context Check Description
snail/binutils-gdb-check warning Git am fail log

Commit Message

Jan Beulich Jan. 19, 2024, 11:25 a.m. UTC 
  Re-using the entire VEX decode hierarchy for the respective major opcode
has led to those two also being decoded as-if valid. Follow the earlier
USE_X86_64_EVEX_{PFX,W}_TABLE approach to avoid this happening.
diff mbox series

Patch

--- a/opcodes/i386-dis-evex.h
+++ b/opcodes/i386-dis-evex.h
@@ -375,9 +375,9 @@  static const struct dis386 evex_table[][
     { "vpsllv%DQ",	{ XM, Vex, EXx }, PREFIX_DATA },
     /* 48 */
     { Bad_Opcode },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F3849) },
+    { X86_64_EVEX_MEM_W_TABLE (VEX_W_0F3849_X86_64_L_0) },
     { Bad_Opcode },
-    { X86_64_EVEX_FROM_VEX_TABLE (X86_64_VEX_0F384B) },
+    { X86_64_EVEX_MEM_W_TABLE (VEX_W_0F384B_X86_64_L_0) },
     { "vrcp14p%XW",	{ XM, EXx }, PREFIX_DATA },
     { "vrcp14s%XW",	{ XMScalar, VexScalar, EXdq }, PREFIX_DATA },
     { "vrsqrt14p%XW",	{ XM, EXx }, 0 },
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -823,6 +823,7 @@  enum
   USE_X86_64_EVEX_FROM_VEX_TABLE,
   USE_X86_64_EVEX_PFX_TABLE,
   USE_X86_64_EVEX_W_TABLE,
+  USE_X86_64_EVEX_MEM_W_TABLE,
   USE_3BYTE_TABLE,
   USE_XOP_8F_TABLE,
   USE_VEX_C4_TABLE,
@@ -845,6 +846,7 @@  enum
   DIS386 (USE_X86_64_EVEX_FROM_VEX_TABLE, (I))
 #define X86_64_EVEX_PFX_TABLE(I) DIS386 (USE_X86_64_EVEX_PFX_TABLE, (I))
 #define X86_64_EVEX_W_TABLE(I) DIS386 (USE_X86_64_EVEX_W_TABLE, (I))
+#define X86_64_EVEX_MEM_W_TABLE(I) DIS386 (USE_X86_64_EVEX_MEM_W_TABLE, (I))
 #define THREE_BYTE_TABLE(I)	DIS386 (USE_3BYTE_TABLE, (I))
 #define XOP_8F_TABLE()		DIS386 (USE_XOP_8F_TABLE, 0)
 #define VEX_C4_TABLE()		DIS386 (USE_VEX_C4_TABLE, 0)
@@ -8802,6 +8804,7 @@  get_valid_dis386 (const struct dis386 *d
     case USE_X86_64_EVEX_FROM_VEX_TABLE:
     case USE_X86_64_EVEX_PFX_TABLE:
     case USE_X86_64_EVEX_W_TABLE:
+    case USE_X86_64_EVEX_MEM_W_TABLE:
       ins->evex_type = evex_from_vex;
       /* EVEX from VEX instructions are 64-bit only and require that EVEX.z,
 	 EVEX.L'L, EVEX.b, and the lower 2 bits of EVEX.aaa must be 0.  */
@@ -8816,6 +8819,12 @@  get_valid_dis386 (const struct dis386 *d
 	goto use_prefix_table;
       if (dp->op[0].bytemode == USE_X86_64_EVEX_W_TABLE)
 	goto use_vex_w_table;
+      if (dp->op[0].bytemode == USE_X86_64_EVEX_MEM_W_TABLE)
+	{
+	  if (ins->modrm.mod == 3)
+	    return &bad_opcode;
+	  goto use_vex_w_table;
+	}
 
       /* Fall through.  */
     case USE_X86_64_TABLE: