Changeset 13174 in vbox

Timestamp:

Oct 10, 2008 1:29:27 PM (16 years ago)

Author:

vboxsync

Message:

Cleaned up a bit

Location:

trunk

Files:

• include/VBox/cpum.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (4 diffs)

trunk/include/VBox/cpum.h

@@ -744 +744 @@
 
 /**
+ * Tests if the guest is running in paged protected or not.
+ *
+ * @returns true if in paged protected mode, otherwise false.
+ * @param   pVM     The VM handle.
+ */
+DECLINLINE(bool) CPUMIsGuestInPagedProtectedModeEx(PCPUMCTX pCtx)
+{
+    return (pCtx->cr0 & (X86_CR0_PE | X86_CR0_PG)) == (X86_CR0_PE | X86_CR0_PG);
+}
+
+/**
  * Tests if the guest is running in long mode or not.
  *

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

@@ -1076 +1076 @@
         if (pVM->hwaccm.s.fNestedPaging)
         {
-            if (!(pCtx->cr0 & X86_CR0_PG))
+            if (CPUMIsGuestInPagedProtectedModeEx(pCtx))
+            {
+                /* Disable cr3 read/write monitoring as we don't need it for EPT. */
+                pVM->hwaccm.s.vmx.proc_ctls &=  ~(  VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR3_LOAD_EXIT 
+                                                  | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR3_STORE_EXIT);
+            }
+            else
             {
                 /* Reenable cr3 read/write monitoring as our identity mapped page table is active. */
                 pVM->hwaccm.s.vmx.proc_ctls |=   VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR3_LOAD_EXIT 
                                                | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR3_STORE_EXIT;
-            }
-            else
-            {
-                /* Disable cr3 read/write monitoring as we don't need it for EPT. */
-                pVM->hwaccm.s.vmx.proc_ctls &=  ~(  VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR3_LOAD_EXIT 
-                                                  | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR3_STORE_EXIT);
             }
             rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVM->hwaccm.s.vmx.proc_ctls);
@@ -1207 +1207 @@
             AssertRC(rc);
 
-            if (!(pCtx->cr0 & X86_CR0_PG))
+            if (!CPUMIsGuestInPagedProtectedModeEx(pCtx))
             {
                 RTGCPHYS GCPhys;
@@ -2446 +2446 @@
                 break;
             case 3:
-                Assert(!pVM->hwaccm.s.fNestedPaging || !(pCtx->cr0 & X86_CR0_PG));
+                Assert(!pVM->hwaccm.s.fNestedPaging || !CPUMIsGuestInPagedProtectedModeEx(pCtx));
                 pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_CR3;
                 break;
@@ -2474 +2474 @@
             STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitCRxRead);
 
-            Assert(!pVM->hwaccm.s.fNestedPaging || !(pCtx->cr0 & X86_CR0_PG) || VMX_EXIT_QUALIFICATION_CRX_REGISTER(exitQualification) != USE_REG_CR3);
+            Assert(!pVM->hwaccm.s.fNestedPaging || !CPUMIsGuestInPagedProtectedModeEx(pCtx) || VMX_EXIT_QUALIFICATION_CRX_REGISTER(exitQualification) != USE_REG_CR3);
 
             /* CR8 reads only cause an exit when the TPR shadow feature isn't present. */