Changeset 104719 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

May 18, 2024 1:14:23 AM (7 months ago)

Author:

vboxsync

Message:

ValidationKit/bootsectors: add RM_RANGE test type to workers 1 & 5 (prep for maskmov instructions); bugref:9898

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-3.c32 (modified) (3 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-3.c32

@@ -91 +91 @@
     RM_REG = 0,
     RM_MEM,
-    RM_MEM_DI, /**< Memory operand pointer is implicitly RDI.  Hack for maskmovq, [v]maskmovdqu. */
+    RM_RANGE,  /**< Instruction may fault anywhere within the memory address range.  Hack for vmaskmov[sd], vpmaskmov[dq]. */
+    RM_MEM_DI, /**< Memory operand pointer is implicitly RDI and may fault anywhere in range.  Hack for maskmovq, [v]maskmovdqu. */
     RM_MEM8,   /**< Memory operand is  8 bits.  Hack for movss and similar. */
     RM_MEM16,  /**< Memory operand is 16 bits.  Hack for movss and similar. */
@@ -916 +917 @@
                             if (bXcptExpect == X86_XCPT_PF)
                                 Ctx.cr2.u = (uintptr_t)puMemOp;
-                            if (paTests[iTest].enmRm == RM_MEM_DI)
-                            {
-                                Ctx.cr2Range = cbMemOp;
-                            }
+                            Ctx.cr2Range = (paTests[iTest].enmRm == RM_MEM_DI || paTests[iTest].enmRm == RM_RANGE) ? cbMemOp - 1 : 0;
                             Bs3TestCheckRegCtxEx(&TrapFrame.Ctx, &Ctx, bXcptExpect == X86_XCPT_DB ? cbInstr + 1 : 0, 0,
                                                  bXcptExpect == X86_XCPT_DB || BS3_MODE_IS_16BIT_SYS(bMode) ? 0 : X86_EFL_RF,
                                                  pszMode, idTestStep);
                             Ctx.cr2.u = 0;
+                            Ctx.cr2Range = 0;
+
                             if (paTests[iTest].enmRm == RM_MEM_DI)
                             {
@@ -13543 +13543 @@
                             if (bXcptExpect == X86_XCPT_PF)
                                 Ctx.cr2.u = (uintptr_t)puMemOp;
+                            Ctx.cr2Range = (paTests[iTest].enmRm == RM_MEM_DI || paTests[iTest].enmRm == RM_RANGE) ? cbMemOp - 1 : 0;
                             Bs3TestCheckRegCtxEx(&TrapFrame.Ctx, &Ctx, bXcptExpect == X86_XCPT_DB ? cbInstr + 1 : 0, 0,
                                                  bXcptExpect == X86_XCPT_DB || BS3_MODE_IS_16BIT_SYS(bMode) ? 0 : X86_EFL_RF,
                                                  pszMode, idTestStep);
                             Ctx.cr2.u = 0;
+                            Ctx.cr2Range = 0;
 
                             if (   paTests[iTest].enmRm >= RM_MEM