Changeset 31067 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

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

Author:

vboxsync

Message:

PGM: A couple of simplifications and optimizations. -assertions

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (5 diffs)
• PGMAllBth.h (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);

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -906 +906 @@
                         RTGCPHYS GCPhys2;
                         uint64_t fPageGst;
-                        Assert(HWACCMIsNestedPagingActive(pVM) == pVM->pgm.s.fNestedPaging);
                         if (!pVM->pgm.s.fNestedPaging)
                         {
@@ -2080 +2079 @@
     if (PdeDst.n.u1Size)
     {
-        Assert(HWACCMIsNestedPagingActive(pVM) == pVM->pgm.s.fNestedPaging);
         Assert(pVM->pgm.s.fNestedPaging);
         Log(("CPU%d: SyncPage: Pde (big:%RX64) at %RGv changed behind our back!\n", pVCpu->idCpu, PdeDst.u, GCPtrPage));
@@ -3461 +3459 @@
     LogFlow(("VerifyAccessSyncPage: GCPtrPage=%RGv fPage=%#x uErr=%#x\n", GCPtrPage, fPage, uErr));
 
-    Assert(HWACCMIsNestedPagingActive(pVM) == pVM->pgm.s.fNestedPaging);
     Assert(!pVM->pgm.s.fNestedPaging);
 #if   (   PGM_GST_TYPE == PGM_TYPE_32BIT \
@@ -4654 +4651 @@
            && PGM_GST_TYPE != PGM_TYPE_PROT))
 
-    Assert(HWACCMIsNestedPagingActive(pVM) == pVM->pgm.s.fNestedPaging);
     Assert(!pVM->pgm.s.fNestedPaging);
 
@@ -4802 +4798 @@
 
 #  if PGM_GST_TYPE != PGM_TYPE_REAL
-    Assert(HWACCMIsNestedPagingActive(pVM) == pVM->pgm.s.fNestedPaging);
     Assert(!pVM->pgm.s.fNestedPaging);
 #  endif