Changeset 17538 in vbox for trunk/src/recompiler/VBoxRecompiler.c

Timestamp:

Mar 8, 2009 5:32:49 AM (16 years ago)

Author:

vboxsync

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

43972

Message:

REM,PGM: Added two mutualy exclusive flags to REMR3NotifyPhysRamRegister to indicate whether it's MMIO2 or RAM that's being registered. This is for the new code only, the old one sticks to the MM_RAM_FLAGS.

File:

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

trunk/src/recompiler/VBoxRecompiler.c

@@ -2783 +2783 @@
  * @param   GCPhys      The physical address the RAM.
  * @param   cb          Size of the memory.
- * @param   fFlags      Flags of the MM_RAM_FLAGS_* defines.
+ * @param   fFlags      Flags of the REM_NOTIFY_PHYS_RAM_FLAGS_* defines.
  */
 REMR3DECL(void) REMR3NotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, unsigned fFlags)
 {
-    Log(("REMR3NotifyPhysRamRegister: GCPhys=%RGp cb=%RGp fFlags=%d\n", GCPhys, cb, fFlags));
+    Log(("REMR3NotifyPhysRamRegister: GCPhys=%RGp cb=%RGp fFlags=%#x\n", GCPhys, cb, fFlags));
     VM_ASSERT_EMT(pVM);
 
@@ -2796 +2796 @@
     Assert(cb);
     Assert(RT_ALIGN_Z(cb, PAGE_SIZE) == cb);
-
-    /*
-     * Base ram?
-     */
-    if (!GCPhys) /** @todo add a flag for identifying MMIO2 memory here (new phys code)*/
+#ifdef VBOX_WITH_NEW_PHYS_CODE
+    AssertMsg(fFlags == REM_NOTIFY_PHYS_RAM_FLAGS_RAM || fFlags == REM_NOTIFY_PHYS_RAM_FLAGS_MMIO2, ("#x\n", fFlags));
+#endif
+
+    /*
+     * Base ram? Update GCPhysLastRam.
+     */
+#ifdef VBOX_WITH_NEW_PHYS_CODE
+    if (fFlags & REM_NOTIFY_PHYS_RAM_FLAGS_RAM)
+#else
+    if (!GCPhys)
+#endif
     {
         if (GCPhys + (cb - 1) > pVM->rem.s.GCPhysLastRam)