Changeset 97819 in vbox for trunk/src/VBox/ValidationKit/bootsectors

Timestamp:

Dec 15, 2022 11:05:52 PM (2 years ago)

Author:

vboxsync

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

154899

Message:

ValKit/bs3-cpu-basic-2: Added a test of the RF flag after hitting an instruction breakpoint. bugref:9898

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-x0.c (modified) (8 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-x0.c

@@ -4991 +4991 @@
     BS3TRAPFRAME            TrapCtx;
     BS3REGCTX               Ctx;
+    BS3REGCTX               Ctx2;
     BS3REGCTX               CtxExpected;
     unsigned                iTest;
@@ -5006 +5007 @@
     /* make sure they're allocated  */
     Bs3MemZero(&Ctx, sizeof(Ctx));
-    Bs3MemZero(&CtxExpected, sizeof(Ctx));
+    Bs3MemZero(&Ctx2, sizeof(Ctx2));
+    Bs3MemZero(&CtxExpected, sizeof(CtxExpected));
     Bs3MemZero(&TrapCtx, sizeof(TrapCtx));
 
@@ -5012 +5014 @@
 
     //if (!BS3_MODE_IS_64BIT_SYS(bMode) && bMode != BS3_MODE_PP32_16) return 0xff;
-    //if (bMode != BS3_MODE_LM64) return 0xff;
+    //if (bMode != BS3_MODE_PE32_16) return 0xff;
 
     /*
@@ -5314 +5316 @@
                     RTSEL    const uDstSs    = s_aSubTests[iSubTest].uDstSs;
                     uint64_t       uDstRspExpect, uDstRspPush;
+                    uint16_t       cErrors;
 
                     Ctx.ss = s_aSubTests[iSubTest].uStartSs;
@@ -5498 +5501 @@
                     g_usBs3TestStep++; /* 6 */
 
-                    /* Again with a single globally enabled breakpoint and serveral other types of breakpoints configured but not enabled. */
+                    /* Again with a single globally enabled breakpoint and serveral other types of breakpoints
+                       configured but not enabled. */
                     //Bs3TestPrintf("bp 2/g+...\n");
+                    cErrors = Bs3TestSubErrorCount();
                     Bs3RegSetDr0(uFlatDst);
                     Bs3RegSetDr1(uFlatDst);
@@ -5522 +5527 @@
                     g_usBs3TestStep++; /* 7 */
 
+                    /* Now resume it with lots of execution breakpoints configured. */
+                    if (s_aSubTests[iSubTest].iXcpt < 0 && Bs3TestSubErrorCount() == cErrors)
+                    {
+                        Bs3MemCpy(&Ctx2, &TrapCtx.Ctx, sizeof(Ctx2));
+                        Ctx2.rflags.u32 |= X86_EFL_RF;
+                        //Bs3TestPrintf("bp 3/g+rf %04RX16:%04RX64 efl=%RX32 ds=%04RX16...\n", Ctx2.cs, Ctx2.rip.u, Ctx2.rflags.u32, Ctx2.ds);
+                        Bs3RegSetDr6(X86_DR6_INIT_VAL);
+                        Bs3RegSetDr7(X86_DR7_INIT_VAL
+                                     | X86_DR7_RW(0, X86_DR7_RW_EO) | X86_DR7_LEN(0, X86_DR7_LEN_BYTE)
+                                     | X86_DR7_RW(1, X86_DR7_RW_EO) | X86_DR7_LEN(1, X86_DR7_LEN_BYTE) | X86_DR7_L_G(1)
+                                     | X86_DR7_RW(2, X86_DR7_RW_EO) | X86_DR7_LEN(2, X86_DR7_LEN_BYTE) | X86_DR7_G(2)
+                                     | X86_DR7_RW(3, X86_DR7_RW_EO) | X86_DR7_LEN(3, X86_DR7_LEN_BYTE) | X86_DR7_G(3)
+                                     );
+                        Bs3TrapSetJmpAndRestore(&Ctx2, &TrapCtx);
+                        Bs3RegSetDr7(X86_DR7_INIT_VAL);
+                        bs3CpuBasic2_CompareUdCtx(&TrapCtx, &CtxExpected);
+                        bs3CpuBasic2_CheckDr6InitVal();
+                    }
+                    g_usBs3TestStep++; /* 8 */
+
                     /* Now do single stepping: */
                     //Bs3TestPrintf("stepping...\n");
@@ -5542 +5567 @@
                     Ctx.rflags.u16        &= ~X86_EFL_TF;
                     CtxExpected.rflags.u16 = Ctx.rflags.u16;
-                    g_usBs3TestStep++; /* 8 */
+                    g_usBs3TestStep++; /* 9 */
 
                     /* Single step with B0-B3 set to check that they're not preserved
@@ -5560 +5585 @@
                     Ctx.rflags.u16        &= ~X86_EFL_TF;
                     CtxExpected.rflags.u16 = Ctx.rflags.u16;
-                    g_usBs3TestStep++; /* 9 */
+                    g_usBs3TestStep++; /* 10 */
 
                 }