Changeset 7842 in vbox for trunk/src/VBox

Timestamp:

Apr 9, 2008 3:19:16 PM (17 years ago)

Author:

vboxsync

Message:

AssertCR3 for PAE guest mode

File:

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

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

@@ -2971 +2971 @@
     unsigned    cErrors = 0;
 
-#if PGM_GST_TYPE == PGM_TYPE_32BIT
+#if    PGM_GST_TYPE == PGM_TYPE_32BIT \
+    || PGM_GST_TYPE == PGM_TYPE_PAE
+
     PPGM        pPGM = &pVM->pgm.s;
     RTHCPHYS    HCPhysShw;              /* page address derived from the shadow page tables. */
@@ -2979 +2981 @@
 
     /*
-     * Check that the Guest CR3 and all it's mappings are correct.
-     */
+     * Check that the Guest CR3 and all its mappings are correct.
+     */
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
     AssertMsgReturn(pPGM->GCPhysCR3 == (cr3 & GST_CR3_PAGE_MASK),
                     ("Invalid GCPhysCR3=%VGp cr3=%VGp\n", pPGM->GCPhysCR3, (RTGCPHYS)cr3),
                     false);
     rc = PGMShwGetPage(pVM, pPGM->pGuestPDGC, NULL, &HCPhysShw);
+# else
+    rc = PGMShwGetPage(pVM, pPGM->pGstPaePDPTGC, NULL, &HCPhysShw);
+# 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);
-# ifdef IN_RING3
+# if PGM_GST_TYPE == PGM_TYPE_32BIT && defined(IN_RING3)
     RTGCPHYS GCPhys;
     rc = PGMR3DbgHCPtr2GCPhys(pVM, pPGM->pGuestPDHC, &GCPhys);
@@ -2995 +3001 @@
     AssertMsgReturn((cr3 & GST_CR3_PAGE_MASK) == GCPhys, ("GCPhys=%VGp cr3=%VGp\n", GCPhys, (RTGCPHYS)cr3), false);
 # endif
-    const X86PD *pPDSrc = CTXSUFF(pPGM->pGuestPD);
+
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
+    const GSTPD    *pPDSrc = CTXSUFF(pPGM->pGuestPD);
+# endif
 
     /*
@@ -3022 +3031 @@
          iPDDst++, GCPtr += _4G / cPDEs)
     {
+# if PGM_GST_TYPE == PGM_TYPE_PAE
+        const PX86PDPAE pPDSrc = pPGM->CTXMID(ap,PaePDs)[(GCPtr >> GST_PDPT_SHIFT) & GST_PDPT_MASK];
+#endif
+
         const SHWPDE PdeDst = pPDDst->a[iPDDst];
         if (PdeDst.u & PGM_PDFLAGS_MAPPING)
@@ -3062 +3075 @@
             }
 
-            const X86PDE    PdeSrc = pPDSrc->a[iPDDst >> (GST_PD_SHIFT - SHW_PD_SHIFT)];
+            const GSTPDE PdeSrc = pPDSrc->a[(iPDDst >> (GST_PD_SHIFT - SHW_PD_SHIFT)) & GST_PD_MASK];
             if (!PdeSrc.n.u1Present)
             {
@@ -3081 +3094 @@
             else
             {
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
                 if (PdeSrc.u & X86_PDE4M_PG_HIGH_MASK)
                 {
@@ -3088 +3102 @@
                     continue;
                 }
+# endif
                 GCPhysGst = PdeSrc.u & GST_PDE_BIG_PG_MASK;
 # if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT