Changeset 90144 in vbox

Timestamp:

Jul 9, 2021 11:24:35 PM (4 years ago)

Author:

vboxsync

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

145646

Message:

DevHdaCodec: Combine all the node classification lists into an array with classification flags for each node and use this to implement the predicate functions (e.g. hdaCodecIsPortNode, hdaCodecIsSpdifOutNode, etc). This reduces .text$nm size (windows release build) from 19421 to 15760 bytes -> 3661 bytes / 18%. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHdaCodec.cpp (modified) (2 diffs)
• DevHdaCodec.h (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/DevHdaCodec.cpp ¶

@@ -800 +800 @@
 #define STAC9220WIDGET(a_Type) do { \
             AssertCompile(RT_ELEMENTS(g_abStac9220##a_Type##s) <= RT_ELEMENTS(pThis->ab##a_Type##s)); \
-            memcpy((void *)&pThis->ab##a_Type##s[0], &g_abStac9220##a_Type##s[0], \
-                   sizeof(uint8_t) * RT_ELEMENTS(g_abStac9220##a_Type##s)); \
+            uint8_t  *pbDst = (uint8_t *)&pThis->ab##a_Type##s[0]; \
+            uintptr_t i; \
+            for (i = 0; i < RT_ELEMENTS(g_abStac9220##a_Type##s); i++) \
+            { \
+                uint8_t const idNode = g_abStac9220##a_Type##s[i]; \
+                if (idNode != 0) \
+                { \
+                    AssertReturn(idNode < RT_ELEMENTS(pThis->aNodes), VERR_INTERNAL_ERROR_3); \
+                    pThis->afNodeClassifications[idNode] |= RT_CONCAT(CODEC_NODE_CLS_,a_Type); \
+                } \
+                pbDst[i] = idNode; \
+            } \
+            for (; i < RT_ELEMENTS(pThis->ab##a_Type##s); i++) \
+                pbDst[i] = 0; \
         } while (0)
     STAC9220WIDGET(Port);
@@ -855 +867 @@
  * Some generic predicate functions.
  */
-/** @todo r=bird: we could use memchr here if we knew the array always ended with zeros
- * What would be even quicker would be an array of 16-bit flag masks for each node,
- * compiled by STAC9220WIDGET at construction time. */
 #define HDA_CODEC_IS_NODE_OF_TYPE_FUNC(a_Type) \
     DECLINLINE(bool) hdaCodecIs##a_Type##Node(PHDACODECR3 pThis, uint8_t idNode) \
     { \
-        Assert(pThis->ab##a_Type##s); \
-        for (uintptr_t i = 0; i < RT_ELEMENTS(pThis->ab##a_Type##s) && pThis->ab##a_Type##s[i] != 0; i++) \
-            if (pThis->ab##a_Type##s[i] == idNode) \
-                return true; \
-        return false; \
+        Assert(idNode < RT_ELEMENTS(pThis->afNodeClassifications)); \
+        Assert(   (memchr(&pThis->RT_CONCAT3(ab,a_Type,s)[0], idNode, sizeof(pThis->RT_CONCAT3(ab,a_Type,s))) != NULL) \
+               == RT_BOOL(pThis->afNodeClassifications[idNode] & RT_CONCAT(CODEC_NODE_CLS_,a_Type))); \
+        return RT_BOOL(pThis->afNodeClassifications[idNode] & RT_CONCAT(CODEC_NODE_CLS_,a_Type)); \
     }
 /* hdaCodecIsPortNode */

trunk/src/VBox/Devices/Audio/DevHdaCodec.h ¶

@@ -790 +790 @@
 #define CODEC_NODES_MAX     32
 
+/** @name CODEC_NODE_CLS_XXX - node classification flags.
+ * @{ */
+#define CODEC_NODE_CLS_Port         UINT16_C(0x0001)
+#define CODEC_NODE_CLS_Dac          UINT16_C(0x0002)
+#define CODEC_NODE_CLS_AdcVol       UINT16_C(0x0004)
+#define CODEC_NODE_CLS_Adc          UINT16_C(0x0008)
+#define CODEC_NODE_CLS_AdcMux       UINT16_C(0x0010)
+#define CODEC_NODE_CLS_Pcbeep       UINT16_C(0x0020)
+#define CODEC_NODE_CLS_SpdifIn      UINT16_C(0x0040)
+#define CODEC_NODE_CLS_SpdifOut     UINT16_C(0x0080)
+#define CODEC_NODE_CLS_DigInPin     UINT16_C(0x0100)
+#define CODEC_NODE_CLS_DigOutPin    UINT16_C(0x0200)
+#define CODEC_NODE_CLS_Cd           UINT16_C(0x0400)
+#define CODEC_NODE_CLS_VolKnob      UINT16_C(0x0800)
+#define CODEC_NODE_CLS_Reserved     UINT16_C(0x1000)
+/** @} */
+
+
 /**
  * HDA codec state (ring-3, no shared state).
@@ -836 +854 @@
     /** @} */
 
-    /** Safty zero padding before the nodes start. */
-    uint8_t const   abSaftyPadding2[CODEC_NODES_MAX * 2];
+    /** The CODEC_NODE_CLS_XXX flags for each node. */
+    uint16_t        afNodeClassifications[CODEC_NODES_MAX];
 
     CODECNODE       aNodes[CODEC_NODES_MAX];