Changeset 12814 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 29, 2008 6:14:37 PM (16 years ago)

Author:

vboxsync

Message:

#1865: more MM changes.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• MMAll.cpp (modified) (8 diffs)
• MMAllHyper.cpp (modified) (6 diffs)
• MMAllPhys.cpp (modified) (1 diff)

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

@@ -45 +45 @@
 {
     /** @todo cache last lookup this stuff ain't cheap! */
-    PMMLOOKUPHYPER  pLookup = (PMMLOOKUPHYPER)((char*)CTXSUFF(pVM->mm.s.pHyperHeap) + pVM->mm.s.offLookupHyper);
+    PMMLOOKUPHYPER  pLookup = (PMMLOOKUPHYPER)((uint8_t *)pVM->mm.s.CTX_SUFF(pHyperHeap) + pVM->mm.s.offLookupHyper);
     for (;;)
     {
@@ -52 +52 @@
             case MMLOOKUPHYPERTYPE_LOCKED:
             {
-                const uint32_t off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pLookup->u.Locked.pvHC;
+                const uint32_t off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pLookup->u.Locked.pvR3;
                 if (off < pLookup->cb)
                 {
@@ -63 +63 @@
             case MMLOOKUPHYPERTYPE_HCPHYS:
             {
-                const uint32_t off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pLookup->u.HCPhys.pvHC;
+                const uint32_t off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pLookup->u.HCPhys.pvR3;
                 if (off < pLookup->cb)
                 {
@@ -85 +85 @@
         if (pLookup->offNext ==  (int32_t)NIL_OFFSET)
             break;
-        pLookup = (PMMLOOKUPHYPER)((char *)pLookup + pLookup->offNext);
+        pLookup = (PMMLOOKUPHYPER)((uint8_t *)pLookup + pLookup->offNext);
     }
 
@@ -132 +132 @@
     /** @todo cache last lookup this stuff ain't cheap! */
     unsigned        offRC = (RTRCUINTPTR)RCPtr - (RTGCUINTPTR)pVM->mm.s.pvHyperAreaGC;
-    PMMLOOKUPHYPER  pLookup = (PMMLOOKUPHYPER)((char*)CTXSUFF(pVM->mm.s.pHyperHeap) + pVM->mm.s.offLookupHyper);
+    PMMLOOKUPHYPER  pLookup = (PMMLOOKUPHYPER)((uint8_t *)pVM->mm.s.CTX_SUFF(pHyperHeap) + pVM->mm.s.offLookupHyper);
     for (;;)
     {
@@ -154 +154 @@
         if (pLookup->offNext == (int32_t)NIL_OFFSET)
             break;
-        pLookup = (PMMLOOKUPHYPER)((char *)pLookup + pLookup->offNext);
+        pLookup = (PMMLOOKUPHYPER)((uint8_t *)pLookup + pLookup->offNext);
     }
 
@@ -195 +195 @@
     {
         case MMLOOKUPHYPERTYPE_LOCKED:
-            return (RTR3PTR)((RTR3UINTPTR)pLookup->u.Locked.pvHC + off);
+            return (RTR3PTR)((RTR3UINTPTR)pLookup->u.Locked.pvR3 + off);
         case MMLOOKUPHYPERTYPE_HCPHYS:
-            return (RTR3PTR)((RTR3UINTPTR)pLookup->u.HCPhys.pvHC + off);
+            return (RTR3PTR)((RTR3UINTPTR)pLookup->u.HCPhys.pvR3 + off);
         default:
             AssertMsgFailed(("enmType=%d\n", pLookup->enmType));
@@ -219 +219 @@
             if (pLookup->u.Locked.pvR0)
                 return (RTR0PTR)((RTR0UINTPTR)pLookup->u.Locked.pvR0 + off);
-            return (RTR0PTR)((RTR3UINTPTR)pLookup->u.Locked.pvHC + off);
+            /** @todo #1865: accessing ring-3 memory (LOCKED)! */
+            return (RTR0PTR)((RTR3UINTPTR)pLookup->u.Locked.pvR3 + off);
         case MMLOOKUPHYPERTYPE_HCPHYS:
-            return (RTR0PTR)((RTR3UINTPTR)pLookup->u.HCPhys.pvHC + off);
+            /** @todo #1865: accessing ring-3 memory (HCPHYS)! */
+            return (RTR0PTR)((RTR3UINTPTR)pLookup->u.HCPhys.pvR3 + off);
         default:
             AssertMsgFailed(("enmType=%d\n", pLookup->enmType));

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

@@ -213 +213 @@
      * Get heap and statisticsStatistics.
      */
-    PMMHYPERHEAP pHeap = CTXSUFF(pVM->mm.s.pHyperHeap);
+    PMMHYPERHEAP pHeap = pVM->mm.s.CTX_SUFF(pHyperHeap);
 #ifdef VBOX_WITH_STATISTICS
     PMMHYPERSTAT pStat = mmHyperStat(pHeap, enmTag);
@@ -758 +758 @@
                     ("%p: u32Magic=%#x\n", pv, pHeap->u32Magic),
                     VERR_INVALID_POINTER);
-Assert(pHeap == CTXSUFF(pVM->mm.s.pHyperHeap));
+Assert(pHeap == pVM->mm.s.CTX_SUFF(pHyperHeap));
 
     /* Some more verifications using additional info from pHeap. */
@@ -1117 +1117 @@
 {
 #ifdef MMHYPER_HEAP_STRICT
-    mmHyperHeapCheck(CTXSUFF(pVM->mm.s.pHyperHeap));
+    mmHyperHeapCheck(pVM->mm.s.CTX_SUFF(pHyperHeap));
 #endif
 }
@@ -1130 +1130 @@
 {
     Log(("MMHyperHeapDump: *** heap dump - start ***\n"));
-    PMMHYPERHEAP pHeap = CTXSUFF(pVM->mm.s.pHyperHeap);
+    PMMHYPERHEAP pHeap = pVM->mm.s.CTX_SUFF(pHyperHeap);
     PMMHYPERCHUNKFREE pCur = (PMMHYPERCHUNKFREE)pHeap->CTX_SUFF(pbHeap);
     for (;;)
@@ -1153 +1153 @@
 MMDECL(size_t) MMHyperHeapGetFreeSize(PVM pVM)
 {
-    return CTXSUFF(pVM->mm.s.pHyperHeap)->cbFree;
+    return pVM->mm.s.CTX_SUFF(pHyperHeap)->cbFree;
 }
 
@@ -1163 +1163 @@
 MMDECL(size_t) MMHyperHeapGetSize(PVM pVM)
 {
-    return CTXSUFF(pVM->mm.s.pHyperHeap)->cbHeap;
+    return pVM->mm.s.CTX_SUFF(pHyperHeap)->cbHeap;
 }
 

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

@@ -2 +2 @@
 /** @file
  * MM - Memory Monitor(/Manager) - Physical Memory.
+ *
+ * @remarks This will will be eliminated ASAP, all physical memory management
+ *          is done by PGM now.
  */