Changeset 89904 in vbox

Timestamp:

Jun 24, 2021 7:52:47 PM (4 years ago)

Author:

vboxsync

Message:

DevHda: Optimize HDAREGDESC a little more by reducing the size, fFlags and mem_idx members to uint8_t. bugref:9890

File:

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

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

@@ -237 +237 @@
     uint32_t        offset;
     /** Size in bytes. Registers of size > 4 are in fact tables. */
-    uint32_t        size;
+    uint8_t         size;
+    /** Register descriptor (RD) flags of type HDA_RD_F_XXX. These are used to
+     *  specify the read/write handling policy of the register. */
+    uint8_t         fFlags;
+    /** Index into the register storage array. */
+    uint8_t         mem_idx;
+    uint8_t         bUnused;
     /** Readable bits. */
     uint32_t        readable;
     /** Writable bits. */
     uint32_t        writable;
-    /** Register descriptor (RD) flags of type HDA_RD_F_XXX. These are used to
-     *  specify the read/write handling policy of the register. */
-    uint32_t        fFlags;
-    /** Index into the register storage array.
-     * @todo r=bird: Bad structure layout. Move up before pfnRead. */
-    uint32_t        mem_idx;
     /** Read callback. */
     FNHDAREGREAD   *pfnRead;
@@ -359 +359 @@
 #if defined(IN_RING3) || defined(LOG_ENABLED)
 # define HDA_REG_ENTRY_EX(a_offBar, a_cbReg, a_fReadMask, a_fWriteMask, a_fFlags, a_pfnRead, a_pfnWrite, a_idxMap, a_szName, a_szDesc) \
-    { a_offBar, a_cbReg, a_fReadMask, a_fWriteMask, a_fFlags, a_idxMap, a_pfnRead, a_pfnWrite, a_szName, a_szDesc }
+    { a_offBar, a_cbReg, a_fFlags, a_idxMap, 0, a_fReadMask, a_fWriteMask, a_pfnRead, a_pfnWrite, a_szName, a_szDesc }
 #else
 # define HDA_REG_ENTRY_EX(a_offBar, a_cbReg, a_fReadMask, a_fWriteMask, a_fFlags, a_pfnRead, a_pfnWrite, a_idxMap, a_szName, a_szDesc) \
-    { a_offBar, a_cbReg, a_fReadMask, a_fWriteMask, a_fFlags, a_idxMap, a_pfnRead, a_pfnWrite }
+    { a_offBar, a_cbReg, a_fFlags, a_idxMap, 0, a_fReadMask, a_fWriteMask, a_pfnRead, a_pfnWrite }
 #endif
 #define HDA_REG_ENTRY(a_offBar, a_cbReg, a_fReadMask, a_fWriteMask, a_fFlags, a_pfnRead, a_pfnWrite, a_ShortRegNm, a_szDesc) \
@@ -5062 +5062 @@
      * Asserting sanity.
      */
+    AssertCompile(RT_ELEMENTS(pThis->au32Regs) < 256 /* assumption by HDAREGDESC::mem_idx */);
     for (unsigned i = 0; i < RT_ELEMENTS(g_aHdaRegMap); i++)
     {