Changeset 103959 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 20, 2024 1:50:22 PM (11 months ago)

Author:

vboxsync

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

162336

Message:

VMM/IEM: vpblendvb is supposed to raise #UD if VEX.W isn't zero. bugref:9898

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllInstVexMap3.cpp.h (modified) (5 diffs)
• include/IEMOpHlp.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllInstVexMap3.cpp.h

@@ -1194 +1194 @@
         {
             IEM_MC_BEGIN(4, 4, IEM_MC_F_NOT_286_OR_OLDER, 0);
-            IEMOP_HLP_DONE_VEX_DECODING_EX(fAvx2);
+            IEMOP_HLP_DONE_VEX_DECODING_W0_EX(fAvx2);
             IEM_MC_MAYBE_RAISE_AVX_RELATED_XCPT();
             IEM_MC_PREPARE_AVX_USAGE();
@@ -1222 +1222 @@
         {
             IEM_MC_BEGIN(4, 0, IEM_MC_F_NOT_286_OR_OLDER, 0);
-            IEMOP_HLP_DONE_VEX_DECODING_EX(fAvx);
+            IEMOP_HLP_DONE_VEX_DECODING_W0_EX(fAvx);
             IEM_MC_MAYBE_RAISE_AVX_RELATED_XCPT();
             IEM_MC_PREPARE_AVX_USAGE();
@@ -1252 +1252 @@
             uint8_t bOp4; IEM_OPCODE_GET_NEXT_U8(&bOp4);
 
-            IEMOP_HLP_DONE_VEX_DECODING_EX(fAvx2);
+            IEMOP_HLP_DONE_VEX_DECODING_W0_EX(fAvx2);
             IEM_MC_MAYBE_RAISE_AVX_RELATED_XCPT();
             IEM_MC_PREPARE_AVX_USAGE();
@@ -1284 +1284 @@
             uint8_t bOp4; IEM_OPCODE_GET_NEXT_U8(&bOp4);
 
-            IEMOP_HLP_DONE_VEX_DECODING_EX(fAvx);
+            IEMOP_HLP_DONE_VEX_DECODING_W0_EX(fAvx);
             IEM_MC_MAYBE_RAISE_AVX_RELATED_XCPT();
             IEM_MC_PREPARE_AVX_USAGE();
@@ -1312 +1312 @@
 FNIEMOP_DEF(iemOp_vpblendvb_Vx_Hx_Wx_Lx)
 {
-    IEMOP_MNEMONIC4(VEX_RVMR, VPBLENDVB, vpblendvb, Vx_WO, Hx, Wx, Lx, DISOPTYPE_HARMLESS, IEMOPHINT_VEX_L_ZERO | IEMOPHINT_VEX_W_ZERO);
+    /** @todo testcase: cover VEX.W=1 and check that it triggers \#UD on both real
+     *        and emulated hardware. */
+    IEMOP_MNEMONIC4(VEX_RVMR, VPBLENDVB, vpblendvb, Vx_WO, Hx, Wx, Lx, DISOPTYPE_HARMLESS, IEMOPHINT_VEX_W_ZERO);
     IEMOPBLENDOP_INIT_VARS(vpblendvb);
     return FNIEMOP_CALL_1(iemOpCommonAvxAvx2_Vx_Hx_Wx_Lx, IEM_SELECT_HOST_OR_FALLBACK(fAvx2, &s_Host, &s_Fallback));

trunk/src/VBox/VMM/include/IEMOpHlp.h

@@ -601 +601 @@
     } while (0)
 
+/**
+ * Done decoding VEX, L=0 and W=0.
+ * Raises \#UD exception if rex, rep, opsize or lock prefixes are present,
+ * if we're in real or v8086 mode, if VEX.L!=0, if VEX.W!=0, or if the
+ * a_fFeature is not present in the guest CPU.
+ */
+#define IEMOP_HLP_DONE_VEX_DECODING_L0_AND_W0_EX(a_fFeature) \
+    do \
+    { \
+        if (RT_LIKELY(   !(  pVCpu->iem.s.fPrefixes \
+                           & (IEM_OP_PRF_LOCK | IEM_OP_PRF_SIZE_OP | IEM_OP_PRF_REPZ | IEM_OP_PRF_REPNZ | IEM_OP_PRF_REX \
+                              | IEM_OP_PRF_SIZE_REX_W /*VEX.W*/)) \
+                      && pVCpu->iem.s.uVexLength == 0 \
+                      && !IEM_IS_REAL_OR_V86_MODE(pVCpu) \
+                      && IEM_GET_GUEST_CPU_FEATURES(pVCpu)->a_fFeature )) \
+        { /* likely */ } \
+        else \
+            IEMOP_RAISE_INVALID_OPCODE_RET(); \
+    } while (0)
+
+
 #define IEMOP_HLP_DECODED_NL_1(a_uDisOpNo, a_fIemOpFlags, a_uDisParam0, a_fDisOpType) \
     do \