Changeset 32035 in vbox for trunk/src/VBox/VMM/VMMRZ

Timestamp:

Aug 27, 2010 10:08:21 AM (14 years ago)

Author:

vboxsync

Message:

Changing the remaining X86_PTE_PAE_PG_MASK uses to X86_PTE_PAE_PG_MASK_FULL.

File:

• trunk/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp (modified) (4 diffs)

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

@@ -1010 +1010 @@
             RTHCPHYS HCPhysPte  = pThis->fLegacyMode
                                 ? pThis->paPages[iPage].uPte.pLegacy->u & X86_PTE_PG_MASK
-                                : pThis->paPages[iPage].uPte.pPae->u    & X86_PTE_PAE_PG_MASK;
+                                : pThis->paPages[iPage].uPte.pPae->u    & X86_PTE_PAE_PG_MASK_FULL;
             if (HCPhysPage != HCPhysPte)
             {
@@ -1440 +1440 @@
         X86PGPAEUINT    uNew  = (uOld & (X86_PTE_G | X86_PTE_PAT | X86_PTE_PCD | X86_PTE_PWT))
                               | X86_PTE_P | X86_PTE_RW | X86_PTE_A | X86_PTE_D
-                              | (HCPhys & X86_PTE_PAE_PG_MASK);
+                              | (HCPhys & X86_PTE_PAE_PG_MASK_FULL);
         while (!ASMAtomicCmpXchgExU64(&paPages[iFreePage].uPte.pPae->u, uNew, uOld, &uOld))
             AssertMsgFailed(("uOld=%#llx uOld2=%#llx uNew=%#llx\n", uOld, uOld2, uNew));
@@ -1624 +1624 @@
                                | (paSavedPTEs[iPage] & (X86_PTE_G | X86_PTE_PAT | X86_PTE_PCD | X86_PTE_PWT))
 #endif
-                               | (paPages[iPage].HCPhys & X86_PTE_PAE_PG_MASK);
+                               | (paPages[iPage].HCPhys & X86_PTE_PAE_PG_MASK_FULL);
                 CHECK_RET(paPages[iPage].uPte.pLegacy->u == uPte,
                           ("#%u: %#x %#x", iPage, paPages[iPage].uPte.pLegacy->u, uPte));
@@ -1664 +1664 @@
                                   | (paSavedPTEs[iPage] & (X86_PTE_G | X86_PTE_PAT | X86_PTE_PCD | X86_PTE_PWT))
 #endif
-                                  | (paPages[iPage].HCPhys & X86_PTE_PAE_PG_MASK);
+                                  | (paPages[iPage].HCPhys & X86_PTE_PAE_PG_MASK_FULL);
                 CHECK_RET(paPages[iPage].uPte.pPae->u == uPte,
                           ("#%u: %#llx %#llx", iPage, paPages[iPage].uPte.pLegacy->u, uPte));