Changeset 13035 in vbox for trunk/src/VBox/VMM/PGMPhys.cpp

Timestamp:

Oct 7, 2008 9:54:32 AM (16 years ago)

Author:

vboxsync

Message:

#1865: More PGM...

File:

• trunk/src/VBox/VMM/PGMPhys.cpp (modified) (23 diffs)

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -98 +98 @@
     pNew->pNextR3 = pRam;
     pNew->pNextR0 = pRam ? MMHyperCCToR0(pVM, pRam) : NIL_RTR0PTR;
-    pNew->pNextGC = pRam ? MMHyperCCToRC(pVM, pRam) : NIL_RTGCPTR;
+    pNew->pNextRC = pRam ? MMHyperCCToRC(pVM, pRam) : NIL_RTRCPTR;
 
     if (pPrev)
@@ -104 +104 @@
         pPrev->pNextR3 = pNew;
         pPrev->pNextR0 = MMHyperCCToR0(pVM, pNew);
-        pPrev->pNextGC = MMHyperCCToRC(pVM, pNew);
+        pPrev->pNextRC = MMHyperCCToRC(pVM, pNew);
     }
     else
@@ -110 +110 @@
         pVM->pgm.s.pRamRangesR3 = pNew;
         pVM->pgm.s.pRamRangesR0 = MMHyperCCToR0(pVM, pNew);
-        pVM->pgm.s.pRamRangesGC = MMHyperCCToRC(pVM, pNew);
+        pVM->pgm.s.pRamRangesRC = MMHyperCCToRC(pVM, pNew);
     }
 
@@ -135 +135 @@
         pPrev->pNextR3 = pNext;
         pPrev->pNextR0 = pNext ? MMHyperCCToR0(pVM, pNext) : NIL_RTR0PTR;
-        pPrev->pNextGC = pNext ? MMHyperCCToRC(pVM, pNext) : NIL_RTGCPTR;
+        pPrev->pNextRC = pNext ? MMHyperCCToRC(pVM, pNext) : NIL_RTRCPTR;
     }
     else
@@ -142 +142 @@
         pVM->pgm.s.pRamRangesR3 = pNext;
         pVM->pgm.s.pRamRangesR0 = pNext ? MMHyperCCToR0(pVM, pNext) : NIL_RTR0PTR;
-        pVM->pgm.s.pRamRangesGC = pNext ? MMHyperCCToRC(pVM, pNext) : NIL_RTGCPTR;
+        pVM->pgm.s.pRamRangesRC = pNext ? MMHyperCCToRC(pVM, pNext) : NIL_RTRCPTR;
     }
 
@@ -244 +244 @@
     pNew->fFlags        = 0;
 
-    pNew->pvHC          = NULL;
+    pNew->pvR3          = NULL;
     pNew->pavHCChunkHC  = NULL;
     pNew->pavHCChunkGC  = 0;
@@ -343 +343 @@
                         }
                         else
-                            ASMMemZero32((char *)pRam->pvHC + (iPage << PAGE_SHIFT), PAGE_SIZE);
+                            ASMMemZero32((char *)pRam->pvR3 + (iPage << PAGE_SHIFT), PAGE_SIZE);
                         break;
 #else /* VBOX_WITH_NEW_PHYS_CODE */
@@ -489 +489 @@
         pNew->fFlags        = 0; /* Some MMIO flag here? */
 
-        pNew->pvHC          = NULL;
+        pNew->pvR3          = NULL;
         pNew->pavHCChunkHC  = NULL;
         pNew->pavHCChunkGC  = 0;
@@ -701 +701 @@
             //pNew->RamRange.fFlags = 0;
 
-            pNew->RamRange.pvHC = pvPages;      ///@todo remove this
-            pNew->RamRange.pavHCChunkHC = NULL; ///@todo remove this
-            pNew->RamRange.pavHCChunkGC = 0;    ///@todo remove this
+            pNew->RamRange.pvR3 = pvPages;      ///@todo remove this [new phys code]
+            pNew->RamRange.pavHCChunkHC = NULL; ///@todo remove this [new phys code]
+            pNew->RamRange.pavHCChunkGC = 0;    ///@todo remove this [new phys code]
 
             uint32_t iPage = cPages;
@@ -1253 +1253 @@
                 pRamNew->cb            = cb;
                 pRamNew->fFlags        = 0;
-                pRamNew->pvHC          = NULL;
+                pRamNew->pvR3          = NULL;
 
                 PPGMPAGE pPage = &pRamNew->aPages[0];
