Changeset 31994 in vbox for trunk

Timestamp:

Aug 26, 2010 1:18:54 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) (2 diffs)
• VMM/PGMInline.h (modified) (6 diffs)
• VMM/VMMAll/PGMAll.cpp (modified) (5 diffs)
• VMM/VMMAll/PGMAllBth.h (modified) (1 diff)

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -2747 +2747 @@
             iEntry = (VarGCPtr.u.GCFlat >> X86_PD_PAE_SHIFT) & X86_PD_PAE_MASK;
             VarPDEAddr = VarCur;
-            VarPDEAddr.u.u64Number = Pdpe.u & X86_PDPE_PG_MASK;
+            VarPDEAddr.u.u64Number = Pdpe.u & X86_PDPE_PG_MASK_FULL;
             VarPDEAddr.u.u64Number += iEntry * sizeof(X86PDEPAE);
         }
@@ -3116 +3116 @@
                 return DBGCCmdHlpPrintf(pCmdHlp, "Page directory is not present for %Dv.\n", &VarGCPtr);
 
-            VarCur.u.u64Number = Pdpe.u & X86_PDPE_PG_MASK;
+            VarCur.u.u64Number = Pdpe.u & X86_PDPE_PG_MASK_FULL;
 
             /* Page directory (PAE). */

trunk/src/VBox/VMM/PGMInline.h

@@ -762 +762 @@
             PX86PDPAE   pGuestPD = NULL;
             int rc = pgmRZDynMapGCPageInlined(pVCpu,
-                                              pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK,
+                                              pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK_FULL,
                                               (void **)&pGuestPD
                                               RTLOG_COMMA_SRC_POS);
@@ -771 +771 @@
             PX86PDPAE   pGuestPD = pVCpu->pgm.s.CTX_SUFF(apGstPaePDs)[iPdpt];
             if (    !pGuestPD
-                ||  (pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK) != pVCpu->pgm.s.aGCPhysGstPaePDs[iPdpt])
+                ||  (pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK_FULL) != pVCpu->pgm.s.aGCPhysGstPaePDs[iPdpt])
                 pgmGstLazyMapPaePD(pVCpu, iPdpt, &pGuestPD);
             if (pGuestPD)
@@ -815 +815 @@
     PX86PDPAE   pGuestPD = NULL;
     int rc = pgmRZDynMapGCPageInlined(pVCpu,
-                                      pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK,
+                                      pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK_FULL,
                                       (void **)&pGuestPD
                                       RTLOG_COMMA_SRC_POS);
@@ -826 +826 @@
     PX86PDPAE   pGuestPD = pVCpu->pgm.s.CTX_SUFF(apGstPaePDs)[iPdpt];
     if (    !pGuestPD
-        ||  (pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK) != pVCpu->pgm.s.aGCPhysGstPaePDs[iPdpt])
+        ||  (pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK_FULL) != pVCpu->pgm.s.aGCPhysGstPaePDs[iPdpt])
         pgmGstLazyMapPaePD(pVCpu, iPdpt, &pGuestPD);
 #endif
@@ -932 +932 @@
             {
                 PCX86PDPAE pPD;
-                rc = PGM_GCPHYS_2_PTR_BY_VMCPU(pVCpu, pPdptTemp->a[iPdpt].u & X86_PDPE_PG_MASK, &pPD);
+                rc = PGM_GCPHYS_2_PTR_BY_VMCPU(pVCpu, pPdptTemp->a[iPdpt].u & X86_PDPE_PG_MASK_FULL, &pPD);
                 if (RT_SUCCESS(rc))
                 {
@@ -989 +989 @@
     /* The PDE. */
     PX86PDPAE pPD;
-    rc = PGM_GCPHYS_2_PTR_BY_VMCPU(pVCpu, pPdptTemp->a[iPdpt].u & X86_PDPE_PG_MASK, &pPD);
+    rc = PGM_GCPHYS_2_PTR_BY_VMCPU(pVCpu, pPdptTemp->a[iPdpt].u & X86_PDPE_PG_MASK_FULL, &pPD);
     if (RT_FAILURE(rc))
     {

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

@@ -962 +962 @@
                     Assert(!HWACCMIsEnabled(pVM));
 
-                    GCPdPt  = uGstPdpe & X86_PDPE_PG_MASK;
+                    GCPdPt  = uGstPdpe & X86_PDPE_PG_MASK_FULL;
                     enmKind = PGMPOOLKIND_PAE_PD_PHYS;
                     uGstPdpe |= X86_PDPE_P;
@@ -968 +968 @@
                 else
                 {
-                    GCPdPt  = uGstPdpe & X86_PDPE_PG_MASK;
+                    GCPdPt  = uGstPdpe & X86_PDPE_PG_MASK_FULL;
                     enmKind = PGMPOOLKIND_PAE_PD_FOR_PAE_PD;
                 }
@@ -985 +985 @@
         /* The PD was cached or created; hook it up now. */
         pPdpe->u |= pShwPage->Core.Key
-                 | (uGstPdpe & ~(X86_PDPE_PG_MASK | X86_PDPE_AVL_MASK | X86_PDPE_PCD | X86_PDPE_PWT));
+                 | (uGstPdpe & ~(X86_PDPE_PG_MASK_FULL | X86_PDPE_AVL_MASK | X86_PDPE_PCD | X86_PDPE_PWT));
 
 # if defined(IN_RC)
@@ -1127 +1127 @@
         else
         {
-            GCPdPt  = uGstPdpe & X86_PDPE_PG_MASK;
+            GCPdPt  = uGstPdpe & X86_PDPE_PG_MASK_FULL;
             enmKind = PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD;
         }
@@ -1144 +1144 @@
     /* The PD was cached or created; hook it up now. */
     pPdpe->u |= pShwPage->Core.Key
-             | (uGstPdpe & ~(X86_PDPE_PG_MASK | X86_PDPE_AVL_MASK | X86_PDPE_PCD | X86_PDPE_PWT));
+             | (uGstPdpe & ~(X86_PDPE_PG_MASK_FULL | X86_PDPE_AVL_MASK | X86_PDPE_PCD | X86_PDPE_PWT));
 
     *ppPD = (PX86PDPAE)PGMPOOL_PAGE_2_PTR_V2(pVM, pVCpu, pShwPage);

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

@@ -4397 +4397 @@
                     RTHCPTR     HCPtr;
                     RTHCPHYS    HCPhys;
-                    RTGCPHYS    GCPhys = pGuestPDPT->a[i].u & X86_PDPE_PG_MASK;
+                    RTGCPHYS    GCPhys = pGuestPDPT->a[i].u & X86_PDPE_PG_MASK_FULL;
                     pgmLock(pVM);
                     PPGMPAGE    pPage  = pgmPhysGetPage(&pVM->pgm.s, GCPhys);