Changeset 95319 in vbox

Timestamp:

Jun 21, 2022 9:53:39 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151909

Message:

DIS: Treat VEX.L=1 as illegal opcode in group 17. bugref:9898 bugref:6251

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore.cpp (modified) (1 diff)
• DisasmInternal.h (modified) (1 diff)
• DisasmTables.cpp (modified) (1 diff)
• testcase/tstDisasm-1A.asm (modified) (1 diff)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -2485 +2485 @@
 
     uint8_t const bRm = disReadByte(pDis, offInstr);
-    pOp = &g_aMapX86_Group17[MODRM_REG(bRm)];
+    pOp = &g_aMapX86_Group17[(MODRM_REG(bRm) << 1) | (pDis->bVexDestReg & 1)];
 
     return disParseInstruction(offInstr, pOp, pDis);

trunk/src/VBox/Disassembler/DisasmInternal.h

@@ -187 +187 @@
 extern const DISOPCODE g_aMapX86_Group15_mod11_rm000[8];
 extern const DISOPCODE g_aMapX86_Group16[8];
-extern const DISOPCODE g_aMapX86_Group17[8];
+extern const DISOPCODE g_aMapX86_Group17[8*2];
 extern const DISOPCODE g_aMapX86_NopPause[2];
 /** @} */

trunk/src/VBox/Disassembler/DisasmTables.cpp

@@ -3785 +3785 @@
 const DISOPMAPDESC g_DisasVexMap1F3Range = { &g_aDisasVexMap1F3[0], 0x10, RT_ELEMENTS(g_aDisasVexMap1F3) };
 
-const DISOPCODE g_aMapX86_Group17[8] =
-{
-    INVALID_OPCODE,
+/** Indexed by: (/r << 1) | VEX.L */
+const DISOPCODE g_aMapX86_Group17[8*2] =
+{
+    INVALID_OPCODE_MOD_RM(0x00),
+    INVALID_OPCODE_MOD_RM(0x01),
     OPVEX("blsr %By,%Ey",        IDX_ParseVexDest,  IDX_ParseModRM,     0,                           0,  OP_BLSR,      OP_PARM_By,   OP_PARM_Ey,   OP_PARM_NONE, OP_PARM_NONE, DISOPTYPE_HARMLESS),
+    INVALID_OPCODE_MOD_RM(0x03),
     OPVEX("blsmsk %By,%Ey",      IDX_ParseVexDest,  IDX_ParseModRM,     0,                           0,  OP_BLSMSK,    OP_PARM_By,   OP_PARM_Ey,   OP_PARM_NONE, OP_PARM_NONE, DISOPTYPE_HARMLESS),
+    INVALID_OPCODE_MOD_RM(0x05),
     OPVEX("blsi %By,%Ey",        IDX_ParseVexDest,  IDX_ParseModRM,     0,                           0,  OP_BLSI,      OP_PARM_By,   OP_PARM_Ey,   OP_PARM_NONE, OP_PARM_NONE, DISOPTYPE_HARMLESS),
-    INVALID_OPCODE,
-    INVALID_OPCODE,
-    INVALID_OPCODE,
-    INVALID_OPCODE,
+    INVALID_OPCODE_MOD_RM(0x07),
+    INVALID_OPCODE_MOD_RM(0x08),
+    INVALID_OPCODE_MOD_RM(0x09),
+    INVALID_OPCODE_MOD_RM(0x0a),
+    INVALID_OPCODE_MOD_RM(0x0b),
+    INVALID_OPCODE_MOD_RM(0x0c),
+    INVALID_OPCODE_MOD_RM(0x0d),
+    INVALID_OPCODE_MOD_RM(0x0e),
+    INVALID_OPCODE_MOD_RM(0x0f),
 };
 

trunk/src/VBox/Disassembler/testcase/tstDisasm-1A.asm

@@ -427 +427 @@
         blsi eax, [rbx]
         blsi rax, [rbx]
+        db 0c4h, 0e2h, 0f8h | 4, 0f3h, 01bh ; blsi rax, [rbx] with VEX.L=1 - should be invalid
         blsmsk eax, [rbx+rdi*2]
         blsmsk rax, [rbx+rdi*2]