Changeset 31998 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 26, 2010 2:00:51 PM (14 years ago)

Author:

vboxsync

Message:

Changed the remaining X86_PML4E_PG_MASK uses to X86_PML4E_PG_MASK_FULL.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (3 diffs)
• PGMAllBth.h (modified) (1 diff)
• PGMAllPool.cpp (modified) (3 diffs)
• PGMAllShw.h (modified) (2 diffs)

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

@@ -1074 +1074 @@
     /* Allocate page directory pointer table if not present. */
     if (    !pPml4e->n.u1Present
-        &&  !(pPml4e->u & X86_PML4E_PG_MASK))
+        &&  !(pPml4e->u & X86_PML4E_PG_MASK_FULL))
     {
         RTGCPTR64   GCPml4;
@@ -1099 +1099 @@
     else
     {
-        pShwPage = pgmPoolGetPage(pPool, pPml4e->u & X86_PML4E_PG_MASK);
+        pShwPage = pgmPoolGetPage(pPool, pPml4e->u & X86_PML4E_PG_MASK_FULL);
         AssertReturn(pShwPage, VERR_INTERNAL_ERROR);
 
@@ -1177 +1177 @@
     PVM             pVM      = pVCpu->CTX_SUFF(pVM);
     PPGMPOOL        pPool    = pVM->pgm.s.CTX_SUFF(pPool);
-    PPGMPOOLPAGE    pShwPage = pgmPoolGetPage(pPool, pPml4e->u & X86_PML4E_PG_MASK);
+    PPGMPOOLPAGE    pShwPage = pgmPoolGetPage(pPool, pPml4e->u & X86_PML4E_PG_MASK_FULL);
     AssertReturn(pShwPage, VERR_INTERNAL_ERROR);
 

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

@@ -3669 +3669 @@
         }
 
-        pShwPdpt = pgmPoolGetPage(pPool, pPml4eDst->u & X86_PML4E_PG_MASK);
+        pShwPdpt = pgmPoolGetPage(pPool, pPml4eDst->u & X86_PML4E_PG_MASK_FULL);
         GCPhysPdptSrc = pPml4eSrc->u & X86_PML4E_PG_MASK_FULL;
 

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

@@ -662 +662 @@
                 {
                     LogFlow(("pgmPoolMonitorChainChanging: pml4 iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPML4->a[iShw].u));
-                    pgmPoolFree(pVM, uShw.pPML4->a[iShw].u & X86_PML4E_PG_MASK, pPage->idx, iShw);
+                    pgmPoolFree(pVM, uShw.pPML4->a[iShw].u & X86_PML4E_PG_MASK_FULL, pPage->idx, iShw);
                     ASMAtomicWriteSize(&uShw.pPML4->a[iShw].u, 0);
                 }
@@ -673 +673 @@
                     {
                         LogFlow(("pgmPoolMonitorChainChanging: pml4 iShw2=%#x: %RX64 -> freeing it!\n", iShw2, uShw.pPML4->a[iShw2].u));
-                        pgmPoolFree(pVM, uShw.pPML4->a[iShw2].u & X86_PML4E_PG_MASK, pPage->idx, iShw2);
+                        pgmPoolFree(pVM, uShw.pPML4->a[iShw2].u & X86_PML4E_PG_MASK_FULL, pPage->idx, iShw2);
                         ASMAtomicWriteSize(&uShw.pPML4->a[iShw2].u, 0);
                     }
@@ -4348 +4348 @@
                 pgmPoolTrackFreeUser(pPool, pSubPage, pPage->idx, i);
             else
-                AssertFatalMsgFailed(("%RX64\n", pShwPML4->a[i].u & X86_PML4E_PG_MASK));
+                AssertFatalMsgFailed(("%RX64\n", pShwPML4->a[i].u & X86_PML4E_PG_MASK_FULL));
             /** @todo 64-bit guests: have to ensure that we're not exhausting the dynamic mappings! */
         }

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

@@ -217 +217 @@
     /* PDPT */
     PX86PDPT        pPDPT;
-    int rc = PGM_HCPHYS_2_PTR(pVM, pVCpu, Pml4e.u & X86_PML4E_PG_MASK, &pPDPT);
+    int rc = PGM_HCPHYS_2_PTR(pVM, pVCpu, Pml4e.u & X86_PML4E_PG_MASK_FULL, &pPDPT);
     if (RT_FAILURE(rc))
         return rc;
@@ -383 +383 @@
         /* PDPT */
         PX86PDPT        pPDPT;
-        rc = PGM_HCPHYS_2_PTR(pVM, pVCpu, Pml4e.u & X86_PML4E_PG_MASK, &pPDPT);
+        rc = PGM_HCPHYS_2_PTR(pVM, pVCpu, Pml4e.u & X86_PML4E_PG_MASK_FULL, &pPDPT);
         if (RT_FAILURE(rc))
             return rc;