Changeset 17591 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Mar 9, 2009 4:58:49 PM (16 years ago)

Author:

vboxsync

Message:

Better to allocate the hypervisor region in guest PDPEs that exist already.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

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

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

@@ -914 +914 @@
             if (CPUMGetGuestCR4(pVM) & X86_CR4_PAE)
             {
-                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;
-                }
+                Assert(pGstPdpe->n.u1Present);
+                GCPdPt  = pGstPdpe->u & X86_PDPE_PG_MASK;
+                enmKind = PGMPOOLKIND_PAE_PD_FOR_PAE_PD;
             }
             else
@@ -935 +922 @@
                 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));
-                        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 */
+                        AssertFatal(pGstPdpe);
+                        GstPdpe = *pGstPdpe;
                     }
                     int rc = pgmShwSyncPaePDPtr(pVM, (iPdPt << X86_PDPT_SHIFT), &GstPdpe, &pShwPaePd);