Changeset 51528 in vbox for trunk/src/VBox

Timestamp:

Jun 4, 2014 11:41:38 AM (11 years ago)

Author:

vboxsync

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

94162

Message:

HDA: Do not crash when logging split register access.

File:

• trunk/src/VBox/Devices/Audio/DevIchHda.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/DevIchHda.cpp

@@ -2431 +2431 @@
     uint32_t    offReg = GCPhysAddr - pThis->MMIOBaseAddr;
     int         idxRegDsc = hdaRegLookup(pThis, offReg);
-    uint32_t    idxRegMem = g_aHdaRegMap[idxRegDsc].mem_idx;
+    uint32_t    idxRegMem = idxRegDsc != -1 ? g_aHdaRegMap[idxRegDsc].mem_idx : UINT32_MAX;
     uint64_t    u64Value;
     if (cb == 4)        u64Value = *(uint32_t const *)pv;
@@ -2465 +2465 @@
      */
     if (idxRegDsc != -1 && g_aHdaRegMap[idxRegDsc].size == cb)
+    {
         rc = hdaWriteReg(pThis, idxRegDsc, u64Value, "");
+        Log(("hdaMMIOWrite: @%#05x %#x -> %#x\n", offRegLog, u32LogOldValue,
+             idxRegLog != -1 ? pThis->au32Regs[idxRegLog] : UINT32_MAX));
+    }
     /*
      * Partial or multiple register access, loop thru the requested memory.
@@ -2501 +2505 @@
                          g_afMasks[cbReg] & ~g_afMasks[cb], u64Value & g_afMasks[cb], u64Value));
                 }
+                uint32_t u32LogOldVal = pThis->au32Regs[idxRegMem];
                 rc = hdaWriteReg(pThis, idxRegDsc, u64Value, "*");
+                Log(("hdaMMIOWrite: @%#05x %#x -> %#x\n", offRegLog, u32LogOldVal,
+                     pThis->au32Regs[idxRegMem]));
             }
             else
@@ -2580 +2587 @@
     else
         rc = VINF_SUCCESS;
-#endif
+
     Log(("hdaMMIOWrite: @%#05x %#x -> %#x\n", offRegLog, u32LogOldValue,
          idxRegLog != -1 ? pThis->au32Regs[idxRegLog] : UINT32_MAX));
+#endif
     return rc;
 }