Changeset 28 in vbox

Timestamp:

Jan 15, 2007 4:48:27 PM (18 years ago)

Author:

vboxsync

Message:

Updates.

Location:

trunk/src/VBox/VMM

Files:

• MM.cpp (modified) (1 diff)
• PGM.cpp (modified) (4 diffs)
• PGMInternal.h (modified) (7 diffs)
• PGMPhys.cpp (modified) (3 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/MM.cpp

@@ -211 +211 @@
         if (VBOX_SUCCESS(rc))
         {
-            /* Allocate the first 4 MB chunk, as we'll map ROM ranges there. */
+            /* Allocate the first chunk, as we'll map ROM ranges there. */
             rc = PGM3PhysGrowRange(pVM, (RTGCPHYS)0);
             if (VBOX_SUCCESS(rc))

trunk/src/VBox/VMM/PGM.cpp

@@ -1164 +1164 @@
         {
             pCur->pNextGC = MMHyperHC2GC(pVM, pCur->pNextHC);
-            if (pCur->pvHCChunkGC)
-                pCur->pvHCChunkGC = MMHyperHC2GC(pVM, pCur->pvHCChunkHC);
+            if (pCur->pavHCChunkGC)
+                pCur->pavHCChunkGC = MMHyperHC2GC(pVM, pCur->pavHCChunkHC);
         }
     }
@@ -1302 +1302 @@
             {
                 unsigned iChunk = iPage >> (PGM_DYNAMIC_CHUNK_SHIFT - PAGE_SHIFT);
-                if (pRam->pvHCChunkHC[iChunk])
-                    ASMMemZero32((char *)pRam->pvHCChunkHC[iChunk] + ((iPage << PAGE_SHIFT) & PGM_DYNAMIC_CHUNK_OFFSET_MASK), PAGE_SIZE);
+                if (pRam->pavHCChunkHC[iChunk])
+                    ASMMemZero32((char *)pRam->pavHCChunkHC[iChunk] + ((iPage << PAGE_SHIFT) & PGM_DYNAMIC_CHUNK_OFFSET_MASK), PAGE_SIZE);
             }
             else
@@ -1397 +1397 @@
             for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
             {
-                if (pRam->pvHCChunkHC[iChunk])
+                if (pRam->pavHCChunkHC[iChunk])
                 {
                     SSMR3PutU8(pSSM, 1);    /* chunk present */
-                    SSMR3PutMem(pSSM, pRam->pvHCChunkHC[iChunk], PGM_DYNAMIC_CHUNK_SIZE);
+                    SSMR3PutMem(pSSM, pRam->pavHCChunkHC[iChunk], PGM_DYNAMIC_CHUNK_SIZE);
                 }
                 else
@@ -1616 +1616 @@
                         return rc;
 
-                    Assert(pRam->pvHCChunkHC[iChunk]);
-
-                    SSMR3GetMem(pSSM, pRam->pvHCChunkHC[iChunk], PGM_DYNAMIC_CHUNK_SIZE);
+                    Assert(pRam->pavHCChunkHC[iChunk]);
+
+                    SSMR3GetMem(pSSM, pRam->pavHCChunkHC[iChunk], PGM_DYNAMIC_CHUNK_SIZE);
                 }
                 /* else nothing to do */

trunk/src/VBox/VMM/PGMInternal.h

@@ -478 +478 @@
     uint32_t                            fFlags;
 
-    /** HC virtual lookup ranges for 4 MB chunks. Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
-    GCPTRTYPE(void **)                  pvHCChunkGC; /**< @todo r=bird: ditto */
-    /** HC virtual lookup ranges for 4 MB chunks. Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
-    HCPTRTYPE(void **)                  pvHCChunkHC; /**< @todo r=bird: rename to papvHCChunkHC */
+    /** HC virtual lookup ranges for chunks. Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
+    GCPTRTYPE(void **)                  pavHCChunkGC;
+    /** HC virtual lookup ranges for chunks. Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
+    HCPTRTYPE(void **)                  pavHCChunkHC;
 
     /** Start of the HC mapping of the range.
@@ -502 +502 @@
 /** Return hc ptr corresponding to the ram range and physical offset */
 #define PGMRAMRANGE_GETHCPTR(pRam, off) \
-    (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC) ? (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[(off >> PGM_DYNAMIC_CHUNK_SHIFT)] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK))  \
+    (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC) ? (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[(off >> PGM_DYNAMIC_CHUNK_SHIFT)] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK))  \
                                                 : (RTHCPTR)((RTHCUINTPTR)pRam->pvHC + off);
 
@@ -1836 +1836 @@
                 unsigned idx = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
                 /* Physical chunk in dynamically allocated range not present? */
