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

Timestamp:

Aug 21, 2008 9:07:51 AM (16 years ago)

Author:

vboxsync

Message:

Added support for PSE-36.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (7 diffs)
• PGMAllGst.h (modified) (3 diffs)
• PGMAllPhys.cpp (modified) (1 diff)

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

@@ -326 +326 @@
         if (    PdeSrc.b.u1Size
             &&  fBigPagesSupported)
-            GCPhys = (PdeSrc.u & GST_PDE_BIG_PG_MASK)
+            GCPhys = GST_GET_PDE_BIG_PG_GCPHYS(PdeSrc)
                     | ((RTGCPHYS)pvFault & (GST_BIG_PAGE_OFFSET_MASK ^ PAGE_OFFSET_MASK));
         else
@@ -1211 +1211 @@
             /* Before freeing the page, check if anything really changed. */
             PPGMPOOLPAGE    pShwPage = pgmPoolGetPageByHCPhys(pVM, PdeDst.u & SHW_PDE_PG_MASK);
-            RTGCPHYS        GCPhys   = PdeSrc.u & GST_PDE_BIG_PG_MASK;
+            RTGCPHYS        GCPhys   = GST_GET_PDE_BIG_PG_GCPHYS(PdeSrc);
 # if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
             /* Select the right PDE as we're emulating a 4MB page directory with two 2 MB shadow PDEs.*/
@@ -1591 +1591 @@
     else
     {
-        GCPhys = PdeSrc.u & GST_PDE_BIG_PG_MASK;
+        GCPhys = GST_GET_PDE_BIG_PG_GCPHYS(PdeSrc);
 # if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
         /* Select the right PDE as we're emulating a 4MB page directory with two 2 MB shadow PDEs.*/
@@ -1706 +1706 @@
                  */
                 /* Calculate the GC physical address of this 4KB shadow page. */
-                RTGCPHYS GCPhys = (PdeSrc.u & GST_PDE_BIG_PG_MASK) | ((RTGCUINTPTR)GCPtrPage & GST_BIG_PAGE_OFFSET_MASK);
+                RTGCPHYS GCPhys = GST_GET_PDE_BIG_PG_GCPHYS(PdeSrc) | ((RTGCUINTPTR)GCPtrPage & GST_BIG_PAGE_OFFSET_MASK);
                 /* Find ram range. */
                 PPGMPAGE pPage;
@@ -2355 +2355 @@
         else
         {
-            GCPhys = PdeSrc.u & GST_PDE_BIG_PG_MASK;
+            GCPhys = GST_GET_PDE_BIG_PG_GCPHYS(PdeSrc);
 # if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
             /* Select the right PDE as we're emulating a 4MB page directory with two 2 MB shadow PDEs.*/
@@ -3335 +3335 @@
                             else
                             {
-                                GCPhys = PdeSrc.u & GST_PDE_BIG_PG_MASK;
+                                GCPhys = GST_GET_PDE_BIG_PG_GCPHYS(PdeSrc);
 #  if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
                                 /* Select the right PDE as we're emulating a 4MB page directory with two 2 MB shadow PDEs.*/
@@ -3853 +3853 @@
                         }
 # endif
-                        GCPhysGst = PdeSrc.u & GST_PDE_BIG_PG_MASK;
+                        GCPhysGst = GST_GET_PDE_BIG_PG_GCPHYS(PdeSrc);
 # if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
                         GCPhysGst |= GCPtr & RT_BIT(X86_PAGE_2M_SHIFT);

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

@@ -47 +47 @@
 #undef GST_PDPT_MASK
 #undef GST_PDPE_PG_MASK
+#undef GST_GET_PDE_BIG_PG_GCPHYS
 
 #if PGM_GST_TYPE == PGM_TYPE_REAL \
@@ -72 +73 @@
 # define GST_PDE_PG_MASK            X86_PDE_PG_MASK
 # define GST_PDE_BIG_PG_MASK        X86_PDE4M_PG_MASK
+# define GST_GET_PDE_BIG_PG_GCPHYS(PdeGst)  pgmGstGet4MBPhysPage(&pVM->pgm.s, PdeGst)
 # define GST_PD_SHIFT               X86_PD_SHIFT
 # define GST_PD_MASK                X86_PD_MASK
@@ -93 +95 @@
 # define GST_PDE_PG_MASK            X86_PDE_PAE_PG_MASK_FULL
 # define GST_PDE_BIG_PG_MASK        X86_PDE2M_PAE_PG_MASK
+# define GST_GET_PDE_BIG_PG_GCPHYS(PdeGst)  (PdeGst.u & GST_PDE_BIG_PG_MASK)
 # define GST_PD_SHIFT               X86_PD_PAE_SHIFT
 # define GST_PD_MASK                X86_PD_PAE_MASK

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

@@ -1002 +1002 @@
                 if ((fFlags & X86_CR4_PSE) && Pde.b.u1Size)
                 {   /* (big page) */
-                    rc = PGMPhysGCPhys2HCPtr(pVM, (Pde.u & X86_PDE4M_PG_MASK) | ((RTGCUINTPTR)GCPtr & X86_PAGE_4M_OFFSET_MASK), 1 /* we always stay within one page */, pHCPtr);
+                    rc = PGMPhysGCPhys2HCPtr(pVM, pgmGstGet4MBPhysPage(&pVM->pgm.s, Pde) | ((RTGCUINTPTR)GCPtr & X86_PAGE_4M_OFFSET_MASK), 1 /* we always stay within one page */, pHCPtr);
                 }
                 else