vbox的更動 13019 路徑 trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp

時間撮記:

2008-10-6 下午04:21:01 (16 年 以前)

作者:

vboxsync

訊息:

#1865: PGM ...

檔案:

• trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp (修改) (6 筆差異)

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);
     }