Changeset 31067 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

Timestamp:

Jul 23, 2010 2:50:12 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

64002

Message:

PGM: A couple of simplifications and optimizations. -assertions

File:

• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (5 diffs)

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

@@ -628 +628 @@
     }
 
-    Assert(HWACCMIsNestedPagingActive(pVM) == pVM->pgm.s.fNestedPaging);
     if (!pVM->pgm.s.fNestedPaging)
     {
@@ -944 +943 @@
 # endif
 
-        Assert(HWACCMIsNestedPagingActive(pVM) == pVM->pgm.s.fNestedPaging);
         if (pVM->pgm.s.fNestedPaging || !CPUMIsGuestPagingEnabled(pVCpu))
         {
@@ -1065 +1063 @@
     const unsigned iPml4         = (GCPtr >> X86_PML4_SHIFT) & X86_PML4_MASK;
     PX86PML4E      pPml4e        = pgmShwGetLongModePML4EPtr(pPGM, iPml4);
-    Assert(HWACCMIsNestedPagingActive(pVM) == pVM->pgm.s.fNestedPaging);
     bool           fNestedPagingOrNoGstPaging = pVM->pgm.s.fNestedPaging || !CPUMIsGuestPagingEnabled(pVCpu);
     PPGMPOOLPAGE   pShwPage;
@@ -1220 +1217 @@
     int            rc;
 
-    Assert(HWACCMIsNestedPagingActive(pVM) == pVM->pgm.s.fNestedPaging);
     Assert(pVM->pgm.s.fNestedPaging);
     Assert(PGMIsLockOwner(pVM));
@@ -1838 +1834 @@
 
     /* We assume we're only called in nested paging mode. */
-    Assert(HWACCMIsNestedPagingActive(pVM) == pVM->pgm.s.fNestedPaging);
     Assert(pVM->pgm.s.fNestedPaging || pVCpu->pgm.s.enmShadowMode == PGMMODE_EPT);
     Assert(pVM->pgm.s.fMappingsDisabled);