Changeset 89687 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jun 14, 2021 4:11:37 PM (4 years ago)

Author:

vboxsync

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

145135

Message:

DevIchAc97: ichac97R3DbgPrintBdl misunderstood LVI. Some todos and nits. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (9 diffs)

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

@@ -1885 +1885 @@
      *       up to and we cannot really make much of a plan out of it.
      */
+    /** @todo This is wrong! The valid range is CVI thru LVI. However, CVI is
+     *        typically reset to zero, I guess... */
     AC97BDLE aBdl[AC97_MAX_BDLE];
     RT_ZERO(aBdl);
@@ -2869 +2871 @@
                          *                Last Valid Index Register +
                          *                Status Register */
-                        *pu32 = pRegs->civ | (pRegs->lvi << 8) | (pRegs->sr << 16); /** @todo r=andy Use RT_MAKE_U32_FROM_U8. */
+                        *pu32 = pRegs->civ | ((uint32_t)pRegs->lvi << 8) | ((uint32_t)pRegs->sr << 16);
                         Log3Func(("CIV LVI SR[%d] -> %#x, %#x, %#x\n",
                                   AC97_PORT2IDX(offPort), pRegs->civ, pRegs->lvi, pRegs->sr));
@@ -2877 +2879 @@
                          *                Prefetched Index Value Register +
                          *                Control Register */
-                        *pu32 = pRegs->picb | (pRegs->piv << 16) | (pRegs->cr << 24); /** @todo r=andy Use RT_MAKE_U32_FROM_U8. */
+                        *pu32 = pRegs->picb | ((uint32_t)pRegs->piv << 16) | ((uint32_t)pRegs->cr << 24);
                         Log3Func(("PICB PIV CR[%d] -> %#x %#x %#x %#x\n",
                                   AC97_PORT2IDX(offPort), *pu32, pRegs->picb, pRegs->piv, pRegs->cr));
@@ -2990 +2992 @@
                             && (pRegs->sr & AC97_SR_DCH))
                         {
-#ifdef IN_RING3
+#ifdef IN_RING3 /** @todo r=bird: What kind of unexplained non-sense is this ifdef?!? */
                             pRegs->sr &= ~(AC97_SR_DCH | AC97_SR_CELV);
                             pRegs->civ = pRegs->piv;
@@ -3088 +3090 @@
                     case AC97_NABM_OFF_BDBAR:
                         /* Buffer Descriptor list Base Address Register */
-                        pRegs->bdbar = u32 & ~3;
+                        pRegs->bdbar = u32 & ~(uint32_t)3;
                         Log3Func(("[SD%RU8] BDBAR <- %#x (bdbar %#x)\n", AC97_PORT2IDX(offPort), u32, pRegs->bdbar));
                         break;
@@ -3637 +3639 @@
                                  PCDBGFINFOHLP pHlp, const char *pszPrefix)
 {
-    unsigned const cEntries = pStream->Regs.lvi + 1;
-    pHlp->pfnPrintf(pHlp, "%sBDL for stream #%u: @ %#RX32 L %#x:\n", pszPrefix, pStream->u8SD, pStream->Regs.bdbar, cEntries);
+    uint8_t const bLvi = pStream->Regs.lvi;
+    uint8_t const bCiv = pStream->Regs.civ;
+    pHlp->pfnPrintf(pHlp, "%sBDL for stream #%u: @ %#RX32 LB 0x100; CIV=%#04x LVI=%#04x:\n",
+                    pszPrefix, pStream->u8SD, pStream->Regs.bdbar, bCiv, bLvi);
     if (pStream->Regs.bdbar != 0)
     {
         /* Read all in one go. */
-        AssertCompile(sizeof(pStream->Regs.lvi) == sizeof(uint8_t));
-        AC97BDLE aBdl[256];
+        AC97BDLE aBdl[AC97_MAX_BDLE];
         RT_ZERO(aBdl);
-        PDMDevHlpPCIPhysRead(pDevIns, pStream->Regs.bdbar, aBdl, sizeof(aBdl[0]) * cEntries);
+        PDMDevHlpPCIPhysRead(pDevIns, pStream->Regs.bdbar, aBdl, sizeof(aBdl));
 
         /* Get the audio props for the stream so we can translate the sizes correctly. */
@@ -3653 +3656 @@
         /* Dump them. */
         uint64_t cbTotal = 0;
-        for (unsigned i = 0; i < cEntries; i++)
+        uint64_t cbValid = 0;
+        for (unsigned i = 0; i < RT_ELEMENTS(aBdl); i++)
         {
             aBdl[i].addr    = RT_LE2H_U32(aBdl[i].addr);
             aBdl[i].ctl_len = RT_LE2H_U32(aBdl[i].ctl_len);
 
+            bool const fValid = bCiv <= bLvi
+                              ? i >= bCiv && i <= bLvi
+                              : (i >= bCiv && i < RT_ELEMENTS(aBdl)) || i <= bLvi;
+
             uint32_t const cb = (aBdl[i].ctl_len & AC97_BD_LEN_MASK) * PDMAudioPropsSampleSize(&Props); /** @todo or frame size? OSDev says frame... */
             cbTotal += cb;
+            if (fValid)
+                cbValid += cb;
 
             char szFlags[64];
@@ -3666 +3676 @@
                 RTStrPrintf(szFlags, sizeof(szFlags), " !!fFlags=%#x!!\n", aBdl[i].ctl_len & ~AC97_BD_LEN_MASK);
 
-            pHlp->pfnPrintf(pHlp, "%s  BDLE%02u: %#010RX32 L %#06x / LB %#RX32 / %RU64ms%s%s%s%s\n", pszPrefix, i, aBdl[i].addr,
+            pHlp->pfnPrintf(pHlp, "%s %cBDLE%02u: %#010RX32 L %#06x / LB %#RX32 / %RU64ms%s%s%s%s\n",
+                            pszPrefix, fValid ? ' ' : '?', i, aBdl[i].addr,
                             aBdl[i].ctl_len & AC97_BD_LEN_MASK, cb, PDMAudioPropsBytesToMilli(&Props, cb),
                             aBdl[i].ctl_len & AC97_BD_IOC ?  " ioc" : "",
@@ -3673 +3684 @@
         }
 
-        pHlp->pfnPrintf(pHlp, "%sTotal: %#RX64 bytes (%RU64), %RU64 ms\n", pszPrefix, cbTotal, cbTotal,
-                        PDMAudioPropsBytesToMilli(&Props, cbTotal));
+        pHlp->pfnPrintf(pHlp, "%sTotal: %#RX64 bytes (%RU64), %RU64 ms;  Valid: %#RX64 bytes (%RU64), %RU64 ms\n", pszPrefix,
+                        cbTotal, cbTotal, PDMAudioPropsBytesToMilli(&Props, cbTotal),
+                        cbValid, cbValid, PDMAudioPropsBytesToMilli(&Props, cbValid) );
     }
 }