Changeset 7873 in vbox for trunk

Timestamp:

Apr 10, 2008 3:46:31 PM (17 years ago)

Author:

vboxsync

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

29497

Message:

AssertCR3: check the 4 PDPTs too in PAE legacy mode

File:

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

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

@@ -2986 +2986 @@
                     ("Invalid GCPhysCR3=%VGp cr3=%VGp\n", pPGM->GCPhysCR3, (RTGCPHYS)cr3),
                     false);
-# if PGM_GST_TYPE == PGM_TYPE_32BIT
+# ifndef IN_RING0
+#  if PGM_GST_TYPE == PGM_TYPE_32BIT
     rc = PGMShwGetPage(pVM, pPGM->pGuestPDGC, NULL, &HCPhysShw);
-# else
+#  else
     rc = PGMShwGetPage(pVM, pPGM->pGstPaePDPTGC, NULL, &HCPhysShw);
-# endif
+#  endif
     AssertRCReturn(rc, 1);
     HCPhys = NIL_RTHCPHYS;
     rc = pgmRamGCPhys2HCPhys(pPGM, cr3 & GST_CR3_PAGE_MASK, &HCPhys);
     AssertMsgReturn(HCPhys == HCPhysShw, ("HCPhys=%VHp HCPhyswShw=%VHp (cr3)\n", HCPhys, HCPhysShw), false);
-# if PGM_GST_TYPE == PGM_TYPE_32BIT && defined(IN_RING3)
+#  if PGM_GST_TYPE == PGM_TYPE_32BIT && defined(IN_RING3)
     RTGCPHYS GCPhys;
     rc = PGMR3DbgHCPtr2GCPhys(pVM, pPGM->pGuestPDHC, &GCPhys);
     AssertRCReturn(rc, 1);
     AssertMsgReturn((cr3 & GST_CR3_PAGE_MASK) == GCPhys, ("GCPhys=%VGp cr3=%VGp\n", GCPhys, (RTGCPHYS)cr3), false);
-# endif
+#  endif
+#endif /* !IN_RING0 */
 
 # if PGM_GST_TYPE == PGM_TYPE_32BIT
@@ -3020 +3022 @@
 
 /** @todo call the other two PGMAssert*() functions. */
+
+# if PGM_GST_TYPE == PGM_TYPE_PAE
+    /*
+     * Check the 4 PDPTs too.
+     */
+    for (unsigned i = 0; i < 4; i++)
+    {
+        RTHCPTR  HCPtr;
+        RTHCPHYS HCPhys;
+        RTGCPHYS GCPhys = pVM->pgm.s.CTXSUFF(pGstPaePDPT)->a[i].u & X86_PDPE_PG_MASK;
+        int rc2 = pgmRamGCPhys2HCPtrAndHCPhysWithFlags(&pVM->pgm.s, GCPhys, &HCPtr, &HCPhys);
+        if (VBOX_SUCCESS(rc2))
+        {
+            AssertMsg(   pVM->pgm.s.apGstPaePDsHC[i]    == (R3R0PTRTYPE(PX86PDPAE))HCPtr
+                      && pVM->pgm.s.apGstPaePDsGC[i]    == (GCPTRTYPE(PX86PDPAE))GCPtr
+                      && pVM->pgm.s.aGCPhysGstPaePDs[i] == GCPhys,
+                      ("idx %d apGstPaePDsHC %VHv vs %VHv apGstPaePDsGC %VGv vs %VGv aGCPhysGstPaePDs %VGp vs %VGp\n", 
+                       i, pVM->pgm.s.apGstPaePDsHC[i], HCPtr, pVM->pgm.s.apGstPaePDsGC[i], GCPtr, pVM->pgm.s.aGCPhysGstPaePDs[i], GCPhys));
+        }
+    }
+# endif
 
     /*