Changeset 31206 in vbox

Timestamp:

Jul 29, 2010 1:05:31 PM (14 years ago)

Author:

vboxsync

Message:

PGM: Always make sure to have the original bits around for verification in strict builds.

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• PGMInternal.h (modified) (1 diff)
• PGMPhys.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -2444 +2444 @@
     pgmLock(pVM);
     pgmR3PhysRamTerm(pVM);
+    pgmR3PhysRomTerm(pVM);
     pgmUnlock(pVM);
 

trunk/src/VBox/VMM/PGMInternal.h

@@ -3583 +3583 @@
 int             pgmR3PhysChunkMap(PVM pVM, uint32_t idChunk, PPPGMCHUNKR3MAP ppChunk);
 int             pgmR3PhysRamTerm(PVM pVM);
+void            pgmR3PhysRomTerm(PVM pVM);
 
 int             pgmR3PoolInit(PVM pVM);

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -879 +879 @@
 
     /* Flush the recompiler's TLB as well. */
-    for (unsigned i = 0; i < pVM->cCpus; i++)
+    for (VMCPUID i = 0; i < pVM->cCpus; i++)
         CPUMSetChangedFlags(&pVM->aCpus[i], CPUM_CHANGED_GLOBAL_TLB_FLUSH);
 
@@ -2808 +2808 @@
                     pRomNew->fFlags = fFlags;
                     pRomNew->idSavedState = UINT8_MAX;
+#ifdef VBOX_STRICT
+                    pRomNew->pvOriginal = fFlags & PGMPHYS_ROM_FLAGS_PERMANENT_BINARY
+                                        ? pvBinary : RTMemDup(pvBinary, cPages * PAGE_SIZE);
+#else
                     pRomNew->pvOriginal = fFlags & PGMPHYS_ROM_FLAGS_PERMANENT_BINARY ? pvBinary : NULL;
+#endif
                     pRomNew->pszDesc = pszDesc;
 
@@ -2889 +2894 @@
  * @param   pvUser          User argument.
  */
-static DECLCALLBACK(int) pgmR3PhysRomWriteHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser)
+static DECLCALLBACK(int) pgmR3PhysRomWriteHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf,
+                                                  PGMACCESSTYPE enmAccessType, void *pvUser)
 {
     PPGMROMRANGE    pRom     = (PPGMROMRANGE)pvUser;
@@ -2929 +2935 @@
 
             /*
-             * Write to the ram page.
+             * Write to the RAM page.
              */
             case PGMROMPROT_READ_ROM_WRITE_RAM:
@@ -3073 +3079 @@
 
 /**
+ * Called by PGMR3Term to free resources.
+ *
+ * ASSUMES that the caller owns the PGM lock.
+ *
+ * @param   pVM         The VM handle.
+ */
+void pgmR3PhysRomTerm(PVM pVM)
+{
+#ifdef RT_STRICT
+    /*
+     * Free the heap copy of the original bits.
+     */
+    for (PPGMROMRANGE pRom = pVM->pgm.s.pRomRangesR3; pRom; pRom = pRom->pNextR3)
+    {
+        if (   pRom->pvOriginal
+            && !(pRom->fFlags & PGMPHYS_ROM_FLAGS_PERMANENT_BINARY))
+        {
+            RTMemFree((void *)pRom->pvOriginal);
+            pRom->pvOriginal = NULL;
+        }
+    }
+#endif
+}
+
+
+/**
  * Change the shadowing of a range of ROM pages.
  *