Changeset 7667 in vbox for trunk/src

Timestamp:

Mar 31, 2008 3:16:20 PM (17 years ago)

Author:

vboxsync

Message:

More comments + PAE updates

File:

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

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

@@ -866 +866 @@
 #  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. */
+            /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. (32 bits guest; PAE shadow) */
             GCPhys |= (iPDDst & 1) * (PAGE_SIZE/2);
 #  endif
@@ -913 +913 @@
 #  if    PGM_SHW_TYPE != PGM_TYPE_32BIT \
       && PGM_GST_TYPE == PGM_TYPE_32BIT    
-            /* Select the right PDE as we're emulating a 4MB page with two 2 MB shadow PDEs */
+            /* Select the right PDE as we're emulating a 4MB page directory with two 2 MB shadow PDEs. (32 bits guest; PAE shadow)*/
             GCPhys |= GCPtrPage & (1 << X86_PD_PAE_SHIFT);
 #  endif
@@ -1273 +1273 @@
 #  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. */
-        /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. */
+        /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. (32 bits guest; PAE shadow) */
         GCPhys |= (iPDDst & 1) * (PAGE_SIZE/2);
 # endif
@@ -1283 +1282 @@
 #  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 */
+        /* Select the right PDE as we're emulating a 4MB page directory with two 2 MB shadow PDEs. (32 bits guest; PAE shadow)*/
         GCPhys |= GCPtrPage & (1 << X86_PD_PAE_SHIFT);
 # endif
@@ -1327 +1326 @@
                          */
                         unsigned        iPTDst    = (GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK;
-#  if PGM_SHW_TYPE == PGM_TYPE_32BIT
+#  if    PGM_SHW_TYPE == PGM_TYPE_32BIT \
+      || PGM_GST_TYPE != PGM_TYPE_32BIT
                         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
@@ -1503 +1504 @@
     PSHWPT pPTDst = (PSHWPT)PGMPOOL_PAGE_2_PTR(pVM, pShwPage);
 
-#  if PGM_SHW_TYPE == PGM_TYPE_32BIT
+# if    PGM_SHW_TYPE == PGM_TYPE_32BIT \
+     || PGM_GST_TYPE != PGM_TYPE_32BIT
     const unsigned  offPTSrc  = 0;
-#  else
+# 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
+# endif
 
     Assert(cPages == 1 || !(uErr & X86_TRAP_PF_P));
@@ -2008 +2011 @@
                 const unsigned  iPTDstEnd = ELEMENTS(pPTDst->a);
 # endif /* !PGM_SYNC_N_PAGES */
-#  if PGM_SHW_TYPE == PGM_TYPE_32BIT
+#  if    PGM_SHW_TYPE == PGM_TYPE_32BIT \
+      || PGM_GST_TYPE != PGM_TYPE_32BIT
                 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
@@ -3070 +3075 @@
 
                 /* iterate the page table. */
-#  if PGM_SHW_TYPE == PGM_TYPE_32BIT
+# if    PGM_SHW_TYPE == PGM_TYPE_32BIT \
+     || PGM_GST_TYPE != PGM_TYPE_32BIT
                 const unsigned offPTSrc  = 0;
-#  else
+# 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
+# endif
                 for (unsigned iPT = 0, off = 0;
                      iPT < ELEMENTS(pPTDst->a);