Changeset 31278 in vbox for trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp

Timestamp:

Aug 2, 2010 9:51:35 AM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: unaligned write access and aliases.

File:

• trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp (modified) (3 diffs)

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

@@ -612 +612 @@
             return index;
         }
+    }
+    /* Aliases HDA spec 3.3.45 */
+    switch(u32Offset)
+    {
+        case 0x2084:
+            return HDA_REG_IND_NAME(SD0LPIB);
+        case 0x20A4:
+            return HDA_REG_IND_NAME(SD1LPIB);
+        case 0x20C4:
+            return HDA_REG_IND_NAME(SD2LPIB);
+        case 0x20E4:
+            return HDA_REG_IND_NAME(SD3LPIB);
+        case 0x2104:
+            return HDA_REG_IND_NAME(SD4LPIB);
+        case 0x2124:
+            return HDA_REG_IND_NAME(SD5LPIB);
+        case 0x2144:
+            return HDA_REG_IND_NAME(SD6LPIB);
+        case 0x2164:
+            return HDA_REG_IND_NAME(SD7LPIB);
     }
     return -1;
@@ -1328 +1348 @@
     }
     Assert(   index != -1
-           && u32Offset == s_ichIntelHDRegMap[index].offset
            && cb <= 4);
     if (index != -1)
     {
-        Assert(u32Offset == s_ichIntelHDRegMap[index].offset);
         uint32_t v = pThis->hda.au32Regs[index];
         uint32_t mask = 0;
+        uint32_t shift = (u32Offset - s_ichIntelHDRegMap[index].offset) % sizeof(uint32_t) * 8;
         switch(cb)
         {
@@ -1342 +1361 @@
             case 4: mask = 0x00000000; break;
         }
-        *(uint32_t *)pv = (v & mask) | (*(uint32_t *)pv & ~mask);
+        mask <<= shift;
+        *(uint32_t *)pv = ((v & mask) | (*(uint32_t *)pv & ~mask)) >> shift;
         rc = s_ichIntelHDRegMap[index].pfnWrite(&pThis->hda, u32Offset, index, *(uint32_t *)pv);
         Log(("hda: write %s:(%x) %x => %x\n", s_ichIntelHDRegMap[index].abbrev, *(uint32_t *)pv, v, pThis->hda.au32Regs[index]));