儲存庫 vbox 的更動 15036

時間撮記:

2008-12-5 下午12:42:51 (16 年 以前)

作者:

vboxsync

訊息:

iomMMIODoRead: Handle the _FF and _00 status codes, changed default from 00 to FF when the handler doesn't exist.

檔案:

• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (修改) (1 筆差異)

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

@@ -109 +109 @@
         rc = pRange->CTX_SUFF(pfnReadCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), GCPhysFault, pvData, cb);
     else
-    {
-/** @todo r=bird: this is (probably) wrong, all bits should be set here I
- *        think. */
-        switch (cb)
+        rc = VINF_IOM_MMIO_UNUSED_FF;
+    if (rc != VINF_SUCCESS)
+    {
+        switch (rc)
         {
-            case 1: *(uint8_t  *)pvData = 0; break;
-            case 2: *(uint16_t *)pvData = 0; break;
-            case 4: *(uint32_t *)pvData = 0; break;
-            case 8: *(uint64_t *)pvData = 0; break;
-            default:
-                memset(pvData, 0, cb);
+            case VINF_IOM_MMIO_UNUSED_FF:
+                switch (cbValue)
+                {
+                    case 1: *(uint8_t *)pu32Value  = UINT8_C(0xff); break;
+                    case 2: *(uint16_t *)pu32Value = UINT16_C(0xffff); break;
+                    case 4: *(uint32_t *)pu32Value = UINT32_C(0xffffffff); break;
+                    case 8: *(uint64_t *)pu32Value = UINT64_C(0xffffffffffffffff); break;
+                    default: AssertReleaseMsgFailed(("cbValue=%d GCPhys=%RGp\n", cbValue, GCPhys)); break;
+                }
+                rc = VINF_SUCCESS;
+                break;
+
+            case VINF_IOM_MMIO_UNUSED_00:
+                switch (cbValue)
+                {
+                    case 1: *(uint8_t *)pu32Value  = UINT8_C(0x00); break;
+                    case 2: *(uint16_t *)pu32Value = UINT16_C(0x0000); break;
+                    case 4: *(uint32_t *)pu32Value = UINT32_C(0x00000000); break;
+                    case 8: *(uint64_t *)pu32Value = UINT64_C(0x0000000000000000); break;
+                    default: AssertReleaseMsgFailed(("cbValue=%d GCPhys=%RGp\n", cbValue, GCPhys)); break;
+                }
+                rc = VINF_SUCCESS;
                 break;
         }
-        rc = VINF_SUCCESS;
-    }
-    if (rc != VINF_IOM_HC_MMIO_READ)
-        STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Read));
+        if (rc != VINF_IOM_HC_MMIO_READ)
+            STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Read));
+    }
     return rc;
 }