Changeset 26635 in vbox for trunk

Timestamp:

Feb 18, 2010 6:24:40 PM (15 years ago)

Author:

vboxsync

Message:

PAE and AMD64 paging modes support large pages regardless of CR4.PSE.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllRegs.cpp (modified) (1 diff)
• PGMAllBth.h (modified) (8 diffs)
• PGMAllGst.h (modified) (3 diffs)

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

@@ -1721 +1721 @@
 VMMDECL(bool) CPUMIsGuestPageSizeExtEnabled(PVMCPU pVCpu)
 {
+    /* PAE or AMD64 implies support for big pages regardless of CR4.PSE */
+    if (pVCpu->cpum.s.Guest.cr4 & X86_CR4_PAE)
+        return true;
+
     return !!(pVCpu->cpum.s.Guest.cr4 & X86_CR4_PSE);
 }

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

@@ -376 +376 @@
 #  if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE)
         if (    PdeSrc.b.u1Size
-#   if PGM_GST_TYPE != PGM_TYPE_AMD64
+#   if PGM_GST_TYPE == PGM_TYPE_32BIT
             &&  CPUMIsGuestPageSizeExtEnabled(pVCpu)
 #   endif
@@ -1095 +1095 @@
 # endif /* PGM_GST_TYPE != PGM_TYPE_32BIT */
 
-# if PGM_GST_TYPE == PGM_TYPE_AMD64
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
+    const bool      fIsBigPage  = PdeSrc.b.u1Size && CPUMIsGuestPageSizeExtEnabled(pVCpu);
+# else
     const bool      fIsBigPage  = PdeSrc.b.u1Size;
-# else
-    const bool      fIsBigPage  = PdeSrc.b.u1Size && CPUMIsGuestPageSizeExtEnabled(pVCpu);
 # endif
 
@@ -1639 +1639 @@
      * Check that the page is present and that the shadow PDE isn't out of sync.
      */
-# if PGM_GST_TYPE == PGM_TYPE_AMD64
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
+    const bool      fBigPage = PdeSrc.b.u1Size && CPUMIsGuestPageSizeExtEnabled(pVCpu);
+# else
     const bool      fBigPage = PdeSrc.b.u1Size;
-# else
-    const bool      fBigPage = PdeSrc.b.u1Size && CPUMIsGuestPageSizeExtEnabled(pVCpu);
 # endif
     RTGCPHYS        GCPhys;
@@ -2099 +2099 @@
      */
     if (   pPdeSrc->b.u1Size
-#  if PGM_GST_TYPE != PGM_TYPE_AMD64
+#  if PGM_GST_TYPE == PGM_TYPE_32BIT
         && CPUMIsGuestPageSizeExtEnabled(pVCpu)
 #  endif
@@ -2206 +2206 @@
         /* Check the present bit as the shadow tables can cause different error codes by being out of sync. */
         if (   pPdeSrc->b.u1Size
-#  if PGM_GST_TYPE != PGM_TYPE_AMD64
+#  if PGM_GST_TYPE == PGM_TYPE_32BIT
             && CPUMIsGuestPageSizeExtEnabled(pVCpu)
 #  endif
@@ -2244 +2244 @@
 PGM_BTH_DECL(int, CheckDirtyPageFault)(PVMCPU pVCpu, uint32_t uErr, PSHWPDE pPdeDst, PGSTPDE pPdeSrc, RTGCPTR GCPtrPage)
 {
-# if PGM_GST_TYPE == PGM_TYPE_AMD64
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
+    const bool fBigPagesSupported = CPUMIsGuestPageSizeExtEnabled(pVCpu);
+# else
     const bool fBigPagesSupported = true;
-# else
-    const bool fBigPagesSupported = !!(CPUMGetGuestCR4(pVCpu) & X86_CR4_PSE);
 # endif
     PVM pVM = pVCpu->CTX_SUFF(pVM);
@@ -2526 +2526 @@
          */
         PSHWPT          pPTDst;
-# if PGM_GST_TYPE == PGM_TYPE_AMD64
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
+        const bool      fPageTable = !PdeSrc.b.u1Size || !CPUMIsGuestPageSizeExtEnabled(pVCpu);
+# else
         const bool      fPageTable = !PdeSrc.b.u1Size;
-# else
-        const bool      fPageTable = !PdeSrc.b.u1Size || !CPUMIsGuestPageSizeExtEnabled(pVCpu);
 # endif
         PPGMPOOLPAGE    pShwPage;
@@ -3478 +3478 @@
     || PGM_GST_TYPE == PGM_TYPE_AMD64
 
-# if PGM_GST_TYPE == PGM_TYPE_AMD64
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
+    bool            fBigPagesSupported = CPUMIsGuestPageSizeExtEnabled(pVCpu);
+# else
     bool            fBigPagesSupported = true;
-# else
-    bool            fBigPagesSupported = CPUMIsGuestPageSizeExtEnabled(pVCpu);
 # endif
     PPGMCPU         pPGM = &pVCpu->pgm.s;

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

@@ -104 +104 @@
 
     if (    !Pde.b.u1Size
-# if PGM_GST_TYPE != PGM_TYPE_AMD64
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
         ||  !CPUMIsGuestPageSizeExtEnabled(pVCpu)
 # endif
@@ -221 +221 @@
 
         if (    !Pde.b.u1Size
-# if PGM_GST_TYPE != PGM_TYPE_AMD64
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
             ||  !CPUMIsGuestPageSizeExtEnabled(pVCpu)
 # endif
@@ -362 +362 @@
         {
             if (    !Pde.b.u1Size
-# if PGM_GST_TYPE != PGM_TYPE_AMD64
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
                 ||  !(pState->cr4 & X86_CR4_PSE)
 # endif