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

Timestamp:

Feb 6, 2013 1:56:21 PM (12 years ago)

Author:

vboxsync

Message:

IOM: Adding IOMMMIO_FLAGS_WRITE_ONLY_DWORD, fixing parameter validation.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IOMAllMMIO.cpp (modified) (2 diffs)
• VMMR3/IOM.cpp (modified) (1 diff)

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

@@ -118 +118 @@
 #endif
 
+    /*
+     * Check if we should ignore the write.
+     */
+    if (pRange->fFlags & IOMMMIO_FLAGS_WRITE_ONLY_DWORD)
+    {
+        Assert(cbValue != 4 || (GCPhys & 3));
+        return VINF_SUCCESS;
+    }
 
     /*
@@ -151 +159 @@
                 case VINF_IOM_R3_MMIO_WRITE:
                     /** @todo What if we've split a transfer and already read
-                     * something?  Since reads can have sideeffects we could be
-                     * kind of screwed here... */
+                     * something?  Since writes generally have sideeffects we
+                     * could be kind of screwed here... */
                     LogFlow(("iomMMIODoComplicatedWrite: GCPhys=%RGp GCPhysStart=%RGp cbValue=%u rc=%Rrc [read]\n", GCPhys, GCPhysStart, cbValue, rc2));
                     return rc2;

trunk/src/VBox/VMM/VMMR3/IOM.cpp

@@ -1418 +1418 @@
                     VERR_IOM_INVALID_MMIO_RANGE);
     AssertMsgReturn(   !(fFlags & ~IOMMMIO_FLAGS_VALID_MASK)
-                    || (fFlags & IOMMMIO_FLAGS_READ_MODE) == IOMMMIO_FLAGS_READ_MODE
-                    || (fFlags & IOMMMIO_FLAGS_WRITE_MODE) > IOMMMIO_FLAGS_WRITE_DWORD_QWORD_READ_MISSING,
+                    && (fFlags & IOMMMIO_FLAGS_READ_MODE)  <= IOMMMIO_FLAGS_READ_DWORD_QWORD
+                    && (fFlags & IOMMMIO_FLAGS_WRITE_MODE) <= IOMMMIO_FLAGS_WRITE_ONLY_DWORD,
                     ("%#x\n", fFlags),
                     VERR_INVALID_PARAMETER);