Changeset 8034 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 16, 2008 12:58:18 PM (17 years ago)

Author:

vboxsync

Message:

Fixed another regression (pae shadow, 32 bits guest)

File:

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

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

@@ -2752 +2752 @@
                     {
                         /* It's fixed, just skip the mapping. */
-                        const unsigned cPTs = pMapping->cb >> SHW_PD_SHIFT;
+                        const unsigned cPTs = pMapping->cb >> GST_PD_SHIFT;
                         iPD += cPTs - 1;
-                        pPDEDst += cPTs;
+                        pPDEDst += cPTs + (PGM_GST_TYPE != PGM_SHW_TYPE) * cPTs;    /* Only applies to the pae shadow and 32 bits guest case */
                         pMapping = pMapping->CTXALLSUFF(pNext);
                         iPdNoMapping = pMapping ? pMapping->GCPtr >> GST_PD_SHIFT : ~0U;
@@ -2902 +2902 @@
       && !defined(PGM_WITHOUT_MAPPINGS)
 
-                const unsigned cPTs = pMapping->cb >> SHW_PD_SHIFT; /* needed below to skip the mapping */
+                const unsigned cPTs = pMapping->cb >> GST_PD_SHIFT;
 
                 Assert(pgmMapAreMappingsEnabled(&pVM->pgm.s));
@@ -2918 +2918 @@
                      */
                     iPdNoMapping = ~0U;
-                    unsigned iPT = pMapping->cb >> GST_PD_SHIFT;
+                    unsigned iPT = cPTs;
                     while (iPT-- > 1)
                     {
@@ -2957 +2957 @@
                 /* advance. */
                 iPD += cPTs - 1;
-                pPDEDst += cPTs;
+                pPDEDst += cPTs + (PGM_GST_TYPE != PGM_SHW_TYPE) * cPTs;    /* Only applies to the pae shadow and 32 bits guest case */
+#   if PGM_GST_TYPE != PGM_SHW_TYPE
+                AssertCompile(PGM_GST_TYPE == PGM_TYPE_32BIT && PGM_SHW_TYPE == PGM_TYPE_PAE);
+#   endif
 #  else  /* PGM_GST_TYPE != PGM_TYPE_32BIT && PGM_GST_TYPE != PGM_TYPE_PAE && PGM_WITHOUT_MAPPINGS */
                 Assert(!pgmMapAreMappingsEnabled(&pVM->pgm.s));