Changeset 108827 in vbox for trunk/src

Timestamp:

Apr 2, 2025 9:27:14 AM (13 days ago)

Author:

vboxsync

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

168273

Message:

VMM/GIC: bugref:10877 nits.

File:

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

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

@@ -272 +272 @@
     {
         uIntId = 0;
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("idxIntr=%u\n", idxIntr));
     }
     Assert(   GIC_IS_INTR_SGI_OR_PPI(uIntId)
@@ -302 +302 @@
     {
         idxIntr = 0;
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("uIntId=%u\n", uIntId));
     }
     Assert(idxIntr < sizeof(GICDEV::bmIntrPending) * 8);
@@ -338 +338 @@
     {
         uIntId = 0;
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("idxIntr=%u\n", idxIntr));
     }
     Assert(GIC_IS_INTR_SGI_OR_PPI(uIntId) || GIC_IS_INTR_EXT_PPI(uIntId));
@@ -365 +365 @@
     {
         idxIntr = 0;
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("uIntId=%u\n", uIntId));
     }
     Assert(idxIntr < sizeof(GICCPU::bmIntrPending) * 8);
@@ -828 +828 @@
     }
     else
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) write to SGI/PPI register in distributor\n"));
     LogFlowFunc(("idxReg=%#x written %#x\n", idxReg, pGicDev->bmIntrEnabled[idxReg]));
     return VINF_SUCCESS;
@@ -854 +854 @@
     }
     else
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) write to SGI/PPI register in distributor\n"));
     LogFlowFunc(("idxReg=%#x written %#x\n", idxReg, pGicDev->bmIntrEnabled[idxReg]));
     return VINF_SUCCESS;
@@ -899 +899 @@
     }
     else
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) write to SGI/PPI register in distributor\n"));
     LogFlowFunc(("idxReg=%#x written %#x\n", idxReg, pGicDev->bmIntrActive[idxReg]));
     return VINF_SUCCESS;
@@ -925 +925 @@
     }
     else
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) write to SGI/PPI register in distributor\n"));
     LogFlowFunc(("idxReg=%#x written %#x\n", idxReg, pGicDev->bmIntrActive[idxReg]));
     return VINF_SUCCESS;
@@ -954 +954 @@
     else
     {
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) read to SGI/PPI register in distributor\n"));
         *puValue = 0;
     }
@@ -985 +985 @@
     }
     else
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) write to SGI/PPI register in distributor\n"));
     return VINF_SUCCESS;
 }
@@ -1011 +1011 @@
     else
     {
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) read to SGI/PPI register in distributor\n"));
         *puValue = 0;
     }
@@ -1039 +1039 @@
     }
     else
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) write to SGI/PPI register in distributor\n"));
     LogFlowFunc(("idxReg=%#x written %#x\n", idxReg, pGicDev->bmIntrPending[idxReg]));
     return VINF_SUCCESS;
@@ -1065 +1065 @@
     }
     else
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) write to SGI/PPI register in distributor\n"));
     LogFlowFunc(("idxReg=%#x written %#x\n", idxReg, pGicDev->bmIntrPending[idxReg]));
     return VINF_SUCCESS;
@@ -1089 +1089 @@
     }
     else
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) read to SGI/PPI register in distributor\n"));
     LogFlowFunc(("idxReg=%#x read %#x\n", idxReg, pGicDev->bmIntrConfig[idxReg]));
     return VINF_SUCCESS;
@@ -1113 +1113 @@
     }
     else
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) write to SGI/PPI register in distributor\n"));
     LogFlowFunc(("idxReg=%#x written %#x\n", idxReg, pGicDev->bmIntrConfig[idxReg]));
     return VINF_SUCCESS;
@@ -1137 +1137 @@
     }
     else
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) read to SGI/PPI register in distributor\n"));
     LogFlowFunc(("idxReg=%#x read %#x\n", idxReg, *puValue));
     return VINF_SUCCESS;
@@ -1162 +1162 @@
     }
     else
-        AssertReleaseFailed();
+        AssertReleaseMsgFailed(("Unexpected (but not illegal) write to SGI/PPI register in distributor\n"));
     return gicDistUpdateIrqState(pVM, pGicDev);
 }
@@ -2290 +2290 @@
 DECLINLINE(VBOXSTRICTRC) gicReDistReadRegister(PPDMDEVINS pDevIns, PVMCPUCC pVCpu, uint32_t idRedist, uint16_t offReg, uint32_t *puValue)
 {
+    PCVMCC   pVM     = pVCpu->CTX_SUFF(pVM);
     PCGICDEV pGicDev = PDMDEVINS_2_DATA(pDevIns, PGICDEV);
-    AssertRelease(idRedist == pVCpu->idCpu);
+    Assert(idRedist == pVCpu->idCpu);
+
     switch (offReg)
     {
         case GIC_REDIST_REG_TYPER_OFF:
-        {
-            PCVMCC pVM = pVCpu->CTX_SUFF(pVM);
             *puValue = (pVCpu->idCpu == pVM->cCpus - 1 ? GIC_REDIST_REG_TYPER_LAST : 0)
                      | GIC_REDIST_REG_TYPER_CPU_NUMBER_SET(idRedist)
@@ -2304 +2304 @@
             Assert(!pGicDev->fExtPpi || pGicDev->uMaxExtPpi > 0);
             break;
-        }
         case GIC_REDIST_REG_WAKER_OFF:
             *puValue = 0;
@@ -2744 +2743 @@
                     VMCPUSET_ADD(&DestCpuSet, idCpuTarget);
                 else
-                    AssertReleaseFailed();
+                    AssertReleaseMsgFailed(("VCPU ID out-of-bounds %RU32, must be < %u\n", idCpuTarget, cCpus));
             }
         }
@@ -2879 +2878 @@
             break;
         default:
-            AssertReleaseFailed();
+            AssertReleaseMsgFailed(("u32Reg=%#RX32\n", u32Reg));
             break;
     }
@@ -3069 +3068 @@
             break;
         default:
-            AssertReleaseFailed();
+            AssertReleaseMsgFailed(("u32Reg=%#RX32\n", u32Reg));
             break;
     }