Changeset 7668 in vbox

Timestamp:

Mar 31, 2008 3:30:28 PM (17 years ago)

Author:

vboxsync

Message:

Cleaned up

File:

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

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

@@ -864 +864 @@
             PPGMPOOLPAGE    pShwPage = pgmPoolGetPageByHCPhys(pVM, PdeDst.u & SHW_PDE_PG_MASK);
             RTGCPHYS        GCPhys   = PdeSrc.u & GST_PDE_PG_MASK;
-#  if    PGM_SHW_TYPE != PGM_TYPE_32BIT \
-      && PGM_GST_TYPE == PGM_TYPE_32BIT    
-            /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. (32 bits guest; PAE shadow) */
+#  if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
+            /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. */
             GCPhys |= (iPDDst & 1) * (PAGE_SIZE/2);
 #  endif
@@ -911 +910 @@
             PPGMPOOLPAGE    pShwPage = pgmPoolGetPageByHCPhys(pVM, PdeDst.u & SHW_PDE_PG_MASK);
             RTGCPHYS        GCPhys   = PdeSrc.u & GST_PDE_BIG_PG_MASK;
-#  if    PGM_SHW_TYPE != PGM_TYPE_32BIT \
-      && PGM_GST_TYPE == PGM_TYPE_32BIT    
-            /* Select the right PDE as we're emulating a 4MB page directory with two 2 MB shadow PDEs. (32 bits guest; PAE shadow)*/
+# 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.*/
             GCPhys |= GCPtrPage & (1 << X86_PD_PAE_SHIFT);
 #  endif
@@ -1271 +1269 @@
     {
         GCPhys = PdeSrc.u & GST_PDE_PG_MASK;
-#  if    PGM_SHW_TYPE != PGM_TYPE_32BIT \
-      && PGM_GST_TYPE == PGM_TYPE_32BIT    
-        /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. (32 bits guest; PAE shadow) */
+# if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
+        /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. */
         GCPhys |= (iPDDst & 1) * (PAGE_SIZE/2);
 # endif
@@ -1280 +1277 @@
     {
         GCPhys = PdeSrc.u & GST_PDE_BIG_PG_MASK;
-#  if    PGM_SHW_TYPE != PGM_TYPE_32BIT \
-      && PGM_GST_TYPE == PGM_TYPE_32BIT
-        /* Select the right PDE as we're emulating a 4MB page directory with two 2 MB shadow PDEs. (32 bits guest; PAE shadow)*/
+# 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.*/
         GCPhys |= GCPtrPage & (1 << X86_PD_PAE_SHIFT);
 # endif
@@ -1326 +1322 @@
                          */
                         unsigned        iPTDst    = (GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK;
-#  if    PGM_SHW_TYPE == PGM_TYPE_32BIT \
-      || PGM_GST_TYPE != PGM_TYPE_32BIT
+#  if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
+                        /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. */
+                        const unsigned  offPTSrc  = ((GCPtrPage >> SHW_PD_SHIFT) & 1) * 512;
+#  else
                         const unsigned  offPTSrc  = 0;
-#  else
-                        /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. (32 bits guest; PAE shadow) */
-                        const unsigned  offPTSrc  = ((GCPtrPage >> SHW_PD_SHIFT) & 1) * 512;
 #  endif
                         const unsigned  iPTDstEnd = RT_MIN(iPTDst + PGM_SYNC_NR_PAGES / 2, ELEMENTS(pPTDst->a));
@@ -1504 +1499 @@
     PSHWPT pPTDst = (PSHWPT)PGMPOOL_PAGE_2_PTR(pVM, pShwPage);
 
-# if    PGM_SHW_TYPE == PGM_TYPE_32BIT \
-     || PGM_GST_TYPE != PGM_TYPE_32BIT
+# if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
+    /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. */
+    const unsigned  offPTSrc  = ((GCPtrPage >> SHW_PD_SHIFT) & 1) * 512;
+# else
     const unsigned  offPTSrc  = 0;
-# else
-    /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. (32 bits guest; PAE shadow) */
-    const unsigned  offPTSrc  = ((GCPtrPage >> SHW_PD_SHIFT) & 1) * 512;
 # endif
 
@@ -2011 +2005 @@
                 const unsigned  iPTDstEnd = ELEMENTS(pPTDst->a);
 # endif /* !PGM_SYNC_N_PAGES */
-#  if    PGM_SHW_TYPE == PGM_TYPE_32BIT \
-      || PGM_GST_TYPE != PGM_TYPE_32BIT
+#  if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
+                /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. */
+                const unsigned  offPTSrc  = ((GCPtrPage >> SHW_PD_SHIFT) & 1) * 512;
+#  else
                 const unsigned  offPTSrc  = 0;
-#  else
-                /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. (32 bits guest; PAE shadow) */
-                const unsigned  offPTSrc  = ((GCPtrPage >> SHW_PD_SHIFT) & 1) * 512;
 #  endif
                 for (; iPTDst < iPTDstEnd; iPTDst++)
@@ -3075 +3068 @@
 
                 /* iterate the page table. */
-# if    PGM_SHW_TYPE == PGM_TYPE_32BIT \
-     || PGM_GST_TYPE != PGM_TYPE_32BIT
+# if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
+                /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. */
+                const unsigned offPTSrc  = ((GCPtr >> SHW_PD_SHIFT) & 1) * 512;
+# else
                 const unsigned offPTSrc  = 0;
-# else
-                /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. (32 bits guest; PAE shadow) */
-                const unsigned offPTSrc  = ((GCPtr >> SHW_PD_SHIFT) & 1) * 512;
 # endif
                 for (unsigned iPT = 0, off = 0;