Changeset 13038 in vbox for trunk

Timestamp:

Oct 7, 2008 11:29:51 AM (16 years ago)

Author:

vboxsync

Message:

#1865: More PGM changes.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (3 diffs)
• PGM.cpp (modified) (1 diff)
• PGMInternal.h (modified) (8 diffs)
• PGMPhys.cpp (modified) (6 diffs)
• VMMAll/PGMAllGst.h (modified) (2 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (1 diff)
• VMMR0/PGMR0.cpp (modified) (1 diff)

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_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
 VMMR3_INCS     := \
         $(PATH_SUB_CURRENT) \
@@ -270 +270 @@
 VMMGC_DEFS     += VBOX_WITH_IDT_PATCHING
 endif
-VMMGC_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE
+VMMGC_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC
 VMMGC_SYSSUFF   = .gc
 VMMGC_LIBS      = \
@@ -357 +357 @@
 VMMR0_DEFS     += VBOX_WITH_IDT_PATCHING
 endif
-VMMR0_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE
+VMMR0_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE VBOX_WITH_2X_4GB_ADDR_SPACE_IN_0
 ifeq ($(VBOX_LDR_FMT),pe)
 VMMR0_LDFLAGS   = -Entry:VMMR0EntryEx

trunk/src/VBox/VMM/PGM.cpp

@@ -1873 +1873 @@
         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->pNextRC = MMHyperR3ToRC(pVM, pCur->pNextR3);
-#else
-        {
-            pCur->pNextRC = MMHyperR3ToRC(pVM, pCur->pNextR3);
-            if (pCur->pavHCChunkGC)
-                pCur->pavHCChunkGC = MMHyperHC2GC(pVM, pCur->pavHCChunkHC);
-        }
-#endif
     }
 

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)
+#elif defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
 # define PGM_HCPHYS_2_PTR(pVM, HCPhys, ppv) PGMR0DynMapHCPage(pVM, HCPhys, (void **)(ppv))
 #else
@@ -242 +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)
+#elif defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
 # define PGM_GCPHYS_2_PTR(pVM, GCPhys, ppv) PGMR0DynMapGCPage(pVM, GCPhys, (void **)(ppv))
 #else
@@ -262 +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)
+#elif defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
 # define PGM_GCPHYS_2_PTR_EX(pVM, GCPhys, ppv) PGMR0DynMapGCPageEx(pVM, GCPhys, (void **)(ppv))
 #else
@@ -935 +935 @@
     /** MM_RAM_* flags */
     uint32_t                            fFlags;
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     uint32_t                            u32Alignment; /**< alignment. */
-#else
-    /** HC virtual lookup ranges for chunks - RC Ptr.
-     * Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
-    RCPTRTYPE(PRTHCPTR)                 pavHCChunkGC;
+#ifndef VBOX_WITH_NEW_PHYS_CODE
     /** HC virtual lookup ranges for chunks - R3/R0 Ptr.
      * Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges. */
@@ -3049 +3045 @@
 #endif /* !IN_GC */
 
-
-#ifndef VBOX_WITH_NEW_PHYS_CODE
+#if !defined(IN_GC) /** @todo && !defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) */
+
+# ifndef VBOX_WITH_NEW_PHYS_CODE
 /**
  * Convert GC Phys to HC Virt.
@@ -3087 +3084 @@
     return VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
 }
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
+# endif /* !VBOX_WITH_NEW_PHYS_CODE */
 
 
@@ -3135 +3132 @@
 }
 
+#endif /* !IN_GC && !defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) */
 
 /**
@@ -3165 +3163 @@
     {
         unsigned idx = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
+#if defined(IN_GC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+        PRTR3PTR paChunkR3Ptrs = (PRTR3PTR)MMHyperR3ToCC(PGM2VM(pPGM), pRam->pavHCChunkHC);
+        *pHCPtr = paChunkR3Ptrs[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK);
+#else
         *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
+#endif
         return VINF_SUCCESS;
     }

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -246 +246 @@
     pNew->pvR3          = NULL;
     pNew->pavHCChunkHC  = NULL;
-    pNew->pavHCChunkGC  = 0;
 
 #ifndef VBOX_WITH_NEW_PHYS_CODE
@@ -252 +251 @@
     rc = MMHyperAlloc(pVM, (cb >> PGM_DYNAMIC_CHUNK_SHIFT) * sizeof(void *), 16, MM_TAG_PGM, (void **)&pNew->pavHCChunkHC);
     AssertRCReturn(rc, rc);
-    pNew->pavHCChunkGC = MMHyperCCToRC(pVM, pNew->pavHCChunkHC);
     pNew->fFlags |= MM_RAM_FLAGS_DYNAMIC_ALLOC;
 
@@ -491 +489 @@
         pNew->pvR3          = NULL;
         pNew->pavHCChunkHC  = NULL;
-        pNew->pavHCChunkGC  = 0;
 
         uint32_t iPage = cPages;
@@ -703 +700 @@
             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;
@@ -1777 +1773 @@
         pNew->fFlags        = fFlags;
         pNew->pavHCChunkHC  = NULL;
-        pNew->pavHCChunkGC  = 0;
 
         unsigned iPage = cb >> PAGE_SHIFT;
@@ -1795 +1790 @@
             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->pavHCChunkGC = MMHyperHC2GC(pVM, pNew->pavHCChunkHC);
-            Assert(pNew->pavHCChunkGC);
 
             /* Physical memory will be allocated on demand. */

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

@@ -553 +553 @@
     {
         pVM->pgm.s.apGstPaePDsHC[i]    = 0;
-        pVM->pgm.s.apGstPaePDsGC[i]    = 0;        
+        pVM->pgm.s.apGstPaePDsGC[i]    = 0;
         pVM->pgm.s.aGCPhysGstPaePDs[i] = NIL_RTGCPHYS;
     }
@@ -798 +798 @@
         if (Pde.n.u1Present)
         {
-            if (    !Pde.b.u1Size 
+            if (    !Pde.b.u1Size
 # if PGM_GST_TYPE != PGM_TYPE_AMD64
                 ||  !(pState->cr4 & X86_CR4_PSE)

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

@@ -893 +893 @@
     {
         unsigned iChunk = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
+#if defined(IN_GC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) /* ASSUMES this is a rare occurence */
+        PRTR3PTR paChunkR3Ptrs = (PRTR3PTR)MMHyperR3ToCC(pVM, pRam->pavHCChunkHC);
+        *pHCPtr = paChunkR3Ptrs[iChunk] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK);
+#else
         *pHCPtr = (RTHCPTR)((RTHCUINTPTR)CTXSUFF(pRam->pavHCChunk)[iChunk] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
+#endif
     }
     else if (RT_LIKELY(pRam->pvR3))

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

@@ -170 +170 @@
 VMMR0DECL(int) PGMR0DynMapGCPage(PVM pVM, RTGCPHYS GCPhys, void **ppv)
 {
-    Assert(!(GCPhys & PAGE_OFFSET));
+    Assert(!(GCPhys & PAGE_OFFSET_MASK));
     return VERR_NOT_IMPLEMENTED;
 }