Changeset 12794 in vbox for trunk/src

Timestamp:

Sep 29, 2008 12:51:37 PM (17 years ago)

Author:

vboxsync

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

37139

Message:

#1865: Added a pVMRC member to VM so I can gradually convert away from pVMGC.

File:

• trunk/src/VBox/VMM/MMHyper.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/MMHyper.cpp

@@ -104 +104 @@
         if (VBOX_SUCCESS(rc))
         {
-            pVM->pVMGC = (RTGCPTR32)GCPtr;
+            pVM->pVMRC = (RTGCPTR32)GCPtr;
+            pVM->pVMGC = pVM->pVMRC;
             for (uint32_t i = 0; i < pVM->cCPUs; i++)
-                pVM->aCpus[i].pVMRC = pVM->pVMGC;
+                pVM->aCpus[i].pVMRC = pVM->pVMRC;
 
             /* Reserve a page for fencing. */
@@ -281 +282 @@
              */
             RTGCINTPTR      offDelta = GCPtrNew - GCPtrOld;
-            pVM->pVMGC                          += offDelta;
+            pVM->pVMRC                          += offDelta;
+            pVM->pVMGC                          = pVM->pVMRC;
             for (uint32_t i = 0; i < pVM->cCPUs; i++)
-                pVM->aCpus[i].pVMRC = pVM->pVMGC;
+                pVM->aCpus[i].pVMRC             = pVM->pVMRC;
 
             pVM->mm.s.pvHyperAreaGC             += offDelta;
             pVM->mm.s.pHyperHeapGC              += offDelta;
             pVM->mm.s.pHyperHeapHC->pbHeapRC    += offDelta;
-            pVM->mm.s.pHyperHeapHC->pVMRC        = pVM->pVMGC;
+            pVM->mm.s.pHyperHeapHC->pVMRC        = pVM->pVMRC;
 
             /*
@@ -787 +789 @@
         pHeap->pVMR3                = pVM;
         pHeap->pVMR0                = pVM->pVMR0;
-        pHeap->pVMRC                = pVM->pVMGC;
+        pHeap->pVMRC                = pVM->pVMRC;
         pHeap->cbHeap               = cbAligned - MMYPERHEAP_HDR_SIZE;
         pHeap->cbFree               = pHeap->cbHeap - sizeof(MMHYPERCHUNK);
@@ -824 +826 @@
     if (VBOX_SUCCESS(rc))
     {
-        pHeap->pVMRC    = pVM->pVMGC;
+        pHeap->pVMRC    = pVM->pVMRC;
         pHeap->pbHeapRC = *ppHeapGC + MMYPERHEAP_HDR_SIZE;
         /* Reserve a page for fencing. */