Changeset 45750 in vbox for trunk

Timestamp:

Apr 26, 2013 1:20:24 AM (12 years ago)

Author:

vboxsync

Message:

VMMSwitcher: Fixed assertion in debug builds (harmless).

File:

• trunk/src/VBox/VMM/VMMR3/VMMSwitcher.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/VMMSwitcher.cpp

@@ -917 +917 @@
 
 /**
+ * Wrapper around SELMGetHyperGDT() that avoids calling it when raw-mode context
+ * is not initialized.
+ *
+ * @returns Raw-mode contet GDT address. Null pointer if not applicable.
+ * @param   pVM         The cross context VM structure.
+ */
+static RTRCPTR vmmR3SwitcherGetHyperGDT(PVM pVM)
+{
+    if (HMIsRawModeCtxNeeded(pVM))
+        return SELMGetHyperGDT(pVM);
+#if HC_ARCH_BITS != 32 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+    AssertFailed(); /* This path is only applicable to some 32-bit hosts. */
+#endif
+    return NIL_RTRCPTR;
+}
+
+/**
  * Relocator for the 32-Bit to 32-Bit world switcher.
  */
@@ -942 +959 @@
 {
     vmmR3SwitcherGenericRelocate(pVM, pSwitcher, R0PtrCode, pu8CodeR3, GCPtrCode, u32IDCode,
-                                 SELMGetHyperCS(pVM), SELMGetHyperDS(pVM), SELMGetHyperTSS(pVM), SELMGetHyperGDT(pVM), SELMGetHyperCS64(pVM));
+                                 SELMGetHyperCS(pVM), SELMGetHyperDS(pVM), SELMGetHyperTSS(pVM), vmmR3SwitcherGetHyperGDT(pVM), SELMGetHyperCS64(pVM));
 }
 
@@ -971 +988 @@
 {
     vmmR3SwitcherGenericRelocate(pVM, pSwitcher, R0PtrCode, pu8CodeR3, GCPtrCode, u32IDCode,
-                                 SELMGetHyperCS(pVM), SELMGetHyperDS(pVM), SELMGetHyperTSS(pVM), SELMGetHyperGDT(pVM), SELMGetHyperCS64(pVM));
+                                 SELMGetHyperCS(pVM), SELMGetHyperDS(pVM), SELMGetHyperTSS(pVM), vmmR3SwitcherGetHyperGDT(pVM), SELMGetHyperCS64(pVM));
 }
 
@@ -1060 +1077 @@
      * Validate input.
      */
-    if (    enmSwitcher < VMMSWITCHER_INVALID
-        ||  enmSwitcher >= VMMSWITCHER_MAX)
-    {
-        AssertMsgFailed(("Invalid input enmSwitcher=%d\n", enmSwitcher));
-        return NIL_RTR0PTR;
-    }
+    AssertMsgReturn(   enmSwitcher == VMMSWITCHER_32_TO_AMD64
+                    || enmSwitcher == VMMSWITCHER_PAE_TO_AMD64,
+                    ("%d\n", enmSwitcher),
+                    NIL_RTR0PTR);
+    AssertReturn(HMIsEnabled(pVM), NIL_RTR0PTR);
 
     /*
      * Select the new switcher.
      */
-    const PVMMSWITCHERDEF *papSwitchers = HMIsEnabled(pVM) ? g_apHmSwitchers : g_apRawModeSwitchers;
+    const PVMMSWITCHERDEF *papSwitchers = g_apHmSwitchers;
     PVMMSWITCHERDEF pSwitcher = papSwitchers[enmSwitcher];
     if (pSwitcher)
     {
-        RTR0PTR     pbCodeR0 = (RTR0PTR)pVM->vmm.s.pvCoreCodeR0 + pVM->vmm.s.aoffSwitchers[enmSwitcher]; /** @todo fix the pvCoreCodeR0 type */
+        /** @todo fix the pvCoreCodeR0 type */
+        RTR0PTR pbCodeR0 = (RTR0PTR)pVM->vmm.s.pvCoreCodeR0 + pVM->vmm.s.aoffSwitchers[enmSwitcher];
         return pbCodeR0 + pSwitcher->offR0ToRawMode;
     }