Changeset 5629 in vbox

Timestamp:

Nov 5, 2007 9:48:30 PM (17 years ago)

Author:

vboxsync

Message:

remove deprecated macros

Location:

trunk

Files:

• include/iprt/param.h (modified) (1 diff)
• src/VBox/VMM/PGM.cpp (modified) (2 diffs)
• src/VBox/VMM/PGMMap.cpp (modified) (15 diffs)
• src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (11 diffs)
• src/VBox/VMM/VMMAll/PGMAllMap.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/PGMAllShw.h (modified) (1 diff)

trunk/include/iprt/param.h

@@ -83 +83 @@
 #define PAGE_ADDRESS(pv)    ((uintptr_t)(pv) & ~(uintptr_t)0xfff)
 
-#if 1 /** @todo remove this! Use X86_PAGE_* defines. */
-/**
- * i386 Page directory shift.
- * This is used to convert between PDR index and virtual address.
- * @deprecated Use X86_*.
- */
-#define PGDIR_SHIFT         22
-
-/**
- * i386 Page table mask.
- * This is used together with PAGE_SHIFT to get the page table
- * index from a virtual address.
- * @deprecated Use X86_*.
- */
-#define PTE_MASK            0x3ff
-
-/**
- * i386 Page table and page directory entry count for the default
- * paging mode.
- * @deprecated Use X86_*.
- */
-#define PAGE_ENTRIES        1024
-
-/**
- * i386 4MB Page offset mask.
- * @deprecated Use X86_*.
- */
-#define PAGE_OFFSET_MASK_BIG    0x3fffff
-#endif /* obsolete */
-
 /**
  * Host max path (the reasonable value).

trunk/src/VBox/VMM/PGM.cpp

@@ -1423 +1423 @@
     rc = MMR3HyperReserve(pVM, MM_HYPER_DYNAMIC_SIZE, "Dynamic mapping", &pVM->pgm.s.pbDynPageMapBaseGC);
     if (    VBOX_SUCCESS(rc)
-        &&  (pVM->pgm.s.pbDynPageMapBaseGC >> PGDIR_SHIFT) != ((pVM->pgm.s.pbDynPageMapBaseGC + MM_HYPER_DYNAMIC_SIZE - 1) >> PGDIR_SHIFT))
+        &&  (pVM->pgm.s.pbDynPageMapBaseGC >> X86_PD_SHIFT) != ((pVM->pgm.s.pbDynPageMapBaseGC + MM_HYPER_DYNAMIC_SIZE - 1) >> X86_PD_SHIFT))
         rc = MMR3HyperReserve(pVM, MM_HYPER_DYNAMIC_SIZE, "Dynamic mapping not crossing", &pVM->pgm.s.pbDynPageMapBaseGC);
     if (VBOX_SUCCESS(rc))
     {
-        AssertRelease((pVM->pgm.s.pbDynPageMapBaseGC >> PGDIR_SHIFT) == ((pVM->pgm.s.pbDynPageMapBaseGC + MM_HYPER_DYNAMIC_SIZE - 1) >> PGDIR_SHIFT));
+        AssertRelease((pVM->pgm.s.pbDynPageMapBaseGC >> X86_PD_SHIFT) == ((pVM->pgm.s.pbDynPageMapBaseGC + MM_HYPER_DYNAMIC_SIZE - 1) >> X86_PD_SHIFT));
         MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
     }
@@ -1944 +1944 @@
         if (pMapping->GCPtr != GCPtr)
         {
-            AssertMsg((GCPtr >> PGDIR_SHIFT << PGDIR_SHIFT) == GCPtr, ("GCPtr=%VGv\n", GCPtr));
+            AssertMsg((GCPtr >> X86_PD_SHIFT << X86_PD_SHIFT) == GCPtr, ("GCPtr=%VGv\n", GCPtr));
 #if HC_ARCH_BITS == 64
 LogRel(("Mapping: %VGv -> %VGv %s\n", pMapping->GCPtr, GCPtr, pMapping->pszDesc));
 #endif
-            pgmR3MapRelocate(pVM, pMapping, pMapping->GCPtr >> PGDIR_SHIFT, GCPtr >> PGDIR_SHIFT);
+            pgmR3MapRelocate(pVM, pMapping, pMapping->GCPtr >> X86_PD_SHIFT, GCPtr >> X86_PD_SHIFT);
         }
         else

trunk/src/VBox/VMM/PGMMap.cpp

@@ -110 +110 @@
      * Check for conflicts with intermediate mappings.
      */
