Changeset 45291 in vbox for trunk/src

Timestamp:

Apr 2, 2013 3:31:42 PM (12 years ago)

Author:

vboxsync

Message:

VMM: HM bits.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• VMMR3/HM.cpp (modified) (1 diff)
• include/HMInternal.mac (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -2412 +2412 @@
 VMMDECL(bool) CPUMIsGuestInPAEMode(PVMCPU pVCpu)
 {
+#ifdef VBOX_WITH_OLD_VTX_CODE
     return (pVCpu->cpum.s.Guest.cr4 & X86_CR4_PAE)
         && (pVCpu->cpum.s.Guest.cr0 & (X86_CR0_PE | X86_CR0_PG)) == (X86_CR0_PE | X86_CR0_PG)
         && !(pVCpu->cpum.s.Guest.msrEFER & MSR_K6_EFER_LMA);
+#else
+    return (pVCpu->cpum.s.Guest.cr4 & X86_CR4_PAE)
+        && (pVCpu->cpum.s.Guest.cr0 & X86_CR0_PG)
+        && !(pVCpu->cpum.s.Guest.msrEFER & MSR_K6_EFER_LME);
+#endif
 }
 

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

@@ -2392 +2392 @@
 {
     /*
-     * The VMM device heap is a requirement for emulating real mode or protected mode without paging
+     * The VMM device heap is a requirement for emulating real-mode or protected-mode without paging
      * when the unrestricted guest execution feature is missing (VT-x only).
      */
-    if (    pVM->hm.s.vmx.fEnabled
-        &&  !pVM->hm.s.vmx.fUnrestrictedGuest
-        &&  !CPUMIsGuestInPagedProtectedModeEx(pCtx)
-        &&  !PDMVmmDevHeapIsEnabled(pVM)
-        &&  (pVM->hm.s.fNestedPaging || CPUMIsGuestInRealModeEx(pCtx)))
+#ifdef VBOX_WITH_OLD_VTX_CODE
+    if (   pVM->hm.s.vmx.fEnabled
+        && !pVM->hm.s.vmx.fUnrestrictedGuest
+        && !CPUMIsGuestInPagedProtectedModeEx(pCtx)
+        && !PDMVmmDevHeapIsEnabled(pVM)
+        && (pVM->hm.s.fNestedPaging || CPUMIsGuestInRealModeEx(pCtx)))
         return true;
+#else
+    if (   pVM->hm.s.vmx.fEnabled
+        && !pVM->hm.s.vmx.fUnrestrictedGuest
+        && CPUMIsGuestInRealModeEx(pCtx)
+        && !PDMVmmDevHeapIsEnabled(pVM))
+        return true;
+#endif
 
     return false;

trunk/src/VBox/VMM/include/HMInternal.mac

@@ -15 +15 @@
 ;
 
+%ifdef VBOX_WITH_OLD_VTX_CODE
 %define VMX_USE_CACHED_VMCS_ACCESSES
+%else
+%if HC_ARCH_BITS == 32
+%ifndef VBOX_WITH_HYBRID_32BIT_KERNEL
+%define VMX_USE_CACHED_VMCS_ACCESSES
+%endif  ; VBOX_WITH_HYBRID_32BIT_KERNEL
+%endif   ; HC_ARCH_BITS == 32
+%endif    ; VBOX_WITH_OLD_VTX_CODE
+
 %define VBOX_WITH_AUTO_MSR_LOAD_RESTORE