summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dev/arm/gic.cc2
-rw-r--r--src/mem/abstract_mem.cc1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/dev/arm/gic.cc b/src/dev/arm/gic.cc
index f686c2a13..94719f86f 100644
--- a/src/dev/arm/gic.cc
+++ b/src/dev/arm/gic.cc
@@ -193,10 +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));
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));
pkt->set<uint32_t>(int_p[int_num] |
int_p[int_num+1] << 8 |
int_p[int_num+2] << 16 |
diff --git a/src/mem/abstract_mem.cc b/src/mem/abstract_mem.cc
index 13a1183a2..1b28a2319 100644
--- a/src/mem/abstract_mem.cc
+++ b/src/mem/abstract_mem.cc
@@ -390,6 +390,7 @@ AbstractMemory::functionalAccess(PacketPtr pkt)
} else if (pkt->isPrint()) {
Packet::PrintReqState *prs =
dynamic_cast<Packet::PrintReqState*>(pkt->senderState);
+ assert(prs);
// Need to call printLabels() explicitly since we're not going
// through printObj().
prs->printLabels();