Changeset 34163 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 18, 2010 12:16:43 PM (14 years ago)

Author:

vboxsync

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

67884

Message:

PGMR3PhysRomRegister/PDMDevHlpROMRegister: Added cbBinary argument to allow specifying a binary smaller than the range (no alignment restrictions either). Untested.

Location:

trunk/src/VBox/VMM

Files:

• PDMDevHlp.cpp (modified) (1 diff)
• PGMInternal.h (modified) (1 diff)
• PGMPhys.cpp (modified) (7 diffs)
• testcase/tstVMStructRC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -506 +506 @@
 
 /** @interface_method_impl{PDMDEVHLPR3,pfnROMRegister} */
-static DECLCALLBACK(int) pdmR3DevHlp_ROMRegister(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, const void *pvBinary, uint32_t fFlags, const char *pszDesc)
+static DECLCALLBACK(int) pdmR3DevHlp_ROMRegister(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange,
+                                                 const void *pvBinary, uint32_t cbBinary, uint32_t fFlags, const char *pszDesc)
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
     VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
-    LogFlow(("pdmR3DevHlp_ROMRegister: caller='%s'/%d: GCPhysStart=%RGp cbRange=%#x pvBinary=%p fFlags=%#RX32 pszDesc=%p:{%s}\n",
-             pDevIns->pReg->szName, pDevIns->iInstance, GCPhysStart, cbRange, pvBinary, fFlags, pszDesc, pszDesc));
+    LogFlow(("pdmR3DevHlp_ROMRegister: caller='%s'/%d: GCPhysStart=%RGp cbRange=%#x pvBinary=%p cbBinary=%#x fFlags=%#RX32 pszDesc=%p:{%s}\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, GCPhysStart, cbRange, pvBinary, cbBinary, fFlags, pszDesc, pszDesc));
 
 /** @todo can we mangle pszDesc? */
-    int rc = PGMR3PhysRomRegister(pDevIns->Internal.s.pVMR3, pDevIns, GCPhysStart, cbRange, pvBinary, fFlags, pszDesc);
+    int rc = PGMR3PhysRomRegister(pDevIns->Internal.s.pVMR3, pDevIns, GCPhysStart, cbRange, pvBinary, cbBinary, fFlags, pszDesc);
 
     LogFlow(("pdmR3DevHlp_ROMRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));

trunk/src/VBox/VMM/PGMInternal.h

@@ -1389 +1389 @@
     uint8_t                             au8Alignment[3];
     /** Alignment padding ensuring that aPages is sizeof(PGMROMPAGE) aligned. */
-    uint32_t                            au32Alignemnt[HC_ARCH_BITS == 32 ? 6 : 2];
+    uint32_t                            au32Alignemnt[HC_ARCH_BITS == 32 ? 5 : 1];
+    /** The size bits pvOriginal points to. */
+    uint32_t                            cbOriginal;
     /** Pointer to the original bits when PGMPHYS_ROM_FLAGS_PERMANENT_BINARY was specified.
      * This is used for strictness checks. */

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -2768 +2768 @@
  * @param   GCPhys              First physical address in the range.
  *                              Must be page aligned!
- * @param   cbRange             The size of the range (in bytes).
+ * @param   cb                  The size of the range (in bytes).
  *                              Must be page aligned!
  * @param   pvBinary            Pointer to the binary data backing the ROM image.
- *                              This must be exactly \a cbRange in size.
+ * @param   cbBinary            The size of the binary data pvBinary points to.
+ *                              This must be less or equal to @a cb.
  * @param   fFlags              Mask of flags. PGMPHYS_ROM_FLAGS_SHADOWED
  *                              and/or PGMPHYS_ROM_FLAGS_PERMANENT_BINARY.
@@ -2781 +2782 @@
  */
 VMMR3DECL(int) PGMR3PhysRomRegister(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhys, RTGCPHYS cb,
-                                    const void *pvBinary, uint32_t fFlags, const char *pszDesc)
-{
-    Log(("PGMR3PhysRomRegister: pDevIns=%p GCPhys=%RGp(-%RGp) cb=%RGp pvBinary=%p fFlags=%#x pszDesc=%s\n",
-         pDevIns, GCPhys, GCPhys + cb, cb, pvBinary, fFlags, pszDesc));
+                                    const void *pvBinary, uint32_t cbBinary, uint32_t fFlags, const char *pszDesc)
+{
+    Log(("PGMR3PhysRomRegister: pDevIns=%p GCPhys=%RGp(-%RGp) cb=%RGp pvBinary=%p cbBinary=%#x fFlags=%#x pszDesc=%s\n",
+         pDevIns, GCPhys, GCPhys + cb, cb, pvBinary, cbBinary, fFlags, pszDesc));
 
     /*
@@ -3016 +3017 @@
                  * This must be done after linking in the RAM range.
                  */
-                PPGMPAGE pRamPage = &pRamNew->aPages[(GCPhys - pRamNew->GCPhys) >> PAGE_SHIFT];
+                size_t          cbBinaryLeft = cbBinary;
+                PPGMPAGE        pRamPage     = &pRamNew->aPages[(GCPhys - pRamNew->GCPhys) >> PAGE_SHIFT];
                 for (uint32_t iPage = 0; iPage < cPages; iPage++, pRamPage++)
                 {
@@ -3026 +3028 @@
                         break;
                     }
-                    memcpy(pvDstPage, (const uint8_t *)pvBinary + (iPage << PAGE_SHIFT), PAGE_SIZE);
+                    if (cbBinary >= PAGE_SIZE)
+                    {
+                        memcpy(pvDstPage, (uint8_t const *)pvBinary + ((size_t)iPage << PAGE_SHIFT), PAGE_SIZE);
+                        cbBinaryLeft -= PAGE_SIZE;
+                    }
+                    else
+                    {
+                        ASMMemZeroPage(pvDstPage); /* (shouldn't be necessary, but can't hurt either) */
+                        if (cbBinaryLeft > 0)
+                        {
+                            memcpy(pvDstPage, (uint8_t const *)pvBinary + ((size_t)iPage << PAGE_SHIFT), cbBinaryLeft);
+                            cbBinaryLeft = 0;
+                        }
+                    }
                 }
                 if (RT_SUCCESS(rc))
@@ -3034 +3049 @@
                      * Note that the Virgin member of the pages has already been initialized above.
                      */
-                    pRomNew->GCPhys = GCPhys;
+                    pRomNew->GCPhys     = GCPhys;
                     pRomNew->GCPhysLast = GCPhysLast;
-                    pRomNew->cb = cb;
-                    pRomNew->fFlags = fFlags;
+                    pRomNew->cb         = cb;
+                    pRomNew->fFlags     = fFlags;
                     pRomNew->idSavedState = UINT8_MAX;
+                    pRomNew->cbOriginal = cbBinary;
 #ifdef VBOX_STRICT
                     pRomNew->pvOriginal = fFlags & PGMPHYS_ROM_FLAGS_PERMANENT_BINARY
-                                        ? pvBinary : RTMemDup(pvBinary, cPages * PAGE_SIZE);
+                                        ? pvBinary : RTMemDup(pvBinary, cbBinary);
 #else
                     pRomNew->pvOriginal = fFlags & PGMPHYS_ROM_FLAGS_PERMANENT_BINARY ? pvBinary : NULL;
 #endif
-                    pRomNew->pszDesc = pszDesc;
+                    pRomNew->pszDesc    = pszDesc;
 
                     for (unsigned iPage = 0; iPage < cPages; iPage++)
@@ -3291 +3307 @@
         if (pRom->pvOriginal)
         {
+            size_t         cbSrcLeft = pRom->cbOriginal;
             uint8_t const *pbSrcPage = (uint8_t const *)pRom->pvOriginal;
-            for (uint32_t iPage = 0; iPage < cPages; iPage++, pbSrcPage += PAGE_SIZE)
+            for (uint32_t iPage = 0; iPage < cPages && cbSrcLeft > 0; iPage++, pbSrcPage += PAGE_SIZE)
             {
                 const RTGCPHYS GCPhys = pRom->GCPhys + (iPage << PAGE_SHIFT);
@@ -3299 +3316 @@
                 if (RT_FAILURE(rc))
                     break;
-                if (memcmp(pvDstPage, pbSrcPage, PAGE_SIZE))
+
+                if (memcmp(pvDstPage, pbSrcPage, RT_MIN(cbSrcLeft, PAGE_SIZE)))
                     LogRel(("pgmR3PhysRomReset: %RGp rom page changed (%s) - loaded saved state?\n",
                             GCPhys, pRom->pszDesc));
+                cbSrcLeft -= RT_MIN(cbSrcLeft, PAGE_SIZE);
             }
         }

trunk/src/VBox/VMM/testcase/tstVMStructRC.cpp

@@ -694 +694 @@
     GEN_CHECK_OFF(PGMROMRANGE, cb);
     GEN_CHECK_OFF(PGMROMRANGE, fFlags);
+    GEN_CHECK_OFF(PGMROMRANGE, cbOriginal);
     GEN_CHECK_OFF(PGMROMRANGE, pvOriginal);
     GEN_CHECK_OFF(PGMROMRANGE, pszDesc);