Changeset 7613 in vbox for trunk/src

Timestamp:

Mar 28, 2008 8:25:54 AM (17 years ago)

Author:

vboxsync

Message:

better fix for r29105 (see #2680): Make PGM3PhysGrowRange() take PCRTGCPHYS not RTGCPHYS to be able to call it with VMR3ReqCall()

Location:

trunk/src

Files:

• VBox/VMM/MM.cpp (modified) (1 diff)
• VBox/VMM/PGMPhys.cpp (modified) (2 diffs)
• VBox/VMM/VMM.cpp (modified) (1 diff)
• recompiler/VBoxREMWrapper.cpp (modified) (1 diff)
• recompiler/VBoxRecompiler.c (modified) (1 diff)

trunk/src/VBox/VMM/MM.cpp

@@ -331 +331 @@
          * If requested, allocated the rest too.
          */
-        rc = PGM3PhysGrowRange(pVM, (RTGCPHYS)0);
+        RTGCPHYS GCPhys = (RTGCPHYS)0;
+        rc = PGM3PhysGrowRange(pVM, &GCPhys);
         if (RT_SUCCESS(rc) && fPreAlloc)
-            for (RTGCPHYS GCPhys = PGM_DYNAMIC_CHUNK_SIZE;
+            for (GCPhys = PGM_DYNAMIC_CHUNK_SIZE;
                  GCPhys < cbRam && RT_SUCCESS(rc);
                  GCPhys += PGM_DYNAMIC_CHUNK_SIZE)
-                rc = PGM3PhysGrowRange(pVM, GCPhys);
+                rc = PGM3PhysGrowRange(pVM, &GCPhys);
     }
 #endif

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -1164 +1164 @@
  * @param   GCPhys          GC physical address of the RAM range. (page aligned)
  */
-PGMR3DECL(int) PGM3PhysGrowRange(PVM pVM, RTGCPHYS GCPhys)
-{
+PGMR3DECL(int) PGM3PhysGrowRange(PVM pVM, PCRTGCPHYS pGCPhys)
+{
+    RTGCPHYS GCPhys = *pGCPhys;
+
     /*
      * Walk range list.
@@ -1215 +1217 @@
     {
         PVMREQ pReq;
+        const RTGCPHYS GCPhysParam = GCPhys;
 
         AssertMsg(!PDMCritSectIsOwner(&pVM->pgm.s.CritSect), ("We own the PGM lock -> deadlock danger!!\n"));
 
-        rc = VMR3ReqCall(pVM, &pReq, RT_INDEFINITE_WAIT, (PFNRT)PGM3PhysGrowRange, 1 + sizeof(RTGCPHYS)/sizeof(uintptr_t), pVM, GCPhys);
+        rc = VMR3ReqCall(pVM, &pReq, RT_INDEFINITE_WAIT, (PFNRT)PGM3PhysGrowRange, 2, pVM, &GCPhysParam);
         if (VBOX_SUCCESS(rc))
         {

trunk/src/VBox/VMM/VMM.cpp

@@ -2213 +2213 @@
         case VMMCALLHOST_PGM_RAM_GROW_RANGE:
         {
-            pVM->vmm.s.rcCallHost = PGM3PhysGrowRange(pVM, pVM->vmm.s.u64CallHostArg);
+            pVM->vmm.s.rcCallHost = PGM3PhysGrowRange(pVM, &pVM->vmm.s.u64CallHostArg);
             break;
         }

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -664 +664 @@
 {
     { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
-    { REMPARMDESC_FLAGS_GCPHYS,     sizeof(RTGCPHYS), NULL }
+    { REMPARMDESC_FLAGS_GCPHYS,     sizeof(PCRTGCPHYS), NULL }
 };
 static const REMPARMDESC g_aArgsPGMPhysIsGCPhysValid[] =

trunk/src/recompiler/VBoxRecompiler.c

@@ -2558 +2558 @@
 
     Log(("remR3GrowDynRange %VGp\n", physaddr));
-    rc = PGM3PhysGrowRange(pVM, (RTGCPHYS)physaddr);
+    RTGCPHYS GCPhys = physaddr;
+    rc = PGM3PhysGrowRange(pVM, &GCPhys);
     if (VBOX_SUCCESS(rc))
         return;