Changeset 108496 in vbox for trunk/src

Timestamp:

Mar 10, 2025 1:02:16 PM (2 months ago)

Author:

vboxsync

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

167884

Message:

VMM/GIC: bugref:10404 Minor improvements to code getting the highest pending interrupt.

File:

• trunk/src/VBox/VMM/VMMAll/GICAll.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/GICAll.cpp

@@ -1832 +1832 @@
                                                  uint16_t *pidxIntr, uint8_t *pbPriority)
 {
-#define GIC_DIST_INTR_COUNT     RT_ELEMENTS(pGicDev->bmIntrPending)
-#define GIC_REDIST_INTR_COUNT   RT_ELEMENTS(pGicCpu->bmIntrPending)
-
     /*
      * Collect interrupts that are pending, enabled and inactive.
      * Discard interrupts if the group they belong to is disabled.
-     * While collected the interrupts, pick the one with the highest, non-idle priority.
+     * While collecting the interrupts, pick the one with the highest, non-idle priority.
      */
     uint16_t uIntId    = GIC_INTID_RANGE_SPECIAL_NO_INTERRUPT;
@@ -1847 +1844 @@
     {
         uint16_t idxHighest = UINT16_MAX;
-        uint32_t bmIntrPending[GIC_REDIST_INTR_COUNT];
-        for (uint16_t i = 0; i < GIC_REDIST_INTR_COUNT; i++)
-        {
-            bmIntrPending[i] = (pGicCpu->bmIntrPending[i] & pGicCpu->bmIntrEnabled[i]) & ~pGicCpu->bmIntrActive[i];
+        for (uint16_t i = 0; i < RT_ELEMENTS(pGicCpu->bmIntrPending); i++)
+        {
+            uint32_t uIntrPending = (pGicCpu->bmIntrPending[i] & pGicCpu->bmIntrEnabled[i]) & ~pGicCpu->bmIntrActive[i];
             if (!fGroup1)
-                bmIntrPending[i] &= ~pGicCpu->bmIntrGroup[i];
+                uIntrPending &= ~pGicCpu->bmIntrGroup[i];
             if (!fGroup0)
-                bmIntrPending[i] &= pGicCpu->bmIntrGroup[i];
-
-            uint16_t const idxPending = ASMBitFirstSetU32(bmIntrPending[i]);
+                uIntrPending &= pGicCpu->bmIntrGroup[i];
+
+            uint16_t const idxPending = ASMBitFirstSetU32(uIntrPending);
             if (idxPending > 0)
             {
-                uint32_t const idxPriority = (32 * i) + idxPending - 1;
+                uint32_t const idxPriority = 32 * i + idxPending - 1;
                 Assert(idxPriority < RT_ELEMENTS(pGicCpu->abIntrPriority));
                 if (pGicCpu->abIntrPriority[idxPriority] < uPriority)
@@ -1881 +1877 @@
     {
         uint16_t idxHighest = UINT16_MAX;
-        uint32_t bmIntrPending[GIC_DIST_INTR_COUNT];
-        for (uint16_t i = 0; i < GIC_DIST_INTR_COUNT; i++)
-        {
-            bmIntrPending[i] = (pGicDev->bmIntrPending[i] & pGicDev->bmIntrEnabled[i]) & ~pGicDev->bmIntrActive[i];
+        for (uint16_t i = 0; i < RT_ELEMENTS(pGicDev->bmIntrPending) / 2; i++)
+        {
+            uint32_t uLo = (pGicDev->bmIntrPending[i]     & pGicDev->bmIntrEnabled[i])     & ~pGicDev->bmIntrActive[i];
+            uint32_t uHi = (pGicDev->bmIntrPending[i + 1] & pGicDev->bmIntrEnabled[i + 1]) & ~pGicDev->bmIntrActive[i + 1];
             if (!fGroup1)
-                bmIntrPending[i] &= ~pGicDev->bmIntrGroup[i];
+            {
+                uLo &= ~pGicDev->bmIntrGroup[i];
+                uHi &= ~pGicDev->bmIntrGroup[i + 1];
+            }
             if (!fGroup0)
-                bmIntrPending[i] &= pGicDev->bmIntrGroup[i];
-
-            uint16_t const idxPending = ASMBitFirstSetU32(bmIntrPending[i]);
+            {
+                uLo &= pGicDev->bmIntrGroup[i];
+                uHi &= pGicDev->bmIntrGroup[i + 1];
+            }
+
+            uint64_t const uIntrPending = RT_MAKE_U64(uLo, uHi);
+            uint16_t const idxPending   = ASMBitFirstSetU64(uIntrPending);
             if (idxPending > 0)
             {
-                uint32_t const idxPriority = (32 * i) + idxPending - 1;
+                uint32_t const idxPriority = 64 * i + idxPending - 1;
                 if (pGicDev->abIntrPriority[idxPriority] < uPriority)
                 {
@@ -1920 +1923 @@
     LogFlowFunc(("uIntId=%u [idxIntr=%u uPriority=%u]\n", uIntId, idxIntr, uPriority));
     return uIntId;
-
-#undef GIC_DIST_INTR_COUNT
-#undef GIC_REDIST_INTR_COUNT
 }
 #else