Changeset 11531 in vbox for trunk/src

Timestamp:

Aug 21, 2008 10:10:09 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

35096

Message:

Missing changes for PSE-36 support.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (2 diffs)

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

@@ -262 +262 @@
         }
         if (pGCPhys)
-            *pGCPhys = (Pde.u & GST_PDE_BIG_PG_MASK) | (GCPtr & (~GST_PDE_BIG_PG_MASK ^ ~GST_PTE_PG_MASK)); /** @todo pse36 */
+            *pGCPhys = GST_GET_PDE_BIG_PG_GCPHYS(Pde) | (GCPtr & (~GST_PDE_BIG_PG_MASK ^ ~GST_PTE_PG_MASK));
     }
     return VINF_SUCCESS;
@@ -355 +355 @@
              * 4MB Page table
              */
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
+            Pde.u = (Pde.u & (fMask | ((fMask & X86_PTE_PAT) << X86_PDE4M_PAT_SHIFT) | GST_PDE_BIG_PG_MASK | X86_PDE4M_PG_HIGH_MASK | X86_PDE4M_PS))
+# else
             Pde.u = (Pde.u & (fMask | ((fMask & X86_PTE_PAT) << X86_PDE4M_PAT_SHIFT) | GST_PDE_BIG_PG_MASK | X86_PDE4M_PS)) /** @todo pse36 */
+# endif
                   | (fFlags & ~GST_PTE_PG_MASK)
                   | ((fFlags & X86_PTE_PAT) << X86_PDE4M_PAT_SHIFT);