Changeset 16418 in vbox for trunk/src

Timestamp:

Jan 30, 2009 2:49:06 PM (16 years ago)

Author:

vboxsync

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

42282

Message:

Updates

Location:

trunk/src/VBox/VMM

Files:

• PGMBth.h (modified) (1 diff)
• PGMPool.cpp (modified) (1 diff)
• VMMAll/PGMAllMap.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/PGMBth.h

@@ -138 +138 @@
            || PGM_SHW_TYPE == PGM_TYPE_AMD64) \
        && (   PGM_GST_TYPE == PGM_TYPE_REAL   \
-           && PGM_GST_TYPE == PGM_TYPE_PROT))
+           || PGM_GST_TYPE == PGM_TYPE_PROT))
 
     Assert(!HWACCMIsNestedPagingActive(pVM));

trunk/src/VBox/VMM/PGMPool.cpp

@@ -332 +332 @@
         pPool->aPages[iPage].iAgePrev       = NIL_PGMPOOL_IDX;
 #endif
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
         Assert(VALID_PTR(pPool->aPages[iPage].pvPageR3));
+#endif
         Assert(pPool->aPages[iPage].idx == iPage);
         Assert(pPool->aPages[iPage].GCPhys == NIL_RTGCPHYS);

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

@@ -221 +221 @@
         return;
 
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+    if (!pVM->pgm.s.CTX_SUFF(pShwPageCR3))
+        return;    /* too early */
+#endif
+
     PGMMODE enmShadowMode = PGMGetShadowMode(pVM);
     Assert(enmShadowMode <= PGMMODE_PAE_NX);
@@ -319 +324 @@
         return;
 
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+    if (!pVM->pgm.s.CTX_SUFF(pShwPageCR3))
+        return;    /* too early */
+#endif
+
     iOldPDE += i;
     while (i-- > 0)
@@ -379 +389 @@
         return VINF_SUCCESS;
 
-    Assert(PGMGetGuestMode(pVM) >= PGMMODE_32_BIT && PGMGetGuestMode(pVM) <= PGMMODE_PAE_NX);
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
     if (!pVM->pgm.s.CTX_SUFF(pShwPageCR3))
@@ -385 +394 @@
 #endif
 
+    Assert(PGMGetGuestMode(pVM) >= PGMMODE_32_BIT && PGMGetGuestMode(pVM) <= PGMMODE_PAE_NX);
+
     /*
      * Iterate mappings.
@@ -413 +424 @@
 
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    Assert(PGMGetGuestMode(pVM) >= PGMMODE_32_BIT && PGMGetGuestMode(pVM) <= PGMMODE_PAE_NX);
-
     if (!pVM->pgm.s.CTX_SUFF(pShwPageCR3))
         return VINF_SUCCESS;    /* too early */
+
+    Assert(PGMGetGuestMode(pVM) >= PGMMODE_32_BIT && PGMGetGuestMode(pVM) <= PGMMODE_PAE_NX);
 #endif