@@ -1344 +1344 @@
                     pRomNew->pNextR3 = pRom;
                     pRomNew->pNextR0 = pRom ? MMHyperCCToR0(pVM, pRom) : NIL_RTR0PTR;
-                    pRomNew->pNextGC = pRom ? MMHyperCCToRC(pVM, pRom) : NIL_RTGCPTR;
+                    pRomNew->pNextGC = pRom ? MMHyperCCToRC(pVM, pRom) : NIL_RTRCPTR;
 
                     if (pRomPrev)
@@ -1729 +1729 @@
     size_t          cbRam = RT_OFFSETOF(PGMRAMRANGE, aPages[cb >> PAGE_SHIFT]);
     PPGMRAMRANGE    pNew;
-    RTGCPTR         GCPtrNew;
+    RTRCPTR         RCPtrNew;
     int             rc = VERR_NO_MEMORY;
     if (cbRam > PAGE_SIZE / 2)
@@ -1737 +1737 @@
         if (VBOX_SUCCESS(rc))
         {
+            RTGCPTR GCPtrNew;
             rc = MMR3HyperMapHCRam(pVM, pNew, cbRam, true,
                                    MMR3HeapAPrintf(pVM, MM_TAG_PGM_PHYS, "ram range (%s)", pszDesc),
@@ -1742 +1743 @@
             if (VBOX_SUCCESS(rc))
             {
-                Assert(MMHyperHC2GC(pVM, pNew) == GCPtrNew);
+                RCPtrNew = GCPtrNew;
+                Assert(MMHyperR3ToRC(pVM, pNew) == GCPtrNew && RCPtrNew == GCPtrNew);
                 rc = MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
             }
@@ -1760 +1762 @@
         rc = MMHyperAlloc(pVM, cbRam, 16, MM_TAG_PGM, (void **)&pNew);
         if (VBOX_SUCCESS(rc))
-            GCPtrNew = MMHyperHC2GC(pVM, pNew);
+            RCPtrNew = MMHyperR3ToRC(pVM, pNew);
         else
             AssertMsgFailed(("MMHyperAlloc(,%#x,,,) -> %Vrc\n", cbRam, cb));
@@ -1769 +1771 @@
          * Initialize the range.
          */
-        pNew->pvHC          = pvRam;
+        pNew->pvR3          = pvRam;
         pNew->GCPhys        = GCPhys;
         pNew->GCPhysLast    = GCPhysLast;
@@ -1821 +1823 @@
         pNew->pNextR3 = pCur;
         pNew->pNextR0 = pCur ? MMHyperCCToR0(pVM, pCur) : NIL_RTR0PTR;
-        pNew->pNextGC = pCur ? MMHyperCCToRC(pVM, pCur) : NIL_RTGCPTR;
+        pNew->pNextRC = pCur ? MMHyperCCToRC(pVM, pCur) : NIL_RTRCPTR;
         if (pPrev)
         {
             pPrev->pNextR3 = pNew;
             pPrev->pNextR0 = MMHyperCCToR0(pVM, pNew);
-            pPrev->pNextGC = GCPtrNew;
+            pPrev->pNextRC = RCPtrNew;
         }
         else
@@ -1832 +1834 @@
             pVM->pgm.s.pRamRangesR3 = pNew;
             pVM->pgm.s.pRamRangesR0 = MMHyperCCToR0(pVM, pNew);
-            pVM->pgm.s.pRamRangesGC = GCPtrNew;
+            pVM->pgm.s.pRamRangesRC = RCPtrNew;
         }
         pgmUnlock(pVM);
@@ -1888 +1890 @@
      * Find existing range location.
      */
-    PPGMRAMRANGE pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
     while (pRam)
     {
@@ -1896 +1898 @@
             break;
 
-        pRam = CTXALLSUFF(pRam->pNext);
+        pRam = pRam->CTX_SUFF(pNext);
     }
     AssertReturn(pRam, VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS);
@@ -1933 +1935 @@
     pgmLock(pVM);
 
-    PPGMRAMRANGE pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
     while (pRam)
     {
@@ -1953 +1955 @@
         }
 
-        pRam = CTXALLSUFF(pRam->pNext);
+        pRam = pRam->CTX_SUFF(pNext);
     }
     pgmUnlock(pVM);
@@ -2068 +2070 @@
      * Lookup the range.
      */
-    PPGMRAMRANGE    pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    PPGMRAMRANGE    pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
     while (pRam && GCPhys > pRam->GCPhysLast)
-        pRam = CTXALLSUFF(pRam->pNext);
+        pRam = pRam->CTX_SUFF(pNext);
     if (    !pRam
         ||  GCPhys > pRam->GCPhysLast