Changeset 14102 in vbox for trunk/src/VBox

Timestamp:

Nov 11, 2008 5:49:53 PM (16 years ago)

Author:

vboxsync

Message:

#1865: shadow pae, the sixth bit.

File:

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

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

@@ -3186 +3186 @@
     Assert(PGMPhysGCPhys2HCPtrAssert(pVM, (RTGCPHYS)(cr3 & GST_CR3_PAGE_MASK), sizeof(*pPDSrc)) == pPDSrc);
 #   endif
-#  endif
+#  endif /* PGM_GST_TYPE == PGM_TYPE_32BIT */
 
     /*
-     * Iterate the page directory.
+     * Iterate the the CR3 page.
      */
     PPGMMAPPING pMapping;
@@ -3207 +3207 @@
         iPdNoMapping  = ~0U;
     }
+
 #  if PGM_GST_TYPE == PGM_TYPE_PAE
     for (uint64_t iPdpt = 0; iPdpt < GST_PDPE_ENTRIES; iPdpt++)
@@ -3245 +3246 @@
 #  if PGM_SHW_TYPE == PGM_TYPE_32BIT
             Assert(&pVM->pgm.s.CTXMID(p,32BitPD)->a[iPD] == pPDEDst);
-#  elif PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
-            AssertMsg(&pVM->pgm.s.CTXMID(ap,PaePDs)[iPD * 2 / 512]->a[iPD * 2 % 512] == pPDEDst, ("%p vs %p\n", &pVM->pgm.s.CTXMID(ap,PaePDs)[iPD * 2 / 512]->a[iPD * 2 % 512], pPDEDst));
+#  elif PGM_SHW_TYPE == PGM_TYPE_PAE
+#   ifdef VBOX_STRICT
+            RTGCPTR GCPtrStrict = (uint32_t)iPD << GST_PD_SHIFT;
+#    if PGM_GST_TYPE == PGM_TYPE_PAE
+            GCPtrStrict |= iPdpt << X86_PDPT_SHIFT;
+#    endif
+            AssertMsg(pgmShwGetPaePDEPtr(&pVM->pgm.s, GCPtrStrict) == pPDEDst, ("%p vs %p (%RGv)\n", pgmShwGetPaePDEPtr(&pVM->pgm.s, GCPtrStrict), pPDEDst, GCPtrStrict));
+#   endif /* VBOX_STRICT */
 #  endif
             GSTPDE PdeSrc = pPDSrc->a[iPD];
@@ -3291 +3298 @@
                         pMapping = pMapping->pNextR3;
                     iPdNoMapping = pMapping ? pMapping->GCPtr >> GST_PD_SHIFT : ~0U;
-#   else
+#   else  /* !IN_RING3 */
                     LogFlow(("SyncCR3: detected conflict -> VINF_PGM_SYNC_CR3\n"));
                     return VINF_PGM_SYNC_CR3;
-#   endif
+#   endif /* !IN_RING3 */
                 }
 #  else  /* (PGM_GST_TYPE != PGM_TYPE_32BIT && PGM_GST_TYPE != PGM_TYPE_PAE) || PGM_WITHOUT_MAPPINGS */
@@ -3310 +3317 @@
                 for (unsigned i = 0, iPdShw = iPD * 2; i < 2; i++, iPdShw++) /* pray that the compiler unrolls this */
 #  elif PGM_GST_TYPE == PGM_TYPE_PAE
-                    const unsigned iPdShw = iPD + iPdpt * X86_PG_PAE_ENTRIES; NOREF(iPdShw);
+                const unsigned iPdShw = iPD + iPdpt * X86_PG_PAE_ENTRIES; NOREF(iPdShw);
 #  else
                 const unsigned iPdShw = iPD; NOREF(iPdShw);
@@ -3384 +3391 @@
                     else
                         MY_STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,SyncCR3DstNotPresent));
+
+                    /* advance */
                     pPDEDst++;
-                }
+                } /* foreach 2MB PAE PDE in 4MB guest PDE */
             }
 #  if PGM_GST_TYPE == PGM_TYPE_PAE
@@ -3399 +3408 @@
                 for (unsigned i = 0, iPdShw = iPD * 2; i < 2; i++, iPdShw++) /* pray that the compiler unrolls this */
 #  elif PGM_GST_TYPE == PGM_TYPE_PAE
-                    const unsigned iPdShw = iPD + iPdpt * X86_PG_PAE_ENTRIES; NOREF(iPdShw);
+                const unsigned iPdShw = iPD + iPdpt * X86_PG_PAE_ENTRIES;
 #  else
-                const unsigned iPdShw = iPD; NOREF(iPdShw);
+                const unsigned iPdShw = iPD;
 #  endif
                 {
@@ -3431 +3440 @@
                 {
                     /*
-                    * Check for conflicts for subsequent pagetables
-                    * and advance to the next mapping.
-                    */
+                     * Check for conflicts for subsequent pagetables
+                     * and advance to the next mapping.
+                     */
                     iPdNoMapping = ~0U;
                     unsigned iPT = cPTs;
@@ -3451 +3460 @@
 
                             /*
-                            * Update iPdNoMapping and pMapping.
-                            */
+                             * Update iPdNoMapping and pMapping.
+                             */
                             pMapping = pVM->pgm.s.CTX_SUFF(pMappings);
                             while (pMapping && pMapping->GCPtr < (iPD << GST_PD_SHIFT))
@@ -3547 +3556 @@
     || PGM_GST_TYPE == PGM_TYPE_AMD64
 
-#  if PGM_GST_TYPE == PGM_TYPE_AMD64
+# if PGM_GST_TYPE == PGM_TYPE_AMD64
     bool            fBigPagesSupported = true;
-#  else
+# else
     bool            fBigPagesSupported = !!(CPUMGetGuestCR4(pVM) & X86_CR4_PSE);
-#  endif
+# endif
     PPGM            pPGM = &pVM->pgm.s;
     RTGCPHYS        GCPhysGst;              /* page address derived from the guest page tables. */
@@ -3582 +3591 @@
     AssertMsgReturn((cr3 & GST_CR3_PAGE_MASK) == GCPhys, ("GCPhys=%RGp cr3=%RGp\n", GCPhys, (RTGCPHYS)cr3), false);
 #  endif
-#endif /* !IN_RING0 */
+# endif /* !IN_RING0 */
 
     /*
@@ -3674 +3683 @@
             PX86PDPE        pPdpeDst;
             RTGCPHYS        GCPhysPdeSrc;
-#   if PGM_GST_TYPE == PGM_TYPE_PAE
+#  if PGM_GST_TYPE == PGM_TYPE_PAE
             X86PDPE         PdpeSrc;
             PGSTPD          pPDSrc    = pgmGstGetPaePDPtr(&pVM->pgm.s, GCPtr, &iPDSrc, &PdpeSrc);
             PX86PDPT        pPdptDst  = pgmShwGetPaePDPTPtr(&pVM->pgm.s);
-#   else
+#  else
             PX86PML4E       pPml4eSrc;
             X86PDPE         PdpeSrc;
@@ -3693 +3702 @@
             }
             Assert(pPDDst);
-#   endif
+#  endif
             Assert(iPDSrc == 0);
 
@@ -3739 +3748 @@
 #  endif
 
-# else
+# else  /* PGM_GST_TYPE != PGM_TYPE_AMD64 && PGM_GST_TYPE != PGM_TYPE_PAE */
         {
-# endif
+# endif /* PGM_GST_TYPE != PGM_TYPE_AMD64 && PGM_GST_TYPE != PGM_TYPE_PAE */
 # if PGM_GST_TYPE == PGM_TYPE_32BIT
             GSTPD const    *pPDSrc = pgmGstGet32bitPDPtr(&pVM->pgm.s);
@@ -3747 +3756 @@
             PCX86PD         pPDDst = pPGM->CTXMID(p,32BitPD);
 #  endif
-# endif
+# endif /* PGM_GST_TYPE == PGM_TYPE_32BIT */
             /*
             * Iterate the shadow page directory.
@@ -3758 +3767 @@
                 iPDDst++, GCPtr += cIncrement)
             {
-#  if PGM_SHW_TYPE == PGM_TYPE_PAE
+# if PGM_SHW_TYPE == PGM_TYPE_PAE
                 const SHWPDE PdeDst = *pgmShwGetPaePDEPtr(pPGM, GCPtr);
-#  else
+# else
                 const SHWPDE PdeDst = pPDDst->a[iPDDst];
-#  endif
+# endif
                 if (PdeDst.u & PGM_PDFLAGS_MAPPING)
                 {
@@ -4268 +4277 @@
 # endif
 
-#endif
+#endif /* GST == 32BIT, PAE or AMD64 */
     return cErrors;