Changeset 4615 in vbox for trunk/src/VBox

Timestamp:

Sep 7, 2007 7:25:16 PM (17 years ago)

Author:

vboxsync

Message:

REM(R3)NotifyHandlerPhysicalModify no longer needs a pvHC pointer, made it a flag instead.

Location:

trunk/src/VBox/VMM

Files:

• REMInternal.h (modified) (2 diffs)
• VMMAll/PGMAllHandler.cpp (modified) (3 diffs)
• VMMAll/REMAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/REMInternal.h

@@ -92 +92 @@
         struct
         {
-            RTHCPTR             pvHCPtr;
             RTGCPHYS            GCPhysOld;
             RTGCPHYS            GCPhysNew;
@@ -98 +97 @@
             PGMPHYSHANDLERTYPE  enmType;
             bool                fHasHCHandler;
+            bool                fRestoreAsRAM;
         } PhysicalModify;
         uint64_t                padding[3 + (HC_ARCH_BITS == 64)];

trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp

@@ -495 +495 @@
          */
         pgmHandlerPhysicalResetRamFlags(pVM, pCur);
-        RTHCPTR pvRange = 0;
-        if (pCur->pfnHandlerR3 && pCur->enmType != PGMPHYSHANDLERTYPE_MMIO)
-            PGMRamGCPhys2HCPtr(&pVM->pgm.s, GCPhysCurrent, &pvRange); /* ASSUMES it doesn't change pvRange on failure. */
+        const bool fRestoreAsRAM = pCur->pfnHandlerR3
+                                && pCur->enmType != PGMPHYSHANDLERTYPE_MMIO; /** @todo this isn't entirely correct. */
 
         /*
@@ -534 +533 @@
 #ifndef IN_RING3
                     REMNotifyHandlerPhysicalModify(pVM, pCur->enmType, GCPhysCurrent, GCPhys,
-                                                   pCur->Core.KeyLast - GCPhys + 1, !!pCur->pfnHandlerR3, pvRange);
+                                                   pCur->Core.KeyLast - GCPhys + 1, !!pCur->pfnHandlerR3, fRestoreAsRAM);
 #else
                     REMR3NotifyHandlerPhysicalModify(pVM, pCur->enmType, GCPhysCurrent, GCPhys,
-                                                     pCur->Core.KeyLast - GCPhys + 1, !!pCur->pfnHandlerR3, pvRange);
+                                                     pCur->Core.KeyLast - GCPhys + 1, !!pCur->pfnHandlerR3, fRestoreAsRAM);
 #endif
                     pgmUnlock(pVM);
@@ -544 +543 @@
                     return VINF_SUCCESS;
                 }
+
                 AssertMsgFailed(("Conflict! GCPhys=%VGp GCPhysLast=%VGp\n", GCPhys, GCPhysLast));
                 rc = VERR_PGM_HANDLER_PHYSICAL_CONFLICT;

trunk/src/VBox/VMM/VMMAll/REMAll.cpp

@@ -129 +129 @@
  * @param   cb              Size of the handler range.
  * @param   fHasHCHandler   Set if the handler have a HC callback function.
- * @param   pvHCPtr         The HC virtual address corresponding to GCPhys if available.
+ * @param   fRestoreAsRAM   Whether the to restore it as normal RAM or as unassigned memory.
  */
-REMDECL(void) REMNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, RTHCPTR pvHCPtr)
+REMDECL(void) REMNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM)
 {
     if (pVM->rem.s.cHandlerNotifications >= ELEMENTS(pVM->rem.s.aHandlerNotifications))
@@ -142 +142 @@
     pRec->u.PhysicalModify.cb = cb;
     pRec->u.PhysicalModify.fHasHCHandler = fHasHCHandler;
-    pRec->u.PhysicalModify.pvHCPtr = pvHCPtr;
+    pRec->u.PhysicalModify.fRestoreAsRAM = fRestoreAsRAM;
 }