Changeset 31995 in vbox for trunk/src/VBox

Timestamp:

Aug 26, 2010 1:21:34 PM (14 years ago)

Author:

vboxsync

Message:

Safe X86_PDPE_PG_MASK -> X86_PDPE_PG_MASK_FULL conversions.

Location:

trunk/src/VBox

Files:

• Debugger/DBGCEmulateCodeView.cpp (modified) (3 diffs)
• VMM/VMMAll/PGMAllPool.cpp (modified) (1 diff)
• VMM/VMMGC/PGMGCGst.h (modified) (1 diff)
• VMM/VMMRZ/PGMRZDynMap.cpp (modified) (4 diffs)

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -2795 +2795 @@
                              :   "%08llx big phys=%08llx %s %s %s %s %s avl=%02x %s %s %s %s %s",
                              Pde.u,
-                             Pde.u & X86_PDE_PAE_PG_MASK,
+                             Pde.u & X86_PDE_PAE_PG_MASK_FULL,
                              Pde.b.u1Present        ? "p "  : "np",
                              Pde.b.u1Write          ? "w"   : "r",
@@ -2813 +2813 @@
                              :   "%08llx 4kb phys=%08llx %s %s %s %s %s avl=%02x %s %s %s %s",
                              Pde.u,
-                             Pde.u & X86_PDE_PAE_PG_MASK,
+                             Pde.u & X86_PDE_PAE_PG_MASK_FULL,
                              Pde.n.u1Present        ? "p "  : "np",
                              Pde.n.u1Write          ? "w"   : "r",
@@ -3131 +3131 @@
             iEntry = (VarGCPtr.u.GCFlat >> X86_PT_PAE_SHIFT) & X86_PT_PAE_MASK;
             VarPTEAddr = VarCur;
-            VarPTEAddr.u.u64Number = Pde.u & X86_PDE_PAE_PG_MASK;
+            VarPTEAddr.u.u64Number = Pde.u & X86_PDE_PAE_PG_MASK_FULL;
             VarPTEAddr.u.u64Number += iEntry * sizeof(X86PTEPAE);
         }

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

@@ -3291 +3291 @@
         RTGCPHYS GCPhysBase = GCPhysPage & X86_PDE2M_PAE_PG_MASK;
 
-        GCPhysPage &= X86_PDE_PAE_PG_MASK;
+        GCPhysPage &= X86_PDE_PAE_PG_MASK_FULL;
 
         /* Fetch the large page base. */

trunk/src/VBox/VMM/VMMGC/PGMGCGst.h

@@ -66 +66 @@
 # define GST_BIG_PAGE_SIZE          X86_PAGE_2M_SIZE
 # define GST_BIG_PAGE_OFFSET_MASK   X86_PAGE_2M_OFFSET_MASK
-# define GST_PDE_PG_MASK            X86_PDE_PAE_PG_MASK
+# define GST_PDE_PG_MASK            X86_PDE_PAE_PG_MASK_FULL
 # define GST_PDE4M_PG_MASK          X86_PDE4M_PAE_PG_MASK
 # define GST_PD_SHIFT               X86_PD_PAE_SHIFT

trunk/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp

@@ -732 +732 @@
             pPgLvl->a[0].fResMask  = X86_PDPE_P;
 
-            pPgLvl->a[1].fPhysMask = X86_PDPE_PG_MASK;
+            pPgLvl->a[1].fPhysMask = X86_PDPE_PG_MASK_FULL;
             pPgLvl->a[1].fPtrMask  = X86_PD_PAE_MASK;
             pPgLvl->a[1].fPtrShift = X86_PD_PAE_SHIFT;
@@ -738 +738 @@
             pPgLvl->a[1].fResMask  = X86_PDE_P | X86_PDE_RW;
 
-            pPgLvl->a[2].fPhysMask = X86_PDE_PAE_PG_MASK;
+            pPgLvl->a[2].fPhysMask = X86_PDE_PAE_PG_MASK_FULL;
             pPgLvl->a[2].fPtrMask  = X86_PT_PAE_MASK;
             pPgLvl->a[2].fPtrShift = X86_PT_PAE_SHIFT;
@@ -762 +762 @@
             pPgLvl->a[1].fResMask  = X86_PDPE_P | X86_PDPE_RW;
 
-            pPgLvl->a[2].fPhysMask = X86_PDPE_PG_MASK;
+            pPgLvl->a[2].fPhysMask = X86_PDPE_PG_MASK_FULL;
             pPgLvl->a[2].fPtrShift = X86_PD_PAE_SHIFT;
             pPgLvl->a[2].fPtrMask  = X86_PD_PAE_MASK;
@@ -768 +768 @@
             pPgLvl->a[2].fResMask  = X86_PDE_P | X86_PDE_RW;
 
-            pPgLvl->a[3].fPhysMask = X86_PDE_PAE_PG_MASK;
+            pPgLvl->a[3].fPhysMask = X86_PDE_PAE_PG_MASK_FULL;
             pPgLvl->a[3].fPtrShift = X86_PT_PAE_SHIFT;
             pPgLvl->a[3].fPtrMask  = X86_PT_PAE_MASK;