ARM: Fix over-eager assert in gic.
authorAli Saidi <Ali.Saidi@ARM.com>
Tue, 5 Jun 2012 05:23:08 +0000 (01:23 -0400)
committerAli Saidi <Ali.Saidi@ARM.com>
Tue, 5 Jun 2012 05:23:08 +0000 (01:23 -0400)
src/dev/arm/gic.cc

index 94719f86fb90e800961dc18290a2aeed3cf09af0..143cae9f12b0d6469fafff0897753cb4352393fe 100644 (file)
@@ -193,12 +193,12 @@ Gic::readDistributor(PacketPtr pkt)
             pkt->set<uint8_t>(int_p[int_num]);
             break;
           case 2:
-            assert((int_num + 1) < (SGI_MAX + PPI_MAX));
+            assert((int_num + 1) < INT_LINES_MAX);
             pkt->set<uint16_t>(int_p[int_num] |
                                int_p[int_num+1] << 8);
             break;
           case 4:
-            assert((int_num + 3) < (SGI_MAX + PPI_MAX));
+            assert((int_num + 3) < INT_LINES_MAX);
             pkt->set<uint32_t>(int_p[int_num] |
                                int_p[int_num+1] << 8 |
                                int_p[int_num+2] << 16 |