-                if (RT_UNLIKELY(!CTXSUFF(pRam->pvHCChunk)[idx]))
+                if (RT_UNLIKELY(!CTXSUFF(pRam->pavHCChunk)[idx]))
                 {
 #ifdef IN_RING3
@@ -1846 +1846 @@
                         return rc;
                 }
-                *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
+                *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
                 return VINF_SUCCESS;
             }
@@ -1881 +1881 @@
         unsigned idx = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
         /* Physical chunk in dynamically allocated range not present? */
-        if (RT_UNLIKELY(!CTXSUFF(pRam->pvHCChunk)[idx]))
+        if (RT_UNLIKELY(!CTXSUFF(pRam->pavHCChunk)[idx]))
         {
 #ifdef IN_RING3
@@ -1891 +1891 @@
                 return rc;
         }
-        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
+        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
         return VINF_SUCCESS;
     }
@@ -1940 +1940 @@
             {
                 unsigned idx = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
-                *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
+                *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
                 return VINF_SUCCESS;
             }

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -158 +158 @@
         pNew->cb            = cb;
         pNew->fFlags        = fFlags;
-        pNew->pvHCChunkHC   = NULL;
-        pNew->pvHCChunkGC   = 0;
+        pNew->pavHCChunkHC  = NULL;
+        pNew->pavHCChunkGC  = 0;
 
         unsigned iPage = cb >> PAGE_SHIFT;
@@ -169 +169 @@
         else if (fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
         {
-            /* Allocate memory for 4 MB chunk to HC ptr lookup array. */
-            rc = MMHyperAlloc(pVM, (cb >> PGM_DYNAMIC_CHUNK_SHIFT) * sizeof(void *), 16, MM_TAG_PGM, (void **)&pNew->pvHCChunkHC);
+            /* Allocate memory for chunk to HC ptr lookup array. */
+            rc = MMHyperAlloc(pVM, (cb >> PGM_DYNAMIC_CHUNK_SHIFT) * sizeof(void *), 16, MM_TAG_PGM, (void **)&pNew->pavHCChunkHC);
             AssertMsgReturn(rc == VINF_SUCCESS, ("MMHyperAlloc(,%#x,,,) -> %Vrc\n", cbRam, cb), rc);
 
-            pNew->pvHCChunkGC = MMHyperHC2GC(pVM, pNew->pvHCChunkHC);
-            Assert(pNew->pvHCChunkGC);
+            pNew->pavHCChunkGC = MMHyperHC2GC(pVM, pNew->pavHCChunkHC);
+            Assert(pNew->pavHCChunkGC);
 
             /* Physical memory will be allocated on demand. */
@@ -278 +278 @@
     }
     off >>= (PGM_DYNAMIC_CHUNK_SHIFT - PAGE_SHIFT);
-    pRam->pvHCChunkHC[off] = pvRam;
+    pRam->pavHCChunkHC[off] = pvRam;
 
     /* Notify the recompiler. */

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

@@ -197 +197 @@
                 }
                 unsigned idx = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
-                *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
+                *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
                 return VINF_SUCCESS;
             }
@@ -236 +236 @@
             for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
             {
-                if (CTXSUFF(pRam->pvHCChunk)[iChunk])
-                {
-                    RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[iChunk];
+                if (CTXSUFF(pRam->pavHCChunk)[iChunk])
+                {
+                    RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[iChunk];
                     if (off < PGM_DYNAMIC_CHUNK_SIZE)
                         return true;
@@ -277 +277 @@
             for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
             {
-                if (CTXSUFF(pRam->pvHCChunk)[iChunk])
-                {
-                    RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[iChunk];
+                if (CTXSUFF(pRam->pavHCChunk)[iChunk])
+                {
+                    RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[iChunk];
                     if (off < PGM_DYNAMIC_CHUNK_SIZE)
                     {
@@ -325 +325 @@
             for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
             {
-                if (CTXSUFF(pRam->pvHCChunk)[iChunk])
-                {
-                    RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[iChunk];
+                if (CTXSUFF(pRam->pavHCChunk)[iChunk])
+                {
+                    RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[iChunk];
                     if (off < PGM_DYNAMIC_CHUNK_SIZE)
                     {
@@ -459 +459 @@
                         unsigned idx = (iPage >> (PGM_DYNAMIC_CHUNK_SHIFT - PAGE_SHIFT));
 
-                        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pvHCChunk)[idx] + ((iPage << PAGE_SHIFT) & PGM_DYNAMIC_CHUNK_OFFSET_MASK) + off);
+                        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[idx] + ((iPage << PAGE_SHIFT) & PGM_DYNAMIC_CHUNK_OFFSET_MASK) + off);
                     }
                     else