Changeset 36490 in vbox

Timestamp:

Apr 1, 2011 12:16:47 PM (14 years ago)

Author:

vboxsync

Message:

rem: Use cpu_register_physical_memory_offset instead of cpu_register_physical_memory so we can specify region_offset to be the same the memory address. This avoids having to hack region_offset usage in exec.c.

Location:

trunk/src/recompiler

Files:

• VBoxRecompiler.c (modified) (10 diffs)
• exec.c (modified) (1 diff)

trunk/src/recompiler/VBoxRecompiler.c

@@ -3146 +3146 @@
 
     PDMCritSectEnter(&pVM->rem.s.CritSectRegister, VERR_SEM_BUSY);
-    cpu_register_physical_memory(GCPhys, cb, GCPhys);
+    cpu_register_physical_memory_offset(GCPhys, cb, GCPhys, GCPhys);
     PDMCritSectLeave(&pVM->rem.s.CritSectRegister);
 
@@ -3182 +3182 @@
 
     PDMCritSectEnter(&pVM->rem.s.CritSectRegister, VERR_SEM_BUSY);
-    cpu_register_physical_memory(GCPhys, cb, GCPhys | (fShadow ? 0 : IO_MEM_ROM));
+    cpu_register_physical_memory_offset(GCPhys, cb, GCPhys | (fShadow ? 0 : IO_MEM_ROM), GCPhys);
     PDMCritSectLeave(&pVM->rem.s.CritSectRegister);
 
@@ -3214 +3214 @@
 
     PDMCritSectEnter(&pVM->rem.s.CritSectRegister, VERR_SEM_BUSY);
-    cpu_register_physical_memory(GCPhys, cb, IO_MEM_UNASSIGNED);
+    cpu_register_physical_memory_offset(GCPhys, cb, IO_MEM_UNASSIGNED, GCPhys);
     PDMCritSectLeave(&pVM->rem.s.CritSectRegister);
 
@@ -3247 +3247 @@
     PDMCritSectEnter(&pVM->rem.s.CritSectRegister, VERR_SEM_BUSY);
     if (enmType == PGMPHYSHANDLERTYPE_MMIO)
-        cpu_register_physical_memory(GCPhys, cb, pVM->rem.s.iMMIOMemType);
+        cpu_register_physical_memory_offset(GCPhys, cb, pVM->rem.s.iMMIOMemType, GCPhys);
     else if (fHasHCHandler)
-        cpu_register_physical_memory(GCPhys, cb, pVM->rem.s.iHandlerMemType);
+        cpu_register_physical_memory_offset(GCPhys, cb, pVM->rem.s.iHandlerMemType, GCPhys);
     PDMCritSectLeave(&pVM->rem.s.CritSectRegister);
 
@@ -3296 +3296 @@
     /** @todo this isn't right, MMIO can (in theory) be restored as RAM. */
     if (enmType == PGMPHYSHANDLERTYPE_MMIO)
-        cpu_register_physical_memory(GCPhys, cb, IO_MEM_UNASSIGNED);
+        cpu_register_physical_memory_offset(GCPhys, cb, IO_MEM_UNASSIGNED, GCPhys);
     else if (fHasHCHandler)
     {
@@ -3302 +3302 @@
         {
             Assert(GCPhys > MMR3PhysGetRamSize(pVM));
-            cpu_register_physical_memory(GCPhys, cb, IO_MEM_UNASSIGNED);
+            cpu_register_physical_memory_offset(GCPhys, cb, IO_MEM_UNASSIGNED, GCPhys);
         }
         else
@@ -3308 +3308 @@
             Assert(RT_ALIGN_T(GCPhys, PAGE_SIZE, RTGCPHYS) == GCPhys);
             Assert(RT_ALIGN_T(cb, PAGE_SIZE, RTGCPHYS) == cb);
-            cpu_register_physical_memory(GCPhys, cb, GCPhys);
+            cpu_register_physical_memory_offset(GCPhys, cb, GCPhys, GCPhys);
         }
     }
@@ -3360 +3360 @@
         PDMCritSectEnter(&pVM->rem.s.CritSectRegister, VERR_SEM_BUSY);
         if (!fRestoreAsRAM)
-            cpu_register_physical_memory(GCPhysOld, cb, IO_MEM_UNASSIGNED);
+            cpu_register_physical_memory_offset(GCPhysOld, cb, IO_MEM_UNASSIGNED, GCPhysOld);
         else
         {
@@ -3366 +3366 @@
             Assert(cb == PAGE_SIZE);
             Assert(RT_ALIGN_T(GCPhysOld, PAGE_SIZE, RTGCPHYS) == GCPhysOld);
-            cpu_register_physical_memory(GCPhysOld, cb, GCPhysOld);
+            cpu_register_physical_memory_offset(GCPhysOld, cb, GCPhysOld, GCPhysOld);
         }
 
@@ -3374 +3374 @@
         Assert(RT_ALIGN_T(GCPhysNew, PAGE_SIZE, RTGCPHYS) == GCPhysNew);
         Assert(RT_ALIGN_T(cb, PAGE_SIZE, RTGCPHYS) == cb);
-        cpu_register_physical_memory(GCPhysNew, cb, pVM->rem.s.iHandlerMemType);
+        cpu_register_physical_memory_offset(GCPhysNew, cb, pVM->rem.s.iHandlerMemType, GCPhysNew);
         PDMCritSectLeave(&pVM->rem.s.CritSectRegister);
 

trunk/src/recompiler/exec.c

@@ -2331 +2331 @@
            IO_MEM_ROMD uses these as a ram address.  */
         iotlb = (pd & ~TARGET_PAGE_MASK);
-#ifndef VBOX
         if (p) {
-#else
-        if (   p
-            && p->phys_offset
-            && (pd & ~TARGET_PAGE_MASK) != env->pVM->rem.s.iMMIOMemType
-            && (pd & ~TARGET_PAGE_MASK) != env->pVM->rem.s.iHandlerMemType) {
-#endif
             iotlb += p->region_offset;
         } else {