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

Timestamp:

May 17, 2024 10:19:57 AM (9 months ago)

Author:

vboxsync

Message:

ValidationKit/bootsectors: bugref:10658 SIMD FP testcase: nits.

File:

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

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

@@ -723 +723 @@
     BS3CPUINSTR4_CONFIG_T const BS3_FAR          *pConfig;
     BS3CPUINSTR4_TEST1_T const BS3_FAR           *pTest;
-    BS3CPUINSTR4_TEST1_VALUES_PD_T const BS3_FAR *pValues;
+    unsigned                                      iVal;
     const char BS3_FAR                           *pszMode;
     PBS3TRAPFRAME                                 pTrapFrame;
@@ -748 +748 @@
                                                    PCBS3CPUINSTRX_CONFIG_SAVED_T pSavedCfg)
 {
-    BS3CPUINSTR4_TEST1_T const BS3_FAR *       pTest   = pTestCtx->pTest;
-    BS3CPUINSTR4_TEST1_VALUES_PD_T const BS3_FAR *pValues = pTestCtx->pValues;
+    BS3CPUINSTR4_TEST1_T const BS3_FAR           *pTest   = pTestCtx->pTest;
+    BS3CPUINSTR4_TEST1_VALUES_PD_T const BS3_FAR *pValues = &pTestCtx->pTest->paValues[pTestCtx->iVal];
     PBS3TRAPFRAME    pTrapFrame     = pTestCtx->pTrapFrame;
     PBS3REGCTX       pCtx           = pTestCtx->pCtx;
@@ -818 +818 @@
 
     /* Setup MXCSR for the current test. */
-    {
-        uMxCsr = (pSavedCfg->uMxCsr         & ~(X86_MXCSR_XCPT_MASK | X86_MXCSR_RC_MASK))
-               | (pValues->fMxCsrMask       & X86_MXCSR_XCPT_MASK)
-               | (pValues->fRoundingCtlMask & X86_MXCSR_RC_MASK);
-        if (   pValues->fDenormalsAreZero
-            && g_fMxCsrDazSupported)
-            uMxCsr |= X86_MXCSR_DAZ;
-        if (pValues->fFlushToZero)
-            uMxCsr |= X86_MXCSR_FZ;
-        Bs3ExtCtxSetMxCsr(pExtCtx, uMxCsr);
-    }
+    uMxCsr = (pSavedCfg->uMxCsr         & ~(X86_MXCSR_XCPT_MASK | X86_MXCSR_RC_MASK))
+           | (pValues->fMxCsrMask       & X86_MXCSR_XCPT_MASK)
+           | (pValues->fRoundingCtlMask & X86_MXCSR_RC_MASK);
+    if (   pValues->fDenormalsAreZero
+        && g_fMxCsrDazSupported)
+        uMxCsr |= X86_MXCSR_DAZ;
+    if (pValues->fFlushToZero)
+        uMxCsr |= X86_MXCSR_FZ;
+    Bs3ExtCtxSetMxCsr(pExtCtx, uMxCsr);
 
     /*
@@ -864 +862 @@
     if (bXcptExpect == X86_XCPT_DB)
     {
-        PBS3TRAPFRAME volatile pTrapFrameXcpt = pTrapFrame;
         uint32_t const fMxCsrXcptFlags = Bs3ExtCtxGetMxCsr(pExtCtxOut) & X86_MXCSR_XCPT_FLAGS;
 
@@ -880 +877 @@
         if (fFpFlagsExpect)
         {
-            if (pTrapFrameXcpt->bXcpt == bFpXcpt)
+            if (pTrapFrame->bXcpt == bFpXcpt)
             { /* likely */ }
             else
                 Bs3TestFailedF("Expected floating-point xcpt %s, got %s", bs3CpuInstr4XcptName(bFpXcpt),
-                               bs3CpuInstr4XcptName(pTrapFrameXcpt->bXcpt));
+                               bs3CpuInstr4XcptName(pTrapFrame->bXcpt));
         }
-        else if (pTrapFrameXcpt->bXcpt == X86_XCPT_DB)
+        else if (pTrapFrame->bXcpt == X86_XCPT_DB)
         { /* likely */ }
         else
-            Bs3TestFailedF("Expected no xcpt, got %s", bs3CpuInstr4XcptName(pTrapFrameXcpt->bXcpt));
+            Bs3TestFailedF("Expected no xcpt, got %s", bs3CpuInstr4XcptName(pTrapFrame->bXcpt));
     }
     /* Check if non-FP exception is as expected. */
@@ -904 +901 @@
     if (bXcptExpect == X86_XCPT_PF)
         pCtx->cr2.u = (uintptr_t)puMemOp;
-    Bs3TestCheckRegCtxEx(&pTrapFrame->Ctx, pCtx, bXcptExpect == X86_XCPT_DB && !fFpFlagsExpect ? cbInstr + 1 : 0, 0,
+    Bs3TestCheckRegCtxEx(&pTrapFrame->Ctx, pCtx, bXcptExpect == X86_XCPT_DB && !fFpFlagsExpect ? cbInstr + 1 : 0, 0 /*cbSpAdjust*/,
                          (bXcptExpect == X86_XCPT_DB && !fFpFlagsExpect) || BS3_MODE_IS_16BIT_SYS(bMode) ? 0 : X86_EFL_RF,
                          pTestCtx->pszMode, pTestCtx->idTestStep);
@@ -1023 +1020 @@
                             uint16_t cErrors;
                             BS3CPUINSTR4_TEST1_CTX_T TestCtx;
-                            BS3CPUINSTR4_TEST1_VALUES_PD_T const BS3_FAR *pValues = &pTest->paValues[iVal];
 
                             if (BS3_SKIPIT(bRing, iCfg, iTest, iVal, 0))
@@ -1035 +1031 @@
                             TestCtx.pConfig             = &paConfigs[iCfg];
                             TestCtx.pTest               = pTest;
-                            TestCtx.pValues             = pValues;
+                            TestCtx.iVal                = iVal;
                             TestCtx.pszMode             = pszMode;
                             TestCtx.pTrapFrame          = &TrapFrame;