Changeset 17593 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Backed out 44052

Location:

trunk/src/VBox/VMM

Files:

• PGMMap.cpp (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (2 diffs)
• VMMAll/PGMAllMap.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMMap.cpp

@@ -1156 +1156 @@
         unsigned  iPDSrc;
         PX86PDPAE pPDSrc = pgmGstGetPaePDPtr(&pVM->pgm.s, (RTGCPTR32)iPDPTE << X86_PDPT_SHIFT, &iPDSrc, NULL);
-
-        /* It would be annoying to have to deal with a PD that isn't (yet) present in the guest PDPT. */ 
-        if (!pPDSrc) 
-            continue; 
 
         /*

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);
             }
         }

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

@@ -283 +283 @@
                         PX86PDPE pGstPdpe;
                         pGstPdpe = pgmGstGetPaePDPEPtr(&pVM->pgm.s, (iPdPt << X86_PDPT_SHIFT));
-                        AssertFatal(pGstPdpe);
-                        GstPdpe = *pGstPdpe;
+                        if (pGstPdpe)
+                            GstPdpe = *pGstPdpe;
+                        else
+                            GstPdpe.u = X86_PDPE_P;   /* rw/us are reserved for PAE pdpte's; accessed bit causes invalid VT-x guest state errors */
                     }
                     int rc = pgmShwSyncPaePDPtr(pVM, (iPdPt << X86_PDPT_SHIFT), &GstPdpe, &pShwPaePd);