Changeset 13019 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 6, 2008 4:21:01 PM (16 years ago)

Author:

vboxsync

Message:

#1865: PGM ...

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (3 diffs)
• PGMAllBth.h (modified) (7 diffs)
• PGMAllMap.cpp (modified) (6 diffs)
• PGMAllShw.h (modified) (1 diff)

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

@@ -440 +440 @@
 PPGMMAPPING pgmGetMapping(PVM pVM, RTGCPTR GCPtr)
 {
-    PPGMMAPPING pMapping = CTXALLSUFF(pVM->pgm.s.pMappings);
+    PPGMMAPPING pMapping = pVM->pgm.s.CTX_SUFF(pMappings);
     while (pMapping)
     {
@@ -450 +450 @@
             return pMapping;
         }
-        pMapping = CTXALLSUFF(pMapping->pNext);
+        pMapping = pMapping->CTX_SUFF(pNext);
     }
     return NULL;
@@ -1766 +1766 @@
      * Check for mapping conflicts.
      */
-    for (PPGMMAPPING pMapping = CTXALLSUFF(pVM->pgm.s.pMappings);
+    for (PPGMMAPPING pMapping = pVM->pgm.s.CTX_SUFF(pMappings);
          pMapping;
-         pMapping = CTXALLSUFF(pMapping->pNext))
+         pMapping = pMapping->CTX_SUFF(pNext))
     {
         /** @todo This is slow and should be optimized, but since it's just assertions I don't care now. */

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

@@ -246 +246 @@
     {
         STAM_PROFILE_START(&pVM->pgm.s.StatMapping, a);
-        PPGMMAPPING pMapping = CTXALLSUFF(pVM->pgm.s.pMappings);
-        for ( ; pMapping; pMapping = CTXALLSUFF(pMapping->pNext))
+        PPGMMAPPING pMapping = pVM->pgm.s.CTX_SUFF(pMappings);
+        for ( ; pMapping; pMapping = pMapping->CTX_SUFF(pNext))
         {
             if ((RTGCUINTPTR)pvFault < (RTGCUINTPTR)pMapping->GCPtr)
@@ -3145 +3145 @@
     if (pgmMapAreMappingsEnabled(&pVM->pgm.s))
     {
-        pMapping      = pVM->pgm.s.CTXALLSUFF(pMappings);
+        pMapping      = pVM->pgm.s.CTX_SUFF(pMappings);
         iPdNoMapping  = (pMapping) ? (pMapping->GCPtr >> GST_PD_SHIFT) : ~0U;
     }
@@ -3285 +3285 @@
                 AssertMsg(&pVM->pgm.s.CTXMID(ap,PaePDs)[iPD * 2 / 512]->a[iPD * 2 % 512] == pPDEDst, ("%p vs %p\n", &pVM->pgm.s.CTXMID(ap,PaePDs)[iPD * 2 / 512]->a[iPD * 2 % 512], pPDEDst));
 #  endif
-                register GSTPDE PdeSrc = pPDSrc->a[iPD];
+                GSTPDE PdeSrc = pPDSrc->a[iPD];
                 if (    PdeSrc.n.u1Present
                     &&  (PdeSrc.n.u1User || fRawR0Enabled))
@@ -3308 +3308 @@
                             iPD += cPTs - 1;
                             pPDEDst += cPTs + (PGM_GST_TYPE != PGM_SHW_TYPE) * cPTs;    /* Only applies to the pae shadow and 32 bits guest case */
-                            pMapping = pMapping->CTXALLSUFF(pNext);
+                            pMapping = pMapping->CTX_SUFF(pNext);
                             iPdNoMapping = pMapping ? pMapping->GCPtr >> GST_PD_SHIFT : ~0U;
                             continue;
@@ -3477 +3477 @@
                     {
                         /* It's fixed, just skip the mapping. */
-                        pMapping = pMapping->CTXALLSUFF(pNext);
+                        pMapping = pMapping->CTX_SUFF(pNext);
                         iPdNoMapping = pMapping ? pMapping->GCPtr >> GST_PD_SHIFT : ~0U;
                     }
@@ -3505 +3505 @@
                                 * Update iPdNoMapping and pMapping.
                                 */
-                                pMapping = pVM->pgm.s.CTXALLSUFF(pMappings);
+                                pMapping = pVM->pgm.s.CTX_SUFF(pMappings);
                                 while (pMapping && pMapping->GCPtr < (iPD << GST_PD_SHIFT))
-                                    pMapping = pMapping->CTXALLSUFF(pNext);
+                                    pMapping = pMapping->CTX_SUFF(pNext);
                                 iPdNoMapping = pMapping ? pMapping->GCPtr >> GST_PD_SHIFT : ~0U;
                                 break;
@@ -3518 +3518 @@
                         if (iPdNoMapping == ~0U && pMapping)
                         {
-                            pMapping = pMapping->CTXALLSUFF(pNext);
+                            pMapping = pMapping->CTX_SUFF(pNext);
                             if (pMapping)
                                 iPdNoMapping = pMapping->GCPtr >> GST_PD_SHIFT;

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

@@ -64 +64 @@
      * Find the mapping.
      */
-    PPGMMAPPING pCur = CTXALLSUFF(pVM->pgm.s.pMappings);
+    PPGMMAPPING pCur = pVM->pgm.s.CTX_SUFF(pMappings);
     while (pCur)
     {
@@ -91 +91 @@
 
                 /* 32-bit */
-                CTXALLSUFF(pCur->aPTs[iPT].pPT)->a[iPageNo].u = (uint32_t)Pte.u;      /* ASSUMES HCPhys < 4GB and/or that we're never gonna do 32-bit on a PAE host! */
+                pCur->aPTs[iPT].CTX_SUFF(pPT)->a[iPageNo].u = (uint32_t)Pte.u;      /* ASSUMES HCPhys < 4GB and/or that we're never gonna do 32-bit on a PAE host! */
 
                 /* pae */
-                CTXALLSUFF(pCur->aPTs[iPT].paPaePTs)[iPageNo / 512].a[iPageNo % 512].u = Pte.u;
+                pCur->aPTs[iPT].CTX_SUFF(paPaePTs)[iPageNo / 512].a[iPageNo % 512].u = Pte.u;
 
                 /* next */
@@ -108 +108 @@
 
         /* next */
-        pCur = CTXALLSUFF(pCur->pNext);
+        pCur = pCur->CTX_SUFF(pNext);
     }
 
@@ -169 +169 @@
      * Find the mapping.
      */
-    PPGMMAPPING pCur = CTXALLSUFF(pVM->pgm.s.pMappings);
+    PPGMMAPPING pCur = pVM->pgm.s.CTX_SUFF(pMappings);
     while (pCur)
     {
@@ -189 +189 @@
                 unsigned iPT  = off >> X86_PD_SHIFT;
                 unsigned iPTE = (off >> PAGE_SHIFT) & X86_PT_MASK;
-                while (cb > 0 && iPTE < RT_ELEMENTS(CTXALLSUFF(pCur->aPTs[iPT].pPT)->a))
+                while (cb > 0 && iPTE < RT_ELEMENTS(pCur->aPTs[iPT].CTX_SUFF(pPT)->a))
                 {
                     /* 32-Bit */
-                    CTXALLSUFF(pCur->aPTs[iPT].pPT)->a[iPTE].u &= fMask | X86_PTE_PG_MASK;
-                    CTXALLSUFF(pCur->aPTs[iPT].pPT)->a[iPTE].u |= fFlags & ~X86_PTE_PG_MASK;
+                    pCur->aPTs[iPT].CTX_SUFF(pPT)->a[iPTE].u &= fMask | X86_PTE_PG_MASK;
+                    pCur->aPTs[iPT].CTX_SUFF(pPT)->a[iPTE].u |= fFlags & ~X86_PTE_PG_MASK;
 
                     /* PAE */
-                    CTXALLSUFF(pCur->aPTs[iPT].paPaePTs)[iPTE / 512].a[iPTE % 512].u &= fMask | X86_PTE_PAE_PG_MASK;
-                    CTXALLSUFF(pCur->aPTs[iPT].paPaePTs)[iPTE / 512].a[iPTE % 512].u |= fFlags & ~X86_PTE_PAE_PG_MASK;
+                    pCur->aPTs[iPT].CTX_SUFF(paPaePTs)[iPTE / 512].a[iPTE % 512].u &= fMask | X86_PTE_PAE_PG_MASK;
+                    pCur->aPTs[iPT].CTX_SUFF(paPaePTs)[iPTE / 512].a[iPTE % 512].u |= fFlags & ~X86_PTE_PAE_PG_MASK;
 
                     /* invalidate tls */
@@ -212 +212 @@
         }
         /* next */
-        pCur = CTXALLSUFF(pCur->pNext);
+        pCur = pCur->CTX_SUFF(pNext);
     }
 

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

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