Changeset 12968 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 3, 2008 12:16:13 AM (16 years ago)

Author:

vboxsync

Message:

#1865: MM done for now (needs revisiting later).

Location:

trunk/src/VBox/VMM

Files:

• MM.cpp (modified) (10 diffs)
• MMHyper.cpp (modified) (5 diffs)
• MMInternal.h (modified) (5 diffs)
• PGMMap.cpp (modified) (1 diff)
• VMMAll/MMAllHyper.cpp (modified) (1 diff)
• VMMAll/MMAllPagePool.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/MM.cpp

@@ -30 +30 @@
  *      - Locked process memory - Guest RAM and other. (reduce/obsolete this)
  *      - Physical guest memory (RAM & ROM) - Moving to PGM. (obsolete this)
+ *
+ * The global memory manager (GMM) is the global counter part / partner of MM.
+ * MM will provide therefore ring-3 callable interfaces for some of the GMM APIs
+ * related to resource tracking (PGM is the user).
  *
  *
@@ -139 +143 @@
 
 
-
 /*******************************************************************************
 *   Header Files                                                               *
@@ -175 +178 @@
 
 
+
+
 /**
  * Initializes the MM members of the UVM.
@@ -212 +217 @@
  * MM determins the virtual address of the hypvervisor memory area by
  * checking for location at previous run. If that property isn't available
- * it will choose a default starting location, currently 0xe0000000.
+ * it will choose a default starting location, currently 0xa0000000.
  *
  * @returns VBox status code.
@@ -460 +465 @@
     pVM->mm.s.offVM          = 0;           /* init assertion on this */
 
-    return 0;
+    return VINF_SUCCESS;
 }
 
@@ -555 +560 @@
     if (cPages != pVM->mm.s.cBasePages)
     {
-        Log(("mmR3Load: Memory configuration has changed. cPages=%#RX64 saved=%#RX64\n", pVM->mm.s.cBasePages, cPages));
+        LogRel(("mmR3Load: Memory configuration has changed. cPages=%#RX64 saved=%#RX64\n", pVM->mm.s.cBasePages, cPages));
         return VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH;
     }
@@ -572 +577 @@
     if (cb != pVM->mm.s.cbRamBase)
     {
-        Log(("mmR3Load: Memory configuration has changed. cbRamBase=%#RX64 save=%#RX64\n", pVM->mm.s.cbRamBase, cb));
+        LogRel(("mmR3Load: Memory configuration has changed. cbRamBase=%#RX64 save=%#RX64\n", pVM->mm.s.cbRamBase, cb));
         return VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH;
     }
@@ -805 +810 @@
  * @param   ppv         Where to store the resulting address.
  * @thread  The Emulation Thread.
+ *
+ * @remarks Avoid whenever possible.
+ *          Intended for the debugger facility only.
+ * @todo    Rename to indicate the special usage.
  */
 MMR3DECL(int) MMR3HCPhys2HCVirt(PVM pVM, RTHCPHYS HCPhys, void **ppv)
@@ -843 +852 @@
  * @param   GCPtr       GC virtual address.
  * @param   cb          Number of bytes to read.
+ *
+ * @remarks Intended for the debugger facility only.
+ * @todo    Move to DBGF, it's only selecting which functions to use!
  */
 MMR3DECL(int) MMR3ReadGCVirt(PVM pVM, void *pvDst, RTGCPTR GCPtr, size_t cb)
@@ -860 +872 @@
  * @param   pvSrc       The source address (HC of course).
  * @param   cb          Number of bytes to read.
+ *
+ * @remarks Intended for the debugger facility only.
+ * @todo    Move to DBGF, it's only selecting which functions to use!
  */
 MMR3DECL(int) MMR3WriteGCVirt(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)

trunk/src/VBox/VMM/MMHyper.cpp

@@ -19 +19 @@
  * additional information or have any questions.
  */
