Changeset 9942 in vbox

Timestamp:

Jun 26, 2008 9:38:31 AM (17 years ago)

Author:

vboxsync

Message:

PAE fixes

File:

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

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

@@ -2214 +2214 @@
     PX86PD          pPDDst   = pVM->pgm.s.CTXMID(p,32BitPD);
 # elif PGM_SHW_TYPE == PGM_TYPE_PAE
-    const unsigned  iPDDst   = GCPtrPage >> SHW_PD_SHIFT;
+    const unsigned  iPDDst   = GCPtrPage >> SHW_PD_SHIFT;               /* 0 - 2047 */
     const unsigned  iPdpte   = (GCPtrPage >> X86_PDPT_SHIFT);
     PX86PDPT        pPdptDst = pVM->pgm.s.CTXMID(p,PaePDPT);
@@ -3112 +3112 @@
                 if (pVM->pgm.s.CTXMID(p,PaePDPT)->a[iPdpte].n.u1Present)
                 {
+                    LogFlow(("SyncCR3: guest PDPE %d not present; clear shw pdpe\n", iPdpte));
                         /* for each page directory entry */
                         for (unsigned iPD = 0; iPD < ELEMENTS(pPDSrc->a); iPD++)
@@ -3251 +3252 @@
 #  if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
                     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 + iPdpte * X86_PG_PAE_ENTRIES; NOREF(iPdShw);
 #  else
                     const unsigned iPdShw = iPD; NOREF(iPdShw);
@@ -3350 +3353 @@
 #  if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
                     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 + iPdpte * X86_PG_PAE_ENTRIES; NOREF(iPdShw);
 #  else
                     const unsigned iPdShw = iPD; NOREF(iPdShw);