Changeset 108472 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 7, 2025 9:37:16 AM (2 months ago)

Author:

vboxsync

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

167859

Message:

VMM/GIC: bugref:10404 Cleanup.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/GICAll.cpp (modified) (3 diffs)
• VMMR3/GICR3.cpp (modified) (4 diffs)

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

@@ -1829 +1829 @@
  *                      GIC_INTID_RANGE_SPECIAL_NO_INTERRUPT.
  */
-static uint16_t gicGetHighestPriorityPendingIntrEx(PCGICDEV pGicDev, PCGICCPU pGicCpu, bool fGroup0, bool fGroup1,
-                                                   uint16_t *pidxIntr, uint8_t *pbPriority)
+static uint16_t gicGetHighestPriorityPendingIntr(PCGICDEV pGicDev, PCGICCPU pGicCpu, bool fGroup0, bool fGroup1,
+                                                 uint16_t *pidxIntr, uint8_t *pbPriority)
 {
 #define GIC_DIST_INTR_COUNT     RT_ELEMENTS(pGicDev->bmIntrPending)
@@ -1991 +1991 @@
     uint16_t idxIntr;
     PGICCPU  pGicCpu = VMCPU_TO_GICCPU(pVCpu);
-    uint16_t const uIntId = gicGetHighestPriorityPendingIntrEx(pGicDev, pGicCpu, fGroup0, fGroup1, &idxIntr, &bIntrPriority);
-
+    uint16_t const uIntId = gicGetHighestPriorityPendingIntr(pGicDev, pGicCpu, fGroup0, fGroup1, &idxIntr, &bIntrPriority);
     if (uIntId != GIC_INTID_RANGE_SPECIAL_NO_INTERRUPT)
     {
@@ -3521 +3520 @@
 #else
             AssertReleaseFailed();
-            *pu64Value = gicGetHighestPriorityPendingIntrEx(pGicDev, pGicCpu, false /*fGroup0*/, true /*fGroup1*/,
-                                                            NULL /*pidxIntr*/, NULL /*pbPriority*/);
+            *pu64Value = gicGetHighestPriorityPendingIntr(pGicDev, pGicCpu, false /*fGroup0*/, true /*fGroup1*/,
+                                                          NULL /*pidxIntr*/, NULL /*pbPriority*/);
 #endif
             break;

trunk/src/VBox/VMM/VMMR3/GICR3.cpp

@@ -143 +143 @@
         pHlp->pfnPrintf(pHlp, "  Interrupt priorities:\n");
         for (uint32_t i = 0; i < cPriorities; i += 16)
-            pHlp->pfnPrintf(pHlp, "    IntId[ %4u..%-4u ] = %3u %3u %3u %3u %3u %3u %3u %3u"
-                                  "    IntId[ %4u..%-4u ] %3u %3u %3u %3u %3u %3u %3u %3u\n",
+            pHlp->pfnPrintf(pHlp, "    IntId[%4u..%-4u] = %3u %3u %3u %3u %3u %3u %3u %3u"
+                                  "    IntId[%4u..%-4u] = %3u %3u %3u %3u %3u %3u %3u %3u\n",
                             gicDistGetIntIdFromIndex(i),     gicDistGetIntIdFromIndex(i + 7),
                             pGicDev->abIntrPriority[i],      pGicDev->abIntrPriority[i + 1],
@@ -164 +164 @@
         pHlp->pfnPrintf(pHlp, "  Interrupt routing:\n");
         for (uint32_t i = 0; i < cRouting; i += 16)
-            pHlp->pfnPrintf(pHlp, "    IntId[ %4u..%-4u ] = %3u %3u %3u %3u %3u %3u %3u %3u"
-                                  "    IntId[ %4u..%-4u ] %3u %3u %3u %3u %3u %3u %3u %3u\n",
+            pHlp->pfnPrintf(pHlp, "    IntId[%4u..%-4u] = %3u %3u %3u %3u %3u %3u %3u %3u"
+                                  "    IntId[%4u..%-4u] = %3u %3u %3u %3u %3u %3u %3u %3u\n",
                             gicDistGetIntIdFromIndex(i),      gicDistGetIntIdFromIndex(i + 7),
                             pGicDev->au32IntrRouting[i],      pGicDev->au32IntrRouting[i + 1],
@@ -199 +199 @@
 
     pHlp->pfnPrintf(pHlp, "VCPU[%u] Redistributor:\n", pVCpu->idCpu);
-    AssertCompile(RT_ELEMENTS(pGicCpu->bmIntrGroup)   == 3);
-    AssertCompile(RT_ELEMENTS(pGicCpu->bmIntrEnabled) == 3);
-    AssertCompile(RT_ELEMENTS(pGicCpu->bmIntrPending) == 3);
-    AssertCompile(RT_ELEMENTS(pGicCpu->bmIntrActive)  == 3);
+    AssertCompile(RT_ELEMENTS(pGicCpu->bmIntrGroup)   >= 3);
+    AssertCompile(RT_ELEMENTS(pGicCpu->bmIntrEnabled) >= 3);
+    AssertCompile(RT_ELEMENTS(pGicCpu->bmIntrPending) >= 3);
+    AssertCompile(RT_ELEMENTS(pGicCpu->bmIntrActive)  >= 3);
     pHlp->pfnPrintf(pHlp, "  bmIntrGroup[0..2]   = %#010x %#010x %#010x\n", pGicCpu->bmIntrGroup[0],   pGicCpu->bmIntrGroup[1],   pGicCpu->bmIntrGroup[2]);
     pHlp->pfnPrintf(pHlp, "  bmIntrEnabled[0..2] = %#010x %#010x %#010x\n", pGicCpu->bmIntrEnabled[0], pGicCpu->bmIntrEnabled[1], pGicCpu->bmIntrEnabled[2]);
@@ -212 +212 @@
     pHlp->pfnPrintf(pHlp, "  Interrupt priorities:\n");
     for (uint32_t i = 0; i < cPriorities; i += 16)
-        pHlp->pfnPrintf(pHlp, "    IntId[ %4u..%-4u ] = %3u %3u %3u %3u %3u %3u %3u %3u"
-                              "    IntId[ %4u..%-4u ] %3u %3u %3u %3u %3u %3u %3u %3u\n",
+        pHlp->pfnPrintf(pHlp, "    IntId[%4u..%-4u] = %3u %3u %3u %3u %3u %3u %3u %3u"
+                              "    IntId[%4u..%-4u] = %3u %3u %3u %3u %3u %3u %3u %3u\n",
                         gicReDistGetIntIdFromIndex(i),     gicReDistGetIntIdFromIndex(i + 7),
                         pGicCpu->abIntrPriority[i],        pGicCpu->abIntrPriority[i + 1],