-    const unsigned iPageDir = GCPtr >> PGDIR_SHIFT;
-    const unsigned cPTs = cb >> PGDIR_SHIFT;
+    const unsigned iPageDir = GCPtr >> X86_PD_SHIFT;
+    const unsigned cPTs = cb >> X86_PD_SHIFT;
     unsigned    i;
     for (i = 0; i < cPTs; i++)
@@ -247 +247 @@
              */
             MMHyperFree(pVM, pCur->aPTs[0].pPTR3);
-            pgmR3MapClearPDEs(&pVM->pgm.s, pCur, pCur->GCPtr >> PGDIR_SHIFT);
+            pgmR3MapClearPDEs(&pVM->pgm.s, pCur, pCur->GCPtr >> X86_PD_SHIFT);
             MMHyperFree(pVM, pCur);
 
@@ -303 +303 @@
      * This is all or nothing at all. So, a tiny bit of paranoia first.
      */
-    if (GCPtrBase & PAGE_OFFSET_MASK_BIG)
+    if (GCPtrBase & X86_PAGE_4M_OFFSET_MASK)
     {
         AssertMsgFailed(("GCPtrBase (%#x) has to be aligned on a 4MB address!\n", GCPtrBase));
         return VERR_INVALID_PARAMETER;
     }
