Changeset 90197 in vbox

Timestamp:

Jul 14, 2021 10:17:51 PM (4 years ago)

Author:

vboxsync

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

145718

Message:

VMM/tstVMMR0CallHost-1: Adjusted to stricter longjmp resuming. bugref:10064 ticketref:20090 ticketref:20456

File:

• trunk/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp

@@ -54 +54 @@
 /** Number of bytes used last time we called foo(). */
 static intptr_t volatile    g_cbFooUsed;
+/** Set if we're in a long jump. */
+static bool                 g_fInLongJmp;
 
 
@@ -80 +82 @@
     {
         g_cJmps++;
+        g_fInLongJmp = true;
         int rc = vmmR0CallRing3LongJmp(&g_Jmp, 42);
+        g_fInLongJmp = false;
         if (!rc)
             return i + 10000;
@@ -130 +134 @@
     g_cJmps = 0;
     g_cbFooUsed = 0;
-
+    g_fInLongJmp = false;
+
+    int iOrg = iFrom;
     for (int i = iFrom, iItr = 0; i != iTo; i += iInc, iItr++)
     {
-        int rc = stackRandom(&g_Jmp, (PFNVMMR0SETJMP)(uintptr_t)tst2, (PVM)(uintptr_t)i, 0);
-        RTTESTI_CHECK_MSG_RETV(rc == 0 || rc == 42, ("i=%d rc=%d setjmp; cbFoo=%#x cbFooUsed=%#x\n", i, rc, g_cbFoo, g_cbFooUsed));
+        if (!g_fInLongJmp)
+            iOrg = i;
+        int rc = stackRandom(&g_Jmp, (PFNVMMR0SETJMP)(uintptr_t)tst2, (PVM)(uintptr_t)iOrg, 0);
+        RTTESTI_CHECK_MSG_RETV(rc == (g_fInLongJmp ? 42 : 0),
+                               ("i=%d iOrg=%d rc=%d setjmp; cbFoo=%#x cbFooUsed=%#x fInLongJmp=%d\n",
+                                i, iOrg, rc, g_cbFoo, g_cbFooUsed, g_fInLongJmp));
 
 #ifdef VMM_R0_SWITCH_STACK
@@ -168 +178 @@
      */
     RTTEST hTest;
+#ifdef VMM_R0_NO_SWITCH_STACK
     RTEXITCODE rcExit = RTTestInitAndCreate("tstVMMR0CallHost-1", &hTest);
+#else
+    RTEXITCODE rcExit = RTTestInitAndCreate("tstVMMR0CallHost-2", &hTest);
+#endif
     if (rcExit != RTEXITCODE_SUCCESS)
         return rcExit;