Changeset 81036 in vbox

Timestamp:

Sep 26, 2019 8:56:01 PM (5 years ago)

Author:

vboxsync

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

133639

Message:

DevPci: Share more of the setirq code for bridges and added cycle (bogus data) detection. [build fix] bugref:9218

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -151 +151 @@
     int                 iIrqPinBridge  = ((pPciDev->uDevFn >> 3) + iIrq) & 3;
     uint64_t            bmSeen[256/64] = { 0, 0, 0, 0 };
-    ASMBitSet(bmSeen, pPciDevBus->Int.s.idxPdmBus); AssertCompile(sizeof(pPciDevBus->Int.s.idxPdmBus) == 1);
+    AssertCompile(sizeof(pPciDevBus->Int.s.idxPdmBus) == 1);
+    ASMBitSet(bmSeen, pPciDevBus->Int.s.idxPdmBus);
 
     /* Walk the chain until we reach the host bus. */
@@ -175 +176 @@
 
         /* Make sure that we cannot end up in a loop here: */
-        AssertMsgReturn(ASMBitTestAndSet(bmSeen, RT_MIN(pPciDevBus->Int.s.idxPdmBus, 255)),
+        AssertCompile(sizeof(pPciDevBus->Int.s.idxPdmBus) == 1);
+        AssertMsgReturn(ASMBitTestAndSet(bmSeen, pPciDevBus->Int.s.idxPdmBus, 255),
                         ("idxPdmBus=%u\n", pPciDevBus->Int.s.idxPdmBus),
                         NULL);