Changeset 19207 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Apr 27, 2009 12:05:38 PM (16 years ago)

Author:

vboxsync

Message:

Forward-ported r46552: TRPMR0.cpp: Workaround for darwin/amd64 tripple fault.

File:

• trunk/src/VBox/VMM/VMMR0/TRPMR0.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR0/TRPMR0.cpp

@@ -43 +43 @@
 VMMR0DECL(void) TRPMR0DispatchHostInterrupt(PVM pVM)
 {
+    /*
+     * Get the active interrupt vector number.
+     */
     PVMCPU pVCpu = VMMGetCpu0(pVM);
     RTUINT uActiveVector = pVCpu->trpm.s.uActiveVector;
-
     pVCpu->trpm.s.uActiveVector = ~0;
     AssertMsgReturnVoid(uActiveVector < 256, ("uActiveVector=%#x is invalid! (More assertions to come, please enjoy!)\n", uActiveVector));
 
-#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
+#if HC_ARCH_BITS == 64 && defined(RT_OS_DARWIN)
+    /*
+     * Do it the simple and safe way.
+     *
+     * This is a workaround for an optimization bug in the code below
+     * or a gcc 4.2 on mac (snow leopard seed 314).
+     */
+    trpmR0DispatchHostInterruptSimple(uActiveVector);
+
+#else  /* The complicated way: */
+
+# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
     /*
      * Check if we're in long mode or not.
@@ -59 +72 @@
         return;
     }
-#endif
+# endif
 
     /*
@@ -66 +79 @@
     RTIDTR      Idtr;
     ASMGetIDTR(&Idtr);
-#if HC_ARCH_BITS == 32
+# if HC_ARCH_BITS == 32
     PVBOXIDTE   pIdte = &((PVBOXIDTE)Idtr.pIdt)[uActiveVector];
-#else
+# else
     PVBOXIDTE   pIdte = &((PVBOXIDTE)Idtr.pIdt)[uActiveVector * 2];
-#endif
+# endif
     AssertMsgReturnVoid(pIdte->Gen.u1Present, ("The IDT entry (%d) is not present!\n", uActiveVector));
     AssertMsgReturnVoid(    pIdte->Gen.u3Type1 == VBOX_IDTE_TYPE1
@@ -76 +89 @@
                         ("The IDT entry (%d) is not 32-bit int gate! type1=%#x type2=%#x\n",
                          uActiveVector, pIdte->Gen.u3Type1, pIdte->Gen.u5Type2));
-#if HC_ARCH_BITS == 32
+# if HC_ARCH_BITS == 32
     RTFAR32   pfnHandler;
     pfnHandler.off = VBOXIDTE_OFFSET(*pIdte);
@@ -83 +96 @@
     const RTR0UINTREG uRSP = ~(RTR0UINTREG)0;
 
-#else /* 64-bit: */
+# else /* 64-bit: */
     RTFAR64   pfnHandler;
     pfnHandler.off = VBOXIDTE_OFFSET(*pIdte);
@@ -96 +109 @@
     }
 
-#endif
+# endif
 
     /*
@@ -102 +115 @@
      */
     trpmR0DispatchHostInterrupt(pfnHandler.off, pfnHandler.sel, uRSP);
+#endif
 }