Changeset 17593 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

Timestamp:

Mar 9, 2009 5:11:35 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

44054

Message:

Backed out 44052

File:

• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -914 +914 @@
             if (CPUMGetGuestCR4(pVM) & X86_CR4_PAE)
             {
-                AssertMsg(pGstPdpe->n.u1Present, ("GstPdpe=%RX64\n", pGstPdpe->u));
-                GCPdPt  = pGstPdpe->u & X86_PDPE_PG_MASK;
-                enmKind = PGMPOOLKIND_PAE_PD_FOR_PAE_PD;
+                if (!pGstPdpe->n.u1Present)
+                {
+                    /* PD not present; guest must reload CR3 to change it.
+                     * No need to monitor anything in this case.
+                     */
+                    Assert(!HWACCMIsEnabled(pVM));
+
+                    GCPdPt  = pGstPdpe->u & X86_PDPE_PG_MASK;
+                    enmKind = PGMPOOLKIND_PAE_PD_PHYS;
+                    pGstPdpe->n.u1Present = 1;
+                }
+                else
+                {
+                    GCPdPt  = pGstPdpe->u & X86_PDPE_PG_MASK;
+                    enmKind = PGMPOOLKIND_PAE_PD_FOR_PAE_PD;
+                }
             }
             else
@@ -922 +935 @@
                 GCPdPt  = CPUMGetGuestCR3(pVM);
                 enmKind = (PGMPOOLKIND)(PGMPOOLKIND_PAE_PD0_FOR_32BIT_PD + iPdPt);
-                Assert(pGstPdpe->n.u1Present);
             }
         }