Changeset 857 in vbox

Timestamp:

Feb 13, 2007 10:30:35 AM (18 years ago)

Author:

vboxsync

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

18562

Message:

Corrected physical ram/rom registration in dynamic ram case.

File:

• trunk/src/recompiler/VBoxRecompiler.c (modified) (4 diffs)

trunk/src/recompiler/VBoxRecompiler.c

@@ -417 +417 @@
     pVM->rem.s.fIgnoreInvlPg = false;
     pVM->rem.s.fIgnoreCpuMode = false;
-
-#ifdef PGM_DYNAMIC_RAM_ALLOC
-    pVM->rem.s.cPhysRegistrations = 0;
-#endif
 }
 
@@ -2528 +2524 @@
     else
     {
+        uint32_t i;
+
         cpu_register_physical_memory(GCPhys, cb, GCPhys | (fFlags & MM_RAM_FLAGS_RESERVED ? IO_MEM_UNASSIGNED : 0));
 
         AssertRelease(pVM->rem.s.cPhysRegistrations < REM_MAX_PHYS_REGISTRATIONS);
-        pVM->rem.s.aPhysReg[pVM->rem.s.cPhysRegistrations].GCPhys = GCPhys;
-        pVM->rem.s.aPhysReg[pVM->rem.s.cPhysRegistrations].HCVirt = (RTHCUINTPTR)pvRam;
-        pVM->rem.s.aPhysReg[pVM->rem.s.cPhysRegistrations].cb     = cb;
-        pVM->rem.s.cPhysRegistrations++;
+        for (i=0;i<pVM->rem.s.cPhysRegistrations;i++)
+        {
+            if (pVM->rem.s.aPhysReg[i].GCPhys == GCPhys)
+            {
+                pVM->rem.s.aPhysReg[i].HCVirt = (RTHCUINTPTR)pvRam;
+                pVM->rem.s.aPhysReg[i].cb     = cb;
+                break;
+            }
+        }
+        if (i == pVM->rem.s.cPhysRegistrations)
+        {
+            pVM->rem.s.aPhysReg[i].GCPhys = GCPhys;
+            pVM->rem.s.aPhysReg[i].HCVirt = (RTHCUINTPTR)pvRam;
+            pVM->rem.s.aPhysReg[i].cb     = cb;
+            pVM->rem.s.cPhysRegistrations++;
+        }
     }
 #else
@@ -2721 +2731 @@
 REMR3DECL(void) REMR3NotifyPhysRomRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, void *pvCopy)
 {
+#ifdef PGM_DYNAMIC_RAM_ALLOC
+    uint32_t i;
+#endif
     Log(("REMR3NotifyPhysRomRegister: GCPhys=%VGp cb=%d pvCopy=%p\n", GCPhys, cb, pvCopy));
     VM_ASSERT_EMT(pVM);
@@ -2739 +2752 @@
     cpu_register_physical_memory(GCPhys, cb, GCPhys | IO_MEM_ROM);
     AssertRelease(pVM->rem.s.cPhysRegistrations < REM_MAX_PHYS_REGISTRATIONS);
-    pVM->rem.s.aPhysReg[pVM->rem.s.cPhysRegistrations].GCPhys = GCPhys;
-    pVM->rem.s.aPhysReg[pVM->rem.s.cPhysRegistrations].HCVirt = (RTHCUINTPTR)pvCopy;
-    pVM->rem.s.aPhysReg[pVM->rem.s.cPhysRegistrations].cb     = cb;
-    pVM->rem.s.cPhysRegistrations++;
+    for (i=0;i<pVM->rem.s.cPhysRegistrations;i++)
+    {
+        if (pVM->rem.s.aPhysReg[i].GCPhys == GCPhys)
+        {
+            pVM->rem.s.aPhysReg[i].HCVirt = (RTHCUINTPTR)pvRam;
+            pVM->rem.s.aPhysReg[i].cb     = cb;
+            break;
+        }
+    }
+    if (i == pVM->rem.s.cPhysRegistrations)
+    {
+        pVM->rem.s.aPhysReg[i].GCPhys = GCPhys;
+        pVM->rem.s.aPhysReg[i].HCVirt = (RTHCUINTPTR)pvRam;
+        pVM->rem.s.aPhysReg[i].cb     = cb;
+        pVM->rem.s.cPhysRegistrations++;
+    }
 #else
     AssertRelease(phys_ram_base);