-
-
 
 
@@ -50 +48 @@
 
 
+
+
 /**
  * Initializes the hypvervisor related MM stuff without
@@ -515 +515 @@
 
 
-
-
 /**
  * Locks and Maps HC virtual memory into the hypervisor region in the GC.
@@ -787 +785 @@
     AssertReturn(cbAligned >= cb, VERR_INVALID_PARAMETER);
     void *pv;
-    int rc = SUPPageAlloc(cbAligned >> PAGE_SHIFT, &pv);
+    int rc = SUPPageAlloc(cbAligned >> PAGE_SHIFT, &pv); /** @todo #1865: heap allocation must be changed for osx (only). */
     if (VBOX_SUCCESS(rc))
     {
@@ -1060 +1058 @@
  * @param   GCPtr       GC virtual address.
  * @param   cb          Number of bytes to read.
+ *
+ * @remarks For DBGF only.
  */
 MMR3DECL(int) MMR3HyperReadGCVirt(PVM pVM, void *pvDst, RTGCPTR GCPtr, size_t cb)

trunk/src/VBox/VMM/MMInternal.h

@@ -351 +351 @@
  * related to a MMPAGESUBPOOL node in one chunk. That means that after the
  * bitmap (which is of variable size) comes the SUPPAGE records and then
- * follows the lookup tree nodes.
+ * follows the lookup tree nodes. (The heap in question is the hyper heap.)
  */
 typedef struct MMPAGESUBPOOL
 {
     /** Pointer to next sub pool. */
-    struct MMPAGESUBPOOL   *pNext;
+    R3R0PTRTYPE(struct MMPAGESUBPOOL *) pNext;
     /** Pointer to next sub pool in the free chain.
      * This is NULL if we're not in the free chain or at the end of it. */
-    struct MMPAGESUBPOOL   *pNextFree;
+    R3R0PTRTYPE(struct MMPAGESUBPOOL *) pNextFree;
     /** Pointer to array of lock ranges.
      * This is allocated together with the MMPAGESUBPOOL and thus needs no freeing.
@@ -365 +365 @@
      * The reserved field is a pointer to this structure.
      */
-    PSUPPAGE                paPhysPages;
+    R3R0PTRTYPE(PSUPPAGE)   paPhysPages;
     /** Pointer to the first page. */
-    void                   *pvPages;
+    R3R0PTRTYPE(void *)     pvPages;
     /** Size of the subpool. */
     unsigned                cPages;
@@ -387 +387 @@
 {
     /** List of subpools. */
-    PMMPAGESUBPOOL          pHead;
+    R3R0PTRTYPE(PMMPAGESUBPOOL) pHead;
     /** Head of subpools with free pages. */
-    PMMPAGESUBPOOL          pHeadFree;
+    R3R0PTRTYPE(PMMPAGESUBPOOL) pHeadFree;
     /** AVLPV tree for looking up HC virtual addresses.
      * The tree contains MMLOOKUPVIRTPP records.
      */
-    PAVLPVNODECORE          pLookupVirt;
+    R3R0PTRTYPE(PAVLPVNODECORE) pLookupVirt;
     /** Tree for looking up HC physical addresses.
      * The tree contains MMLOOKUPPHYSHC records.
      */
-    AVLHCPHYSTREE           pLookupPhys;
+    R3R0PTRTYPE(AVLHCPHYSTREE)  pLookupPhys;
     /** Pointer to the VM this pool belongs. */
-    PVM                     pVM;
+    R3R0PTRTYPE(PVM)        pVM;
     /** Flag indicating the allocation method.
      * Set: SUPLowAlloc().
@@ -601 +601 @@
             R3PTRTYPE(void *)       pvR3;
             /** Host context ring-0 pointer. */
+            /** @todo #1865: Check if this actually works (doubt it) */
             RTR0PTR                 pvR0;
             /** Pointer to the locked mem record. */
@@ -611 +612 @@
             /** Host context pointer. */
             R3PTRTYPE(void *)       pvR3;
+            /** @todo #1865: Add a pvR0 here! */
             /** HC physical address corresponding to pvR3. */
             RTHCPHYS                HCPhys;

trunk/src/VBox/VMM/PGMMap.cpp

@@ -1122 +1122 @@
  * @param   GCPtrSrc    The source address (GC virtual address).
  * @param   cb          Number of bytes to read.
+ *
+ * @remarks The is indirectly for DBGF only.
+ * @todo    Consider renaming it to indicate it's special usage, or just
+ *          reimplement it in MMR3HyperReadGCVirt.
  */
 PGMR3DECL(int) PGMR3MapRead(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)

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

@@ -154 +154 @@
 
 /**
- * Allocates memory in the Hypervisor (GC VMM) area.
+ * Allocates memory in the Hypervisor (RC VMM) area.
  * The returned memory is of course zeroed.
  *

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

@@ -95 +95 @@
 MMDECL(void *) mmPagePoolPhys2Ptr(PMMPAGEPOOL pPool, RTHCPHYS HCPhys)
 {
-#if 0 /** @todo have to fix the debugger, but until then this is going on my nevers. */
+#if 0 /** @todo have to fix the debugger, but until then this is going on my nerves. */
 #ifdef IN_RING3
     VM_ASSERT_EMT(pPool->pVM);
@@ -221 +221 @@
     return VINF_SUCCESS;
 }
+