Changeset 86488 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 8, 2020 8:32:24 AM (5 years ago)

Author:

vboxsync

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

140799

Message:

VMM/PGM: Working on eliminating page table bitfield use (32-bit PDEs). bugref:9841 bugref:9746

File:

• trunk/src/VBox/VMM/VMMR3/PGM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -2345 +2345 @@
     {
         X86PDE PdeSrc = pPDSrc->a[iPD];
-        if (PdeSrc.n.u1Present)
+        if (PdeSrc.u & X86_PDE_P)
         {
-            if (PdeSrc.b.u1Size && fPSE)
+            if ((PdeSrc.u & X86_PDE_PS) && fPSE)
                 pHlp->pfnPrintf(pHlp,
                                 "%04X - %RGp P=%d U=%d RW=%d G=%d - BIG\n",
                                 iPD,
-                                pgmGstGet4MBPhysPage(pVM, PdeSrc),
-                                PdeSrc.b.u1Present, PdeSrc.b.u1User, PdeSrc.b.u1Write, PdeSrc.b.u1Global && fPGE);
+                                pgmGstGet4MBPhysPage(pVM, PdeSrc), PdeSrc.u & X86_PDE_P, !!(PdeSrc.u & X86_PDE_US),
+                                !!(PdeSrc.u & X86_PDE_RW), (PdeSrc.u & X86_PDE4M_G) && fPGE);
             else
                 pHlp->pfnPrintf(pHlp,
                                 "%04X - %RGp P=%d U=%d RW=%d [G=%d]\n",
                                 iPD,
-                                (RTGCPHYS)(PdeSrc.u & X86_PDE_PG_MASK),
-                                PdeSrc.n.u1Present, PdeSrc.n.u1User, PdeSrc.n.u1Write, PdeSrc.b.u1Global && fPGE);
+                                (RTGCPHYS)(PdeSrc.u & X86_PDE_PG_MASK), PdeSrc.u & X86_PDE_P, !!(PdeSrc.u & X86_PDE_US),
+                                !!(PdeSrc.u & X86_PDE_RW), (PdeSrc.u & X86_PDE4M_G) && fPGE);
         }
     }