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

Timestamp:

Jun 20, 2008 8:57:26 AM (16 years ago)

Author:

vboxsync

Message:

Fixed some inconsistencies (thanks Frank)

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IOMAllMMIO.cpp (modified) (1 diff)
• PGMAllPhys.cpp (modified) (2 diffs)

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

@@ -1195 +1195 @@
         STAM_COUNTER_INC(&pStats->CTXALLSUFF(Read));
 #endif
-    *pu32Value = 0;
+    /* Unassigned memory; this is actually not supposed to happen. */
+    switch (cbValue)
+    {
+        case 1: *(uint8_t *)pu32Value  = 0xff; break;
+        case 2: *(uint16_t *)pu32Value = 0xffff; break;
+        case 4: *(uint32_t *)pu32Value = 0xffffffff; break;
+        case 8: *(uint64_t *)pu32Value = 0xffffffffffffffff; break;
+        default: AssertReleaseMsgFailed(("cbValue=%d GCPhys=%VGp\n", cbValue, GCPhys)); break;
+    }
     Log4(("IOMMMIORead: GCPhys=%RGp *pu32=%08RX32 cb=%d rc=VINF_SUCCESS\n", GCPhys, *pu32Value, cbValue));
     return VINF_SUCCESS;

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

@@ -1315 +1315 @@
 #if 1                   /** @todo r=bird: Can you do this properly please. */
                             /** @todo Try MMIO; quick hack */
-                            if (cbRead <= 4 && IOMMMIORead(pVM, GCPhys, (uint32_t *)pvBuf, cbRead) == VINF_SUCCESS)
+                            if (cbRead <= 8 && IOMMMIORead(pVM, GCPhys, (uint32_t *)pvBuf, cbRead) == VINF_SUCCESS)
                                 goto end;
 #endif
@@ -1656 +1656 @@
 #if 1                   /** @todo r=bird: Can you do this properly please. */
                             /** @todo Try MMIO; quick hack */
-                            if (cbWrite <= 4 && IOMMMIOWrite(pVM, GCPhys, *(uint32_t *)pvBuf, cbWrite) == VINF_SUCCESS)
+                            if (cbWrite <= 8 && IOMMMIOWrite(pVM, GCPhys, *(uint32_t *)pvBuf, cbWrite) == VINF_SUCCESS)
                                 goto end;
 #endif