Changeset 13035 in vbox

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37476

Message:

#1865: More PGM...

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (2 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (4 diffs)
• src/VBox/VMM/PGM.cpp (modified) (8 diffs)
• src/VBox/VMM/PGMDbg.cpp (modified) (12 diffs)
• src/VBox/VMM/PGMInternal.h (modified) (22 diffs)
• src/VBox/VMM/PGMPhys.cpp (modified) (23 diffs)
• src/VBox/VMM/VBoxVMMDeps.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (4 diffs)
• src/VBox/VMM/VMMAll/PGMAllHandler.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (23 diffs)
• src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (8 diffs)
• src/VBox/VMM/VMMGC/PGMGC.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/PGMR0.cpp (modified) (1 diff)
• src/VBox/VMM/testcase/tstVMStructGC.cpp (modified) (2 diffs)

trunk/include/VBox/pgm.h

@@ -459 +459 @@
 VMMR0DECL(int)  PGMR0PhysAllocateHandyPages(PVM pVM);
 VMMR0DECL(int)  PGMR0Trap0eHandlerNestedPaging(PVM pVM, PGMMODE enmShwPagingMode, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPHYS pvFault);
+# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+VMMR0DECL(int)  PGMR0DynMapGCPage(PVM pVM, RTGCPHYS GCPhys, void **ppv);
+VMMR0DECL(int)  PGMR0DynMapGCPageEx(PVM pVM, RTGCPHYS GCPhys, void **ppv);
+VMMR0DECL(int)  PGMR0DynMapHCPage(PVM pVM, RTHCPHYS HCPhys, void **ppv);
+# endif
 /** @} */
 #endif /* IN_RING0 */
@@ -556 +561 @@
 VMMR3DECL(int)  PGMR3CheckIntegrity(PVM pVM);
 
-VMMR3DECL(int)  PGMR3DbgHCPtr2GCPhys(PVM pVM, RTHCPTR HCPtr, PRTGCPHYS pGCPhys);
-VMMR3DECL(int)  PGMR3DbgHCPtr2HCPhys(PVM pVM, RTHCPTR HCPtr, PRTHCPHYS pHCPhys);
+VMMR3DECL(int)  PGMR3DbgR3Ptr2GCPhys(PVM pVM, RTR3PTR R3Ptr, PRTGCPHYS pGCPhys);
+VMMR3DECL(int)  PGMR3DbgR3Ptr2HCPhys(PVM pVM, RTR3PTR R3Ptr, PRTHCPHYS pHCPhys);
 VMMR3DECL(int)  PGMR3DbgHCPhys2GCPhys(PVM pVM, RTHCPHYS HCPhys, PRTGCPHYS pGCPhys);
 VMMR3DECL(int)  PGMR3DbgScanPhysical(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cbRange, const uint8_t *pabNeedle, size_t cbNeedle, PRTGCPHYS pGCPhysHit);

trunk/src/VBox/VMM/Makefile.kmk

@@ -41 +41 @@
 VMMR3_DEFS     += VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
 endif
+VMMR3_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE
 VMMR3_INCS     := \
         $(PATH_SUB_CURRENT) \
@@ -175 +176 @@
 VBoxVMM_TEMPLATE = VBOXR3
 VBoxVMM_DEFS = $(VMMR3_DEFS)
+VBoxVMM_DEFS.$(KBUILD_TARGET) = $(VMMR3_DEFS.$(KBUILD_TARGET))
 VBoxVMM_SOURCES = VBoxVMMDeps.cpp
 VBoxVMM_SONAME.linux = VBoxVMM.so
@@ -268 +270 @@
 VMMGC_DEFS     += VBOX_WITH_IDT_PATCHING
 endif
+VMMGC_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE
 VMMGC_SYSSUFF   = .gc
 VMMGC_LIBS      = \
@@ -354 +357 @@
 VMMR0_DEFS     += VBOX_WITH_IDT_PATCHING
 endif
+VMMR0_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE
 ifeq ($(VBOX_LDR_FMT),pe)
 VMMR0_LDFLAGS   = -Entry:VMMR0EntryEx

trunk/src/VBox/VMM/PGM.cpp

@@ -1871 +1871 @@
     if (pVM->pgm.s.pRamRangesR3)
     {
-        pVM->pgm.s.pRamRangesGC = MMHyperHC2GC(pVM, pVM->pgm.s.pRamRangesR3);
+        pVM->pgm.s.pRamRangesRC = MMHyperR3ToRC(pVM, pVM->pgm.s.pRamRangesR3);
         for (PPGMRAMRANGE pCur = pVM->pgm.s.pRamRangesR3; pCur->pNextR3; pCur = pCur->pNextR3)
 #ifdef VBOX_WITH_NEW_PHYS_CODE
-            pCur->pNextGC = MMHyperR3ToRC(pVM, pCur->pNextR3);
+            pCur->pNextRC = MMHyperR3ToRC(pVM, pCur->pNextR3);
 #else
         {
-            pCur->pNextGC = MMHyperR3ToRC(pVM, pCur->pNextR3);
+            pCur->pNextRC = MMHyperR3ToRC(pVM, pCur->pNextR3);
             if (pCur->pavHCChunkGC)
                 pCur->pavHCChunkGC = MMHyperHC2GC(pVM, pCur->pavHCChunkHC);
@@ -2146 +2146 @@
         SSMR3PutGCPhys(pSSM, pRam->GCPhysLast);
         SSMR3PutGCPhys(pSSM, pRam->cb);
-        SSMR3PutU8(pSSM, !!pRam->pvHC);             /* boolean indicating memory or not. */
+        SSMR3PutU8(pSSM, !!pRam->pvR3);             /* boolean indicating memory or not. */
 
         /* Flags. */
@@ -2167 +2167 @@
             }
         }
-        else if (pRam->pvHC)
+        else if (pRam->pvR3)
         {
-            int rc = SSMR3PutMem(pSSM, pRam->pvHC, pRam->cb);
+            int rc = SSMR3PutMem(pSSM, pRam->pvR3, pRam->cb);
             if (VBOX_FAILURE(rc))
             {
-                Log(("pgmR3Save: SSMR3PutMem(, %p, %#x) -> %Vrc\n", pRam->pvHC, pRam->cb, rc));
+                Log(("pgmR3Save: SSMR3PutMem(, %p, %#x) -> %Vrc\n", pRam->pvR3, pRam->cb, rc));
                 return rc;
             }
@@ -2341 +2341 @@
             ||  GCPhysLast != pRam->GCPhysLast
             ||  cb != pRam->cb
-            ||  fHaveBits != !!pRam->pvHC)
+            ||  fHaveBits != !!pRam->pvR3)
         {
-            LogRel(("Ram range: %VGp-%VGp %VGp bytes %s\n"
-                    "State    : %VGp-%VGp %VGp bytes %s\n",
-                    pRam->GCPhys, pRam->GCPhysLast, pRam->cb, pRam->pvHC ? "bits" : "nobits",
+            LogRel(("Ram range: %RGp-%RGp %RGp bytes %s\n"
+                    "State    : %RGp-%RGp %RGp bytes %s\n",
+                    pRam->GCPhys, pRam->GCPhysLast, pRam->cb, pRam->pvR3 ? "bits" : "nobits",
                     GCPhys, GCPhysLast, cb, fHaveBits ? "bits" : "nobits"));
             /*
@@ -2404 +2404 @@
             }
         }
-        else if (pRam->pvHC)
+        else if (pRam->pvR3)
         {
-            int rc = SSMR3GetMem(pSSM, pRam->pvHC, pRam->cb);
+            int rc = SSMR3GetMem(pSSM, pRam->pvR3, pRam->cb);
             if (VBOX_FAILURE(rc))
             {
-                Log(("pgmR3Save: SSMR3GetMem(, %p, %#x) -> %Vrc\n", pRam->pvHC, pRam->cb, rc));
+                Log(("pgmR3Save: SSMR3GetMem(, %p, %#x) -> %Vrc\n", pRam->pvR3, pRam->cb, rc));
                 return rc;
             }
@@ -2523 +2523 @@
                         pCur->GCPhys,
                         pCur->GCPhysLast,
-                        pCur->pvHC,
+                        pCur->pvR3,
                         pCur->pszDesc);
 }
@@ -4054 +4054 @@
     if (!pVM)
         return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: The command requires a VM to be selected.\n");
-    if (!pVM->pgm.s.pRamRangesGC)
+    if (!pVM->pgm.s.pRamRangesRC)
         return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Sorry, no Ram is registered.\n");
 
@@ -4065 +4065 @@
     {
         rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL,
-            "%VGp - %VGp  %p\n",
-            pRam->GCPhys, pRam->GCPhysLast, pRam->pvHC);
+            "%RGp - %RGp  %p\n",
+            pRam->GCPhys, pRam->GCPhysLast, pRam->pvR3);
         if (VBOX_FAILURE(rc))
             return rc;

trunk/src/VBox/VMM/PGMDbg.cpp

@@ -41 +41 @@
 
 /**
- * Converts a HC pointer to a GC physical address.
+ * Converts a R3 pointer to a GC physical address.
  *
  * Only for the debugger.
@@ -49 +49 @@
  * @retval  VERR_INVALID_POINTER if the pointer is not within the GC physical memory.
  *
- * @param   pVM     The VM handle.
- * @param   HCPtr   The HC pointer to convert.
- * @param   pGCPhys Where to store the GC physical address on success.
- */
-VMMR3DECL(int) PGMR3DbgHCPtr2GCPhys(PVM pVM, RTHCPTR HCPtr, PRTGCPHYS pGCPhys)
+ * @param   pVM         The VM handle.
+ * @param   R3Ptr       The R3 pointer to convert.
+ * @param   pGCPhys     Where to store the GC physical address on success.
+ */
+VMMR3DECL(int) PGMR3DbgR3Ptr2GCPhys(PVM pVM, RTR3PTR R3Ptr, PRTGCPHYS pGCPhys)
 {
 #ifdef VBOX_WITH_NEW_PHYS_CODE
@@ -60 +60 @@
 
 #else
-    for (PPGMRAMRANGE pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
          pRam;
-         pRam = CTXALLSUFF(pRam->pNext))
+         pRam = pRam->CTX_SUFF(pNext))
     {
         if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
@@ -68 +68 @@
             for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
             {
-                if (CTXSUFF(pRam->pavHCChunk)[iChunk])
+                if (pRam->pavHCChunkHC[iChunk])
                 {
-                    RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[iChunk];
+                    RTR3UINTPTR off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pRam->pavHCChunkHC[iChunk];
                     if (off < PGM_DYNAMIC_CHUNK_SIZE)
                     {
@@ -79 +79 @@
             }
         }
-        else if (pRam->pvHC)
-        {
-            RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)pRam->pvHC;
+        else if (pRam->pvR3)
+        {
+            RTR3UINTPTR off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pRam->pvR3;
             if (off < pRam->cb)
             {
@@ -95 +95 @@
 
 /**
- * Converts a HC pointer to a GC physical address.
+ * Converts a R3 pointer to a HC physical address.
+ *
+ * Only for the debugger.
  *
  * @returns VBox status code.
@@ -102 +104 @@
  * @retval  VERR_INVALID_POINTER if the pointer is not within the GC physical memory.
  *
- * @param   pVM     The VM handle.
- * @param   HCPtr   The HC pointer to convert.
- * @param   pHCPhys Where to store the HC physical address on success.
- */
-VMMR3DECL(int) PGMR3DbgHCPtr2HCPhys(PVM pVM, RTHCPTR HCPtr, PRTHCPHYS pHCPhys)
+ * @param   pVM         The VM handle.
+ * @param   R3Ptr       The R3 pointer to convert.
+ * @param   pHCPhys     Where to store the HC physical address on success.
+ */
+VMMR3DECL(int) PGMR3DbgR3Ptr2HCPhys(PVM pVM, RTR3PTR R3Ptr, PRTHCPHYS pHCPhys)
 {
 #ifdef VBOX_WITH_NEW_PHYS_CODE
@@ -113 +115 @@
 
 #else
-    for (PPGMRAMRANGE pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
          pRam;
-         pRam = CTXALLSUFF(pRam->pNext))
+         pRam = pRam->CTX_SUFF(pNext))
     {
         if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
@@ -121 +123 @@
             for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
             {
-                if (CTXSUFF(pRam->pavHCChunk)[iChunk])
+                if (pRam->pavHCChunkHC[iChunk])
                 {
-                    RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[iChunk];
+                    RTR3UINTPTR off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pRam->pavHCChunkHC[iChunk];
                     if (off < PGM_DYNAMIC_CHUNK_SIZE)
                     {
@@ -136 +138 @@
             }
         }
-        else if (pRam->pvHC)
-        {
-            RTHCUINTPTR off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)pRam->pvHC;
+        else if (pRam->pvR3)
+        {
+            RTR3UINTPTR off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pRam->pvR3;
             if (off < pRam->cb)
             {
@@ -180 +182 @@
         return VERR_INVALID_POINTER;
 
-    for (PPGMRAMRANGE pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
          pRam;
-         pRam = CTXALLSUFF(pRam->pNext))
+         pRam = pRam->CTX_SUFF(pNext))
     {
         uint32_t iPage = pRam->cb >> PAGE_SHIFT;
@@ -346 +348 @@
      * bother to match across ranges.
      */
-    for (PPGMRAMRANGE pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
          pRam;
-         pRam = CTXALLSUFF(pRam->pNext))
+         pRam = pRam->CTX_SUFF(pNext))
     {
         /*

trunk/src/VBox/VMM/PGMInternal.h

@@ -222 +222 @@
 #ifdef IN_GC
 # define PGM_HCPHYS_2_PTR(pVM, HCPhys, ppv) PGMGCDynMapHCPage(pVM, HCPhys, (void **)(ppv))
+#elif defined(VBOX_WITH_2X_4GB_ADDR_SPACE)
+# define PGM_HCPHYS_2_PTR(pVM, HCPhys, ppv) PGMR0DynMapHCPage(pVM, HCPhys, (void **)(ppv))
 #else
 # define PGM_HCPHYS_2_PTR(pVM, HCPhys, ppv) MMPagePhys2PageEx(pVM, HCPhys, (void **)(ppv))
@@ -240 +242 @@
 #ifdef IN_GC
 # define PGM_GCPHYS_2_PTR(pVM, GCPhys, ppv) PGMGCDynMapGCPage(pVM, GCPhys, (void **)(ppv))
+#elif defined(VBOX_WITH_2X_4GB_ADDR_SPACE)
+# define PGM_GCPHYS_2_PTR(pVM, GCPhys, ppv) PGMR0DynMapGCPage(pVM, GCPhys, (void **)(ppv))
 #else
 # define PGM_GCPHYS_2_PTR(pVM, GCPhys, ppv) PGMPhysGCPhys2HCPtr(pVM, GCPhys, 1 /* one page only */, (void **)(ppv)) /** @todo this isn't asserting, use PGMRamGCPhys2HCPtr! */
@@ -258 +262 @@
 #ifdef IN_GC
 # define PGM_GCPHYS_2_PTR_EX(pVM, GCPhys, ppv) PGMGCDynMapGCPageEx(pVM, GCPhys, (void **)(ppv))
+#elif defined(VBOX_WITH_2X_4GB_ADDR_SPACE)
+# define PGM_GCPHYS_2_PTR_EX(pVM, GCPhys, ppv) PGMR0DynMapGCPageEx(pVM, GCPhys, (void **)(ppv))
 #else
 # define PGM_GCPHYS_2_PTR_EX(pVM, GCPhys, ppv) PGMPhysGCPhys2HCPtr(pVM, GCPhys, 1 /* one page only */, (void **)(ppv)) /** @todo this isn't asserting, use PGMRamGCPhys2HCPtr! */
@@ -917 +923 @@
     /** Pointer to the next RAM range - for R0. */
     R0PTRTYPE(struct PGMRAMRANGE *)     pNextR0;
-    /** Pointer to the next RAM range - for GC. */
-    RCPTRTYPE(struct PGMRAMRANGE *)     pNextGC;
+    /** Pointer to the next RAM range - for RC. */
+    RCPTRTYPE(struct PGMRAMRANGE *)     pNextRC;
     /** Pointer alignment. */
-    RTRCPTR                             GCPtrAlignment;
+    RTRCPTR                             RCPtrAlignment;
     /** Start of the range. Page aligned. */
     RTGCPHYS                            GCPhys;
@@ -932 +938 @@
     uint32_t                            u32Alignment; /**< alignment. */
 #else
-    /** HC virtual lookup ranges for chunks. Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
+    /** HC virtual lookup ranges for chunks - RC Ptr.
+     * Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
     RCPTRTYPE(PRTHCPTR)                 pavHCChunkGC;
-    /** HC virtual lookup ranges for chunks. Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
+    /** HC virtual lookup ranges for chunks - R3/R0 Ptr.
+     * Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
+//# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+//    R3PTRTYPE(PRTHCPTR)                 pavHCChunkHC;
+//# else
     R3R0PTRTYPE(PRTHCPTR)               pavHCChunkHC;
+//# endif
 #endif
     /** Start of the HC mapping of the range. This is only used for MMIO2. */
-    R3PTRTYPE(void *)                   pvHC;
+    R3PTRTYPE(void *)                   pvR3;
     /** The range description. */
     R3PTRTYPE(const char *)             pszDesc;
@@ -958 +970 @@
 #define PGMRAMRANGE_GETHCPTR(pRam, off) \
     (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);
+                                                : (RTHCPTR)((RTR3UINTPTR)pRam->pvR3 + off);
 
 /**
@@ -2145 +2157 @@
     /** R0 pointer corresponding to PGM::pRamRangesR3. */
     R0PTRTYPE(PPGMRAMRANGE)         pRamRangesR0;
-    /** GC pointer corresponding to PGM::pRamRangesR3. */
-    RCPTRTYPE(PPGMRAMRANGE)         pRamRangesGC;
+    /** RC pointer corresponding to PGM::pRamRangesR3. */
+    RCPTRTYPE(PPGMRAMRANGE)         pRamRangesRC;
     /** The configured RAM size. */
     RTUINT                          cbRamSize;
@@ -2719 +2731 @@
      * Optimize for the first range.
      */
-    PPGMRAMRANGE pRam = CTXALLSUFF(pPGM->pRamRanges);
+    PPGMRAMRANGE pRam = pPGM->CTX_SUFF(pRamRanges);
     RTGCPHYS off = GCPhys - pRam->GCPhys;
     if (RT_UNLIKELY(off >= pRam->cb))
@@ -2725 +2737 @@
         do
         {
-            pRam = CTXALLSUFF(pRam->pNext);
+            pRam = pRam->CTX_SUFF(pNext);
             if (RT_UNLIKELY(!pRam))
                 break;
@@ -2749 +2761 @@
      * Optimize for the first range.
      */
-    PPGMRAMRANGE pRam = CTXALLSUFF(pPGM->pRamRanges);
+    PPGMRAMRANGE pRam = pPGM->CTX_SUFF(pRamRanges);
     RTGCPHYS off = GCPhys - pRam->GCPhys;
     if (RT_UNLIKELY(off >= pRam->cb))
@@ -2755 +2767 @@
         do
         {
-            pRam = CTXALLSUFF(pRam->pNext);
+            pRam = pRam->CTX_SUFF(pNext);
             if (RT_UNLIKELY(!pRam))
                 return NULL;
@@ -2783 +2795 @@
      * Optimize for the first range.
      */
-    PPGMRAMRANGE pRam = CTXALLSUFF(pPGM->pRamRanges);
+    PPGMRAMRANGE pRam = pPGM->CTX_SUFF(pRamRanges);
     RTGCPHYS off = GCPhys - pRam->GCPhys;
     if (RT_UNLIKELY(off >= pRam->cb))
@@ -2789 +2801 @@
         do
         {
-            pRam = CTXALLSUFF(pRam->pNext);
+            pRam = pRam->CTX_SUFF(pNext);
             if (RT_UNLIKELY(!pRam))
             {
@@ -2848 +2860 @@
         ||  RT_UNLIKELY((off = GCPhys - pRam->GCPhys) >= pRam->cb))
     {
-        pRam = CTXALLSUFF(pPGM->pRamRanges);
+        pRam = pPGM->CTX_SUFF(pRamRanges);
         off = GCPhys - pRam->GCPhys;
         if (RT_UNLIKELY(off >= pRam->cb))
@@ -2854 +2866 @@
             do
             {
-                pRam = CTXALLSUFF(pRam->pNext);
+                pRam = pRam->CTX_SUFF(pNext);
                 if (RT_UNLIKELY(!pRam))
                 {
@@ -2906 +2918 @@
      * Optimize for the first range.
      */
-    PPGMRAMRANGE pRam = CTXALLSUFF(pPGM->pRamRanges);
+    PPGMRAMRANGE pRam = pPGM->CTX_SUFF(pRamRanges);
     RTGCPHYS off = GCPhys - pRam->GCPhys;
     if (RT_UNLIKELY(off >= pRam->cb))
@@ -2912 +2924 @@
         do
         {
-            pRam = CTXALLSUFF(pRam->pNext);
+            pRam = pRam->CTX_SUFF(pNext);
             if (RT_UNLIKELY(!pRam))
                 return NULL;
@@ -2941 +2953 @@
      * Optimize for the first range.
      */
-    PPGMRAMRANGE pRam = CTXALLSUFF(pPGM->pRamRanges);
+    PPGMRAMRANGE pRam = pPGM->CTX_SUFF(pRamRanges);
     RTGCPHYS off = GCPhys - pRam->GCPhys;
     if (RT_UNLIKELY(off >= pRam->cb))
@@ -2947 +2959 @@
         do
         {
-            pRam = CTXALLSUFF(pRam->pNext);
+            pRam = pRam->CTX_SUFF(pNext);
             if (RT_UNLIKELY(!pRam))
             {
@@ -3067 +3079 @@
         return VINF_SUCCESS;
     }
-    if (pRam->pvHC)
+    if (pRam->pvR3)
     {
-        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)pRam->pvHC + off);
+        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)pRam->pvR3 + off); /** @todo @bugref{1865,3202}: Code is converting R3 pointer and maybe using it in R0! */
         return VINF_SUCCESS;
     }
@@ -3114 +3126 @@
         return VINF_SUCCESS;
     }
-    if (pRam->pvHC)
+    if (pRam->pvR3)
     {
-        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)pRam->pvHC + off);
+        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)pRam->pvR3 + off); /** @todo @bugref{1865,3202}: Code is converting R3 pointer and maybe using it in R0! */
         return VINF_SUCCESS;
     }
@@ -3156 +3168 @@
         return VINF_SUCCESS;
     }
-    if (pRam->pvHC)
+    if (pRam->pvR3)
     {
-        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)pRam->pvHC + off);
+        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)pRam->pvR3 + off); /** @todo @bugref{1865,3202}: Code is converting R3 pointer and maybe using it in R0! */
         return VINF_SUCCESS;
     }

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

trunk/src/VBox/VMM/VBoxVMMDeps.cpp

@@ -49 +49 @@
     (PFNRT)PDMCritSectEnter,
     (PFNRT)PGMInvalidatePage,
-    (PFNRT)PGMR3DbgHCPtr2GCPhys,
+    (PFNRT)PGMR3DbgR3Ptr2GCPhys,
     (PFNRT)VMR3Create,
     (PFNRT)VMMDoTest,

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

@@ -1303 +1303 @@
      * Find the guest address.
      */
-    for (PPGMRAMRANGE pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
          pRam;
-         pRam = CTXALLSUFF(pRam->pNext))
+         pRam = pRam->CTX_SUFF(pNext))
     {
         unsigned iPage = pRam->cb >> PAGE_SHIFT;
@@ -2568 +2568 @@
                   GCPtrPage, PdeSrc.b.u1Present, PdeSrc.b.u1Write, PdeSrc.b.u1User, (uint64_t)PdeSrc.u, GCPtr,
                   GCPhys, PdeDst.u & PGM_PDFLAGS_TRACK_DIRTY ? " Track-Dirty" : ""));
-            PPGMRAMRANGE      pRam   = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+            PPGMRAMRANGE      pRam   = pVM->pgm.s.CTX_SUFF(pRamRanges);
             unsigned          iPTDst = 0;
             while (iPTDst < RT_ELEMENTS(pPTDst->a))
@@ -2574 +2574 @@
                 /* Advance ram range list. */
                 while (pRam && GCPhys > pRam->GCPhysLast)
-                    pRam = CTXALLSUFF(pRam->pNext);
+                    pRam = pRam->CTX_SUFF(pNext);
                 if (pRam && GCPhys >= pRam->GCPhys)
                 {
@@ -3631 +3631 @@
 #  if PGM_GST_TYPE == PGM_TYPE_32BIT && defined(IN_RING3)
     RTGCPHYS GCPhys;
-    rc = PGMR3DbgHCPtr2GCPhys(pVM, pPGM->pGuestPDHC, &GCPhys);
+    rc = PGMR3DbgR3Ptr2GCPhys(pVM, pPGM->pGuestPDHC, &GCPhys);
     AssertRCReturn(rc, 1);
     AssertMsgReturn((cr3 & GST_CR3_PAGE_MASK) == GCPhys, ("GCPhys=%VGp cr3=%VGp\n", GCPhys, (RTGCPHYS)cr3), false);

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

@@ -118 +118 @@
      * There is no apparent need to support ranges which cover more than one ram 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
         ||  GCPhysLast < pRam->GCPhys
@@ -511 +511 @@
              * There is no apparent need to support ranges which cover more than one ram 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
@@ -1348 +1348 @@
      * Check the RAM flags against the handlers.
      */
-    for (PPGMRAMRANGE pRam = CTXALLSUFF(pPGM->pRamRanges); pRam; pRam = CTXALLSUFF(pRam->pNext))
+    for (PPGMRAMRANGE pRam = pPGM->CTX_SUFF(pRamRanges); pRam; pRam = pRam->CTX_SUFF(pNext))
     {
         const unsigned cPages = pRam->cb >> PAGE_SHIFT;

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

@@ -575 +575 @@
      * 99.8% of requests are expected to be in the first range.
      */
-    PPGMRAMRANGE pRam = CTXALLSUFF(pPGM->pRamRanges);
+    PPGMRAMRANGE pRam = pPGM->CTX_SUFF(pRamRanges);
     RTGCPHYS off = GCPhys - pRam->GCPhys;
     if (RT_UNLIKELY(off >= pRam->cb))
@@ -581 +581 @@
         do
         {
-            pRam = CTXALLSUFF(pRam->pNext);
+            pRam = pRam->CTX_SUFF(pNext);
             if (!pRam)
                 return VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
@@ -859 +859 @@
  * @param   pHCPtr  Where to store the HC pointer on success.
  */
-VMMDECL(int) PGMPhysGCPhys2HCPtr(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange, PRTHCPTR pHCPtr)
+VMMDECL(int) PGMPhysGCPhys2HCPtr(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange, PRTHCPTR pHCPtr) /** @todo @bugref{1865}: HCPtr -> R3Ptr */
 {
 #ifdef VBOX_WITH_NEW_PHYS_CODE
@@ -895 +895 @@
         *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[iChunk] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
     }
-    else if (RT_LIKELY(pRam->pvHC))
-        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)pRam->pvHC + off);
+    else if (RT_LIKELY(pRam->pvR3))
+        *pHCPtr = (RTHCPTR)((RTR3UINTPTR)pRam->pvR3 + off);
     else
         return VERR_PGM_PHYS_PAGE_RESERVED;
@@ -911 +911 @@
  * @param   cbRange     Physical range.
  */
-VMMDECL(RTHCPTR) PGMPhysGCPhys2HCPtrAssert(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange)
+VMMDECL(RTHCPTR) PGMPhysGCPhys2HCPtrAssert(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange) /** @todo @bugref{1865}: HCPtr -> R3Ptr */
 {
     RTHCPTR HCPtr;
@@ -970 +970 @@
  * @param   pHCPtr      Where to store the HC virtual address.
  */
-VMMDECL(int) PGMPhysGCPtr2HCPtr(PVM pVM, RTGCPTR GCPtr, PRTHCPTR pHCPtr)
+VMMDECL(int) PGMPhysGCPtr2HCPtr(PVM pVM, RTGCPTR GCPtr, PRTHCPTR pHCPtr) /** @todo @bugref{1865}: HCPtr -> R3Ptr */
 {
 #ifdef VBOX_WITH_NEW_PHYS_CODE
@@ -998 +998 @@
  *          future DBGF API to cpu state independent conversions.
  */
-VMMDECL(int) PGMPhysGCPtr2HCPtrByGstCR3(PVM pVM, RTGCPTR GCPtr, uint64_t cr3, unsigned fFlags, PRTHCPTR pHCPtr)
+VMMDECL(int) PGMPhysGCPtr2HCPtrByGstCR3(PVM pVM, RTGCPTR GCPtr, uint64_t cr3, unsigned fFlags, PRTHCPTR pHCPtr) /** @todo @bugref{1865}: HCPtr -> R3Ptr */
 {
 #ifdef VBOX_WITH_NEW_PHYS_CODE
@@ -1154 +1154 @@
      * Copy loop on ram ranges.
      */
-    PPGMRAMRANGE pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
     for (;;)
     {
         /* Find range. */
         while (pRam && GCPhys > pRam->GCPhysLast)
-            pRam = CTXALLSUFF(pRam->pNext);
+            pRam = pRam->CTX_SUFF(pNext);
         /* Inside range or not? */
         if (pRam && GCPhys >= pRam->GCPhys)
@@ -1214 +1214 @@
                     if (rc == VINF_PGM_HANDLER_DO_DEFAULT)
                     {
-#ifdef IN_GC
+#ifdef IN_GC /** @todo @bugref{3202}: R0 too */
                         void *pvSrc = NULL;
                         PGMGCDynMapHCPage(pVM, PGM_PAGE_GET_HCPHYS(pPage), &pvSrc);
@@ -1263 +1263 @@
                     if (rc == VINF_PGM_HANDLER_DO_DEFAULT)
                     {
-#ifdef IN_GC
+#ifdef IN_GC  /** @todo @bugref{3202}: R0 too */
                         void *pvSrc = NULL;
                         PGMGCDynMapHCPage(pVM, PGM_PAGE_GET_HCPHYS(pPage), &pvSrc);
@@ -1293 +1293 @@
                         case MM_RAM_FLAGS_MMIO2: // MMIO2 isn't in the mask.
                         {
-#ifdef IN_GC
+#ifdef IN_GC /** @todo @bugref{3202}: R0 too */
                             void *pvSrc = NULL;
                             PGMGCDynMapHCPage(pVM, PGM_PAGE_GET_HCPHYS(pPage), &pvSrc);
@@ -1415 +1415 @@
      * Copy loop on ram ranges.
      */
-    PPGMRAMRANGE    pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    PPGMRAMRANGE    pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
     for (;;)
     {
         /* Find range. */
         while (pRam && GCPhys > pRam->GCPhysLast)
-            pRam = CTXALLSUFF(pRam->pNext);
+            pRam = pRam->CTX_SUFF(pNext);
         /* Inside range or not? */
         if (pRam && GCPhys >= pRam->GCPhys)
@@ -1517 +1517 @@
                         if (rc == VINF_PGM_HANDLER_DO_DEFAULT)
                         {
-#ifdef IN_GC
+#ifdef IN_GC /** @todo @bugref{3202}: R0 too */
                             void *pvDst = NULL;
                             PGMGCDynMapHCPage(pVM, PGM_PAGE_GET_HCPHYS(pPage), &pvDst);
@@ -1562 +1562 @@
                         if (rc == VINF_PGM_HANDLER_DO_DEFAULT)
                         {
-#ifdef IN_GC
+#ifdef IN_GC /** @todo @bugref{3202}: R0 too */
                             void *pvDst = NULL;
                             PGMGCDynMapHCPage(pVM, PGM_PAGE_GET_HCPHYS(pPage), &pvDst);
@@ -1607 +1607 @@
                     if (rc == VINF_PGM_HANDLER_DO_DEFAULT)
                     {
-#ifdef IN_GC
+#ifdef IN_GC /** @todo @bugref{3202}: R0 too */
                         void *pvDst = NULL;
                         PGMGCDynMapHCPage(pVM, PGM_PAGE_GET_HCPHYS(pPage), &pvDst);
@@ -1636 +1636 @@
                         case MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO2: /* shadow rom */
                         {
-#ifdef IN_GC
+#ifdef IN_GC /** @todo @bugref{3202}: R0 too */
                             void *pvDst = NULL;
                             PGMGCDynMapHCPage(pVM, PGM_PAGE_GET_HCPHYS(pPage), &pvDst);
@@ -1718 +1718 @@
 }
 
-#ifndef IN_GC /* Ring 0 & 3 only */
+#ifndef IN_GC /* Ring 0 & 3 only */  /** @todo @bugref{1865,3202}: this'll be fun! */
 
 /**
@@ -1741 +1741 @@
      * Loop ram ranges.
      */
-    for (PPGMRAMRANGE pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
          pRam;
-         pRam = CTXALLSUFF(pRam->pNext))
+         pRam = pRam->CTX_SUFF(pNext))
     {
         RTGCPHYS off = GCPhysSrc - pRam->GCPhys;
@@ -1774 +1774 @@
                 }
             }
-            else if (pRam->pvHC)
+            else if (pRam->pvR3)
             {
                 /* read */
@@ -1780 +1780 @@
                 if (cbRead >= cb)
                 {
-                    memcpy(pvDst, (uint8_t *)pRam->pvHC + off, cb);
+                    memcpy(pvDst, (uint8_t *)pRam->pvR3 + off, cb);
                     return VINF_SUCCESS;
                 }
-                memcpy(pvDst, (uint8_t *)pRam->pvHC + off, cbRead);
+                memcpy(pvDst, (uint8_t *)pRam->pvR3 + off, cbRead);
 
                 /* next */
@@ -1825 +1825 @@
      * Loop ram ranges.
      */
-    for (PPGMRAMRANGE pRam = CTXALLSUFF(pVM->pgm.s.pRamRanges);
+    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
          pRam;
-         pRam = CTXALLSUFF(pRam->pNext))
+         pRam = pRam->CTX_SUFF(pNext))
     {
         RTGCPHYS off = GCPhysDst - pRam->GCPhys;
@@ -1861 +1861 @@
                 }
             }
-            else if (pRam->pvHC)
+            else if (pRam->pvR3)
             {
                 /* write */
@@ -1867 +1867 @@
                 if (cbWrite >= cb)
                 {
-                    memcpy((uint8_t *)pRam->pvHC + off, pvSrc, cb);
+                    memcpy((uint8_t *)pRam->pvR3 + off, pvSrc, cb);
                     return VINF_SUCCESS;
                 }
-                memcpy((uint8_t *)pRam->pvHC + off, pvSrc, cbWrite);
+                memcpy((uint8_t *)pRam->pvR3 + off, pvSrc, cbWrite);
 
                 /* next */

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

@@ -1951 +1951 @@
      * Clear all the GCPhys links and rebuild the phys ext free list.
      */
-    for (PPGMRAMRANGE pRam = pPool->CTXSUFF(pVM)->pgm.s.CTXALLSUFF(pRamRanges);
+    for (PPGMRAMRANGE pRam = pPool->CTXSUFF(pVM)->pgm.s.CTX_SUFF(pRamRanges);
          pRam;
-         pRam = CTXALLSUFF(pRam->pNext))
+         pRam = pRam->CTX_SUFF(pNext))
     {
         unsigned iPage = pRam->cb >> PAGE_SHIFT;
@@ -3028 +3028 @@
      * Walk range list.
      */
-    PPGMRAMRANGE pRam = pPool->CTXSUFF(pVM)->pgm.s.CTXALLSUFF(pRamRanges);
+    PPGMRAMRANGE pRam = pPool->CTXSUFF(pVM)->pgm.s.CTX_SUFF(pRamRanges);
     while (pRam)
     {
@@ -3046 +3046 @@
             break;
         }
-        pRam = CTXALLSUFF(pRam->pNext);
+        pRam = pRam->CTX_SUFF(pNext);
     }
     AssertFatalMsgFailed(("HCPhys=%VHp GCPhys=%VGp\n", HCPhys, GCPhys));
@@ -3065 +3065 @@
      * Walk range list.
      */
-    PPGMRAMRANGE pRam = pPool->CTXSUFF(pVM)->pgm.s.CTXALLSUFF(pRamRanges);
+    PPGMRAMRANGE pRam = pPool->CTXSUFF(pVM)->pgm.s.CTX_SUFF(pRamRanges);
     while (pRam)
     {
@@ -3081 +3081 @@
             break;
         }
-        pRam = CTXALLSUFF(pRam->pNext);
+        pRam = pRam->CTX_SUFF(pNext);
     }
 
@@ -3088 +3088 @@
      */
     STAM_COUNTER_INC(&pPool->StatTrackLinearRamSearches);
-    pRam = pPool->CTXSUFF(pVM)->pgm.s.CTXALLSUFF(pRamRanges);
+    pRam = pPool->CTXSUFF(pVM)->pgm.s.CTX_SUFF(pRamRanges);
     while (pRam)
     {
@@ -3102 +3102 @@
             }
         }
-        pRam = CTXALLSUFF(pRam->pNext);
+        pRam = pRam->CTX_SUFF(pNext);
     }
 
@@ -3608 +3608 @@
      * Clear all the GCPhys links and rebuild the phys ext free list.
      */
-    for (PPGMRAMRANGE pRam = pPool->CTXSUFF(pVM)->pgm.s.CTXALLSUFF(pRamRanges);
+    for (PPGMRAMRANGE pRam = pPool->CTXSUFF(pVM)->pgm.s.CTX_SUFF(pRamRanges);
          pRam;
-         pRam = CTXALLSUFF(pRam->pNext))
+         pRam = pRam->CTX_SUFF(pNext))
     {
         unsigned iPage = pRam->cb >> PAGE_SHIFT;

trunk/src/VBox/VMM/VMMGC/PGMGC.cpp

@@ -184 +184 @@
      * Get the ram range.
      */
-    PPGMRAMRANGE pRam = pVM->pgm.s.pRamRangesGC;
+    PPGMRAMRANGE pRam = pVM->pgm.s.pRamRangesRC;
     while (pRam && GCPhys - pRam->GCPhys >= pRam->cb)
-        pRam = pRam->pNextGC;
+        pRam = pRam->pNextRC;
     if (!pRam)
     {
@@ -222 +222 @@
      * Get the ram range.
      */
-    PPGMRAMRANGE pRam = pVM->pgm.s.pRamRangesGC;
+    PPGMRAMRANGE pRam = pVM->pgm.s.pRamRangesRC;
     while (pRam && GCPhys - pRam->GCPhys >= pRam->cb)
-        pRam = pRam->pNextGC;
+        pRam = pRam->pNextRC;
     if (!pRam)
     {

trunk/src/VBox/VMM/VMMR0/PGMR0.cpp

@@ -156 +156 @@
     return rc;
 }
+
+
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+
+/** darwin stub */
+VMMR0DECL(int) PGMR0DynMapGCPage(PVM pVM, RTGCPHYS GCPhys, void **ppv)
+{
+    Assert(!(GCPhys & PAGE_OFFSET));
+    return VERR_NOT_IMPLEMENTED;
+}
+
+/** darwin stub */
+VMMR0DECL(int) PGMR0DynMapGCPageEx(PVM pVM, RTGCPHYS GCPhys, void **ppv)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+
+/** darwin stub */
+VMMR0DECL(int) PGMR0DynMapHCPage(PVM pVM, RTHCPHYS HCPhys, void **ppv)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+
+#endif /* VBOX_WITH_2X_4GB_ADDR_SPACE */
+

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -449 +449 @@
     GEN_CHECK_OFF(PGM, pRamRangesR3);
     GEN_CHECK_OFF(PGM, pRamRangesR0);
-    GEN_CHECK_OFF(PGM, pRamRangesGC);
+    GEN_CHECK_OFF(PGM, pRamRangesRC);
     GEN_CHECK_OFF(PGM, pRomRangesR3);
     GEN_CHECK_OFF(PGM, pRomRangesR0);
@@ -568 +568 @@
     GEN_CHECK_OFF(PGMRAMRANGE, pNextR3);
     GEN_CHECK_OFF(PGMRAMRANGE, pNextR0);
-    GEN_CHECK_OFF(PGMRAMRANGE, pNextGC);
+    GEN_CHECK_OFF(PGMRAMRANGE, pNextRC);
     GEN_CHECK_OFF(PGMRAMRANGE, GCPhys);
     GEN_CHECK_OFF(PGMRAMRANGE, GCPhysLast);
     GEN_CHECK_OFF(PGMRAMRANGE, cb);
     GEN_CHECK_OFF(PGMRAMRANGE, fFlags);
-    GEN_CHECK_OFF(PGMRAMRANGE, pvHC);
+    GEN_CHECK_OFF(PGMRAMRANGE, pvR3);
     GEN_CHECK_OFF(PGMRAMRANGE, pszDesc);
     GEN_CHECK_OFF(PGMRAMRANGE, aPages);