From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Tue, 5 Jun 2012 05:23:08 +0000 (-0400)
Subject: ARM: Fix over-eager assert in gic.
X-Git-Tag: stable_2012_06_28~30
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d6997777bee827c89578cf730b186991485c647c;p=gem5.git

ARM: Fix over-eager assert in gic.
---

diff --git a/src/dev/arm/gic.cc b/src/dev/arm/gic.cc
index 94719f86f..143cae9f1 100644
--- a/src/dev/arm/gic.cc
+++ b/src/dev/arm/gic.cc
@@ -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 |