-    if (!cb || (cb & PAGE_OFFSET_MASK_BIG))
+    if (!cb || (cb & X86_PAGE_4M_OFFSET_MASK))
     {
         AssertMsgFailed(("cb (%#x) is 0 or not aligned on a 4MB address!\n", cb));
@@ -323 +323 @@
      * Check that it's not conflicting with a core code mapping in the intermediate page table.
      */
-    unsigned    iPDNew = GCPtrBase >> PGDIR_SHIFT;
-    unsigned    i = cb >> PGDIR_SHIFT;
+    unsigned    iPDNew = GCPtrBase >> X86_PD_SHIFT;
+    unsigned    i = cb >> X86_PD_SHIFT;
     while (i-- > 0)
     {
@@ -333 +333 @@
             while (pCur)
             {
-                if (iPDNew + i - (pCur->GCPtr >> PGDIR_SHIFT) < (pCur->cb >> PGDIR_SHIFT))
+                if (iPDNew + i - (pCur->GCPtr >> X86_PD_SHIFT) < (pCur->cb >> X86_PD_SHIFT))
                     break;
                 pCur = pCur->pNextR3;
@@ -376 +376 @@
     while (pCur)
     {
-        unsigned iPDOld = pCur->GCPtr >> PGDIR_SHIFT;
-        iPDNew = GCPtrCur >> PGDIR_SHIFT;
+        unsigned iPDOld = pCur->GCPtr >> X86_PD_SHIFT;
+        iPDNew = GCPtrCur >> X86_PD_SHIFT;
 
         /*
@@ -394 +394 @@
          * Callback to execute the relocation.
          */
-        pCur->pfnRelocate(pVM, iPDOld << PGDIR_SHIFT, iPDNew << PGDIR_SHIFT, PGMRELOCATECALL_RELOCATE, pCur->pvUser);
+        pCur->pfnRelocate(pVM, iPDOld << X86_PD_SHIFT, iPDNew << X86_PD_SHIFT, PGMRELOCATECALL_RELOCATE, pCur->pvUser);
 
         /*
@@ -786 +786 @@
 void pgmR3MapRelocate(PVM pVM, PPGMMAPPING pMapping, int iPDOld, int iPDNew)
 {
-    Log(("PGM: Relocating %s from %#x to %#x\n", pMapping->pszDesc, iPDOld << PGDIR_SHIFT, iPDNew << PGDIR_SHIFT));
-    Assert(((unsigned)iPDOld << PGDIR_SHIFT) == pMapping->GCPtr);
+    Log(("PGM: Relocating %s from %#x to %#x\n", pMapping->pszDesc, iPDOld << X86_PD_SHIFT, iPDNew << X86_PD_SHIFT));
+    Assert(((unsigned)iPDOld << X86_PD_SHIFT) == pMapping->GCPtr);
 
     /*
@@ -811 +811 @@
 
     /* Find mapping which >= than pMapping. */
-    RTGCPTR     GCPtrNew = iPDNew << PGDIR_SHIFT;
+    RTGCPTR     GCPtrNew = iPDNew << X86_PD_SHIFT;
     PPGMMAPPING pPrev = NULL;
     pCur = pVM->pgm.s.pMappingsR3;
@@ -870 +870 @@
      * Callback to execute the relocation.
      */
-    pMapping->pfnRelocate(pVM, iPDOld << PGDIR_SHIFT, iPDNew << PGDIR_SHIFT, PGMRELOCATECALL_RELOCATE, pMapping->pvUser);
+    pMapping->pfnRelocate(pVM, iPDOld << X86_PD_SHIFT, iPDNew << X86_PD_SHIFT, PGMRELOCATECALL_RELOCATE, pMapping->pvUser);
 }
 
@@ -924 +924 @@
          * Ask the mapping.
          */
-        if (pMapping->pfnRelocate(pVM, iPDOld << PGDIR_SHIFT, iPDNew << PGDIR_SHIFT, PGMRELOCATECALL_SUGGEST, pMapping->pvUser))
+        if (pMapping->pfnRelocate(pVM, iPDOld << X86_PD_SHIFT, iPDNew << X86_PD_SHIFT, PGMRELOCATECALL_SUGGEST, pMapping->pvUser))
         {
             pgmR3MapRelocate(pVM, pMapping, iPDOld, iPDNew);
@@ -933 +933 @@
 
     STAM_PROFILE_STOP(&pVM->pgm.s.StatHCResolveConflict, a);
-    AssertMsgFailed(("Failed to relocate page table mapping '%s' from %#x! (cPTs=%d)\n", pMapping->pszDesc, iPDOld << PGDIR_SHIFT, cPTs));
+    AssertMsgFailed(("Failed to relocate page table mapping '%s' from %#x! (cPTs=%d)\n", pMapping->pszDesc, iPDOld << X86_PD_SHIFT, cPTs));
     return VERR_PGM_NO_HYPERVISOR_ADDRESS;
 }
@@ -968 +968 @@
     for (PPGMMAPPING pCur = pVM->pgm.s.pMappingsR3; pCur; pCur = pCur->pNextR3)
     {
-        unsigned iPDE = pCur->GCPtr >> PGDIR_SHIFT;
+        unsigned iPDE = pCur->GCPtr >> X86_PD_SHIFT;
         unsigned iPT = pCur->cPTs;
         while (iPT-- > 0)
@@ -978 +978 @@
                 Log(("PGMR3HasMappingConflicts: Conflict was detected at %VGv for mapping %s\n"
                      "                          iPDE=%#x iPT=%#x PDE=%VGp.\n",
-                     (iPT + iPDE) << PGDIR_SHIFT, pCur->pszDesc,
+                     (iPT + iPDE) << X86_PD_SHIFT, pCur->pszDesc,
                      iPDE, iPT, pPD->a[iPDE + iPT].au32[0]));
                 #else
                 AssertMsgFailed(("PGMR3HasMappingConflicts: Conflict was detected at %VGv for mapping %s\n"
                                  "                          iPDE=%#x iPT=%#x PDE=%VGp.\n",
-                                 (iPT + iPDE) << PGDIR_SHIFT, pCur->pszDesc,
+                                 (iPT + iPDE) << X86_PD_SHIFT, pCur->pszDesc,
                                  iPDE, iPT, pPD->a[iPDE + iPT].au32[0]));
                 #endif
@@ -1048 +1048 @@
             }
 
-            unsigned iPT  = off >> PGDIR_SHIFT;
-            unsigned iPTE = (off >> PAGE_SHIFT) & PTE_MASK;
+            unsigned iPT  = off >> X86_PD_SHIFT;
+            unsigned iPTE = (off >> PAGE_SHIFT) & X86_PT_MASK;
             while (cb > 0 && iPTE < ELEMENTS(CTXALLSUFF(pCur->aPTs[iPT].pPT)->a))
             {

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

@@ -273 +273 @@
             &&  (cr4 & X86_CR4_PSE))
             GCPhys = (PdeSrc.u & X86_PDE4M_PG_MASK)
-                    | ((RTGCPHYS)pvFault & (PAGE_OFFSET_MASK_BIG ^ PAGE_OFFSET_MASK));
+                    | ((RTGCPHYS)pvFault & (X86_PAGE_4M_OFFSET_MASK ^ PAGE_OFFSET_MASK));
         else
         {
@@ -286 +286 @@
             if (VBOX_SUCCESS(rc))
             {
-                unsigned iPTESrc = ((RTGCUINTPTR)pvFault >> PAGE_SHIFT) & PTE_MASK;
+                unsigned iPTESrc = ((RTGCUINTPTR)pvFault >> PAGE_SHIFT) & X86_PT_MASK;
                 if (pPTSrc->a[iPTESrc].n.u1Present)
                     GCPhys = pPTSrc->a[iPTESrc].u & X86_PTE_PG_MASK;
@@ -1455 +1455 @@
                  */
                 /* Calculate the GC physical address of this 4KB shadow page. */
-                RTGCPHYS GCPhys = (PdeSrc.u & X86_PDE4M_PAE_PG_MASK) | ((RTGCUINTPTR)GCPtrPage & PAGE_OFFSET_MASK_BIG);
+                RTGCPHYS GCPhys = (PdeSrc.u & X86_PDE4M_PAE_PG_MASK) | ((RTGCUINTPTR)GCPtrPage & X86_PAGE_4M_OFFSET_MASK);
                 /* Find ram range. */
                 PPGMPAGE pPage;
@@ -1696 +1696 @@
                 if (VBOX_SUCCESS(rc))
                 {
-                    PVBOXPTE        pPteSrc = &pPTSrc->a[(GCPtrPage >> PAGE_SHIFT) & PTE_MASK];
+                    PVBOXPTE        pPteSrc = &pPTSrc->a[(GCPtrPage >> PAGE_SHIFT) & X86_PT_MASK];
                     const VBOXPTE   PteSrc = *pPteSrc;
                     if (pPteSrc->n.u1Present)
@@ -1753 +1753 @@
          * Real page fault?
          */
-        PVBOXPTE        pPteSrc = &pPTSrc->a[(GCPtrPage >> PAGE_SHIFT) & PTE_MASK];
+        PVBOXPTE        pPteSrc = &pPTSrc->a[(GCPtrPage >> PAGE_SHIFT) & X86_PT_MASK];
         const VBOXPTE   PteSrc = *pPteSrc;
         if (    !PteSrc.n.u1Present
@@ -2614 +2614 @@
     {
         pMapping      = pVM->pgm.s.CTXALLSUFF(pMappings);
-        iPdNoMapping  = (pMapping) ? pMapping->GCPtr >> PGDIR_SHIFT : ~0U;
+        iPdNoMapping  = (pMapping) ? pMapping->GCPtr >> X86_PD_SHIFT : ~0U;
     }
     else
@@ -2645 +2645 @@
                     pPDEDst += cPTs + (PGM_SHW_TYPE != PGM_TYPE_32BIT) * cPTs;
                     pMapping = pMapping->CTXALLSUFF(pNext);
-                    iPdNoMapping = pMapping ? pMapping->GCPtr >> PGDIR_SHIFT : ~0U;
+                    iPdNoMapping = pMapping ? pMapping->GCPtr >> X86_PD_SHIFT : ~0U;
                     continue;
                 }
@@ -2658 +2658 @@
                  */
                 pMapping = pVM->pgm.s.pMappingsR3;
-                while (pMapping && pMapping->GCPtr < (iPD << PGDIR_SHIFT))
+                while (pMapping && pMapping->GCPtr < (iPD << X86_PD_SHIFT))
                     pMapping = pMapping->pNextR3;
-                iPdNoMapping = pMapping ? pMapping->GCPtr >> PGDIR_SHIFT : ~0U;
+                iPdNoMapping = pMapping ? pMapping->GCPtr >> X86_PD_SHIFT : ~0U;
 #else
                 LogFlow(("SyncCR3: detected conflict -> VINF_PGM_SYNC_CR3\n"));
@@ -2778 +2778 @@
                 /* It's fixed, just skip the mapping. */
                 pMapping = pMapping->CTXALLSUFF(pNext);
-                iPdNoMapping = pMapping ? pMapping->GCPtr >> PGDIR_SHIFT : ~0U;
+                iPdNoMapping = pMapping ? pMapping->GCPtr >> X86_PD_SHIFT : ~0U;
             }
             else
@@ -2802 +2802 @@
                          */
                         pMapping = pVM->pgm.s.CTXALLSUFF(pMappings);
-                        while (pMapping && pMapping->GCPtr < (iPD << PGDIR_SHIFT))
+                        while (pMapping && pMapping->GCPtr < (iPD << X86_PD_SHIFT))
                             pMapping = pMapping->CTXALLSUFF(pNext);
-                        iPdNoMapping = pMapping ? pMapping->GCPtr >> PGDIR_SHIFT : ~0U;
+                        iPdNoMapping = pMapping ? pMapping->GCPtr >> X86_PD_SHIFT : ~0U;
                         break;
 #  else
@@ -2816 +2816 @@
                     pMapping = pMapping->CTXALLSUFF(pNext);
                     if (pMapping)
-                        iPdNoMapping = pMapping->GCPtr >> PGDIR_SHIFT;
+                        iPdNoMapping = pMapping->GCPtr >> X86_PD_SHIFT;
                 }
             }

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

@@ -83 +83 @@
             {
                 RTGCUINTPTR     off = GCPtr - pCur->GCPtr;
-                const unsigned  iPT = off >> PGDIR_SHIFT;
-                const unsigned  iPageNo = (off >> PAGE_SHIFT) & PTE_MASK;
+                const unsigned  iPT = off >> X86_PD_SHIFT;
+                const unsigned  iPageNo = (off >> PAGE_SHIFT) & X86_PT_MASK;
 
                 /* 32-bit */
@@ -183 +183 @@
             while (cb > 0)
             {
-                unsigned iPT  = off >> PGDIR_SHIFT;
-                unsigned iPTE = (off >> PAGE_SHIFT) & PTE_MASK;
+                unsigned iPT  = off >> X86_PD_SHIFT;
+                unsigned iPTE = (off >> PAGE_SHIFT) & X86_PT_MASK;
                 while (cb > 0 && iPTE < ELEMENTS(CTXALLSUFF(pCur->aPTs[iPT].pPT)->a))
                 {

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

@@ -185 +185 @@
         AssertMsgReturn(pMap, ("GCPtr=%VGv\n", GCPtr), VERR_INTERNAL_ERROR);
 #if PGM_SHW_TYPE == PGM_TYPE_32BIT
-        pPT = pMap->aPTs[(GCPtr - pMap->GCPtr) >> PGDIR_SHIFT].CTXALLSUFF(pPT);
+        pPT = pMap->aPTs[(GCPtr - pMap->GCPtr) >> X86_PD_SHIFT].CTXALLSUFF(pPT);
 #else /* PAE and AMD64: */
-        pPT = pMap->aPTs[(GCPtr - pMap->GCPtr) >> PGDIR_SHIFT].CTXALLSUFF(paPaePTs);
+        pPT = pMap->aPTs[(GCPtr - pMap->GCPtr) >> X86_PD_SHIFT].CTXALLSUFF(paPaePTs);
 #endif
     }