Changeset 14677 in vbox

Timestamp:

Nov 27, 2008 1:18:47 AM (16 years ago)

Author:

vboxsync

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

39987

Message:

SyncCR3: Fixed pPDEDst walking with GST=32/SHW=PAE. Fixed assertion.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (3 diffs)

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

@@ -1876 +1876 @@
     PdeDst = pPDDst->a[iPDDst];
 # endif
-    Assert(PdeDst.n.u1Present);
+    AssertMsg(PdeDst.n.u1Present, ("#llx\n", (uint64_t)PdeDst.u));
     PPGMPOOLPAGE    pShwPage = pgmPoolGetPageByHCPhys(pVM, PdeDst.u & SHW_PDE_PG_MASK);
     PSHWPT pPTDst = (PSHWPT)PGMPOOL_PAGE_2_PTR(pVM, pShwPage);
@@ -3166 +3166 @@
     PGSTPD      pPDSrc = pgmGstGet32bitPDPtr(&pVM->pgm.s);
     Assert(pPDSrc);
-#   ifndef IN_RC
+#   if !defined(IN_RC) && !defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
     Assert(PGMPhysGCPhys2HCPtrAssert(pVM, (RTGCPHYS)(cr3 & GST_CR3_PAGE_MASK), sizeof(*pPDSrc)) == pPDSrc);
 #   endif
@@ -3227 +3227 @@
         {
 #  if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
-            if (!(iPD & (X86_PG_PAE_ENTRIES - 1))) /* Start of new PD. */
+            if ((iPD & 255) == 0) /* Start of new PD. */
                 pPDEDst = pgmShwGetPaePDEPtr(&pVM->pgm.s, (uint32_t)iPD << GST_PD_SHIFT);
 #  endif