Changeset 14095 in vbox

Timestamp:

Nov 11, 2008 4:51:58 PM (16 years ago)

Author:

vboxsync

Message:

#1865: shadow pae, the third bit.

File:

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

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

@@ -3732 +3732 @@
         }
 
-# if PGM_GST_TYPE == PGM_TYPE_PAE
-        /* not correct to call pgmPoolGetPage */
-        AssertFailed();
-# endif
         pShwPdpt = pgmPoolGetPage(pPool, pPml4eDst->u & X86_PML4E_PG_MASK);
         GCPhysPdptSrc = pPml4eSrc->u & X86_PML4E_PG_MASK_FULL;
@@ -3764 +3760 @@
             continue;
         }
-# else
-    {
-# endif
+# else  /* PGM_GST_TYPE != PGM_TYPE_AMD64 */
+    {
+# endif /* PGM_GST_TYPE != PGM_TYPE_AMD64 */
 
 # if PGM_GST_TYPE == PGM_TYPE_AMD64 || PGM_GST_TYPE == PGM_TYPE_PAE
@@ -3783 +3779 @@
             X86PDPE         PdpeSrc;
             PGSTPD          pPDSrc    = pgmGstGetPaePDPtr(&pVM->pgm.s, GCPtr, &iPDSrc, &PdpeSrc);
-            PX86PDPAE       pPDDst    = pVM->pgm.s.CTXMID(ap,PaePDs)[0];
             PX86PDPT        pPdptDst  = pgmShwGetPaePDPTPtr(&pVM->pgm.s);
 #   else
@@ -3853 +3848 @@
 #  if PGM_SHW_TYPE == PGM_TYPE_32BIT
             PCX86PD         pPDDst = pPGM->CTXMID(p,32BitPD);
-#  else
-            PCX86PDPAE      pPDDst = pVM->pgm.s.CTXMID(ap,PaePDs)[0]; /* We treat this as a PD with 2048 entries, so no need to and with SHW_PD_MASK to get iPDDst */
 #  endif
 # endif
@@ -3867 +3860 @@
                 iPDDst++, GCPtr += cIncrement)
             {
+#  if PGM_SHW_TYPE == PGM_TYPE_PAE
+                const SHWPDE PdeDst = *pgmShwGetPaePDEPtr(pPGM, GCPtr);
+#  else
                 const SHWPDE PdeDst = pPDDst->a[iPDDst];
+#  endif
                 if (PdeDst.u & PGM_PDFLAGS_MAPPING)
                 {