Changeset 45773 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 26, 2013 12:17:25 PM (12 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Darwin hybrid-kernel fixes.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (8 diffs)

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

@@ -46 +46 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
+#define HMVMXHCUINTREG                RTHCUINTREG
 #if defined(RT_ARCH_AMD64)
 # define HMVMX_IS_64BIT_HOST_MODE()   (true)
 #elif defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+extern "C" uint32_t g_fVMXIs64bitHost;
 # define HMVMX_IS_64BIT_HOST_MODE()   (g_fVMXIs64bitHost != 0)
+# undef HMVMXHCUINTREG
+# define HMVMXHCUINTREG               uint64_t
 #else
 # define HMVMX_IS_64BIT_HOST_MODE()   (false)
@@ -2050 +2054 @@
     if (HMVMX_IS_64BIT_HOST_MODE())
     {
-        uint64_t uReg = hmR0Get64bitCR3();
-        rc |= VMXWriteVmcs64(VMX_VMCS_HOST_CR3, uReg);
+        uint64_t uRegCR3 = hmR0Get64bitCR3();
+        rc |= VMXWriteVmcs64(VMX_VMCS_HOST_CR3, uRegCR3);
     }
     else
@@ -2156 +2160 @@
     if (HMVMX_IS_64BIT_HOST_MODE())
     {
-        X86XDTR64 Gtr64;
+        X86XDTR64 Gdtr64;
         X86XDTR64 Idtr64;
         hmR0Get64bitGdtrAndIdtr(&Gdtr64, &Idtr64);
@@ -3818 +3822 @@
 
                 /* VMX control bits. */
-                uint32_t    u32Val;
-                uint64_t    u64Val;
-                RTHCUINTREG uHCReg;
+                uint32_t        u32Val;
+                uint64_t        u64Val;
+                HMVMXHCUINTREG  uHCReg;
                 rc = VMXReadVmcs32(VMX_VMCS32_CTRL_PIN_EXEC_CONTROLS, &u32Val);         AssertRC(rc);
                 Log(("VMX_VMCS32_CTRL_PIN_EXEC_CONTROLS       %#RX32\n", u32Val));
@@ -4042 +4046 @@
     PHMGLOBLCPUINFO pCpu;
     RTHCPHYS        HCPhysCpuPage;
-    RTHCUINTREG     uOldEFlags;
+    RTCCUINTREG     uOldEFlags;
 
     AssertReturn(pVM->hm.s.pfnHost32ToGuest64R0, VERR_HM_NO_32_TO_64_SWITCHER);
@@ -7464 +7468 @@
 static DECLCALLBACK(int) hmR0VmxExitErrInvalidGuestState(PVMCPU pVCpu, PCPUMCTX pMixedCtx, PVMXTRANSIENT pVmxTransient)
 {
-    uint32_t    uIntrState;
-    RTHCUINTREG uHCReg;
-    uint64_t    u64Val;
-    uint32_t    u32Val;
+    uint32_t       uIntrState;
+    HMVMXHCUINTREG uHCReg;
+    uint64_t       u64Val;
+    uint32_t       u32Val;
 
     int rc  = hmR0VmxReadEntryIntrInfoVmcs(pVmxTransient);
@@ -7776 +7780 @@
             {
                 case 0: /* CR0 */
-                    Log(("CR0 write rc=%d CR0=%#RGv\n", rc, pMixedCtx->cr0));
-                    pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0;
+                    Log(("CRX CR0 write rc=%d CR0=%#RGv\n", rc, pMixedCtx->cr0));
+                    pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0 | HM_CHANGED_GUEST_CR3;
                     break;
                 case 2: /* C2 **/
@@ -7784 +7788 @@
                 case 3: /* CR3 */
                     Assert(!pVM->hm.s.fNestedPaging || !CPUMIsGuestPagingEnabledEx(pMixedCtx));
-                    Log(("CR3 write rc=%d CR3=%#RGv\n", rc, pMixedCtx->cr3));
+                    Log(("CRX CR3 write rc=%d CR3=%#RGv\n", rc, pMixedCtx->cr3));
                     pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR3;
                     break;
                 case 4: /* CR4 */
-                    Log(("CR4 write rc=%d CR4=%#RGv\n", rc, pMixedCtx->cr4));
+                    Log(("CRX CR4 write rc=%d CR4=%#RGv\n", rc, pMixedCtx->cr4));
                     pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR4;
                     break;