summaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@gmail.com>2008-06-28 13:20:00 -0400
committerSteve Reinhardt <stever@gmail.com>2008-06-28 13:20:00 -0400
commit96bbccc36bad7c6f67b1cb70965eab3a621c7270 (patch)
treee43e352c7d264d3b84540dd5d3ed26b3e5386a4b /src/mem
parentcaaac16803db6eaf3ee20b5d062ec2211fe6584d (diff)
parent3205768ea57b4e2f75561eebb39671045a6d6746 (diff)
downloadgem5-96bbccc36bad7c6f67b1cb70965eab3a621c7270.tar.xz
Automated merge after backout.
Diffstat (limited to 'src/mem')
-rw-r--r--src/mem/bus.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index 3bf1c6cfc..606402a1e 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -523,9 +523,12 @@ Bus::recvStatusChange(Port::Status status, int id)
for (iter = ranges.begin(); iter != ranges.end(); iter++) {
DPRINTF(BusAddrRanges, "Adding range %#llx - %#llx for id %d\n",
iter->start, iter->end, id);
- if (portMap.insert(*iter, id) == portMap.end())
- panic("Two devices with same range\n");
-
+ if (portMap.insert(*iter, id) == portMap.end()) {
+ int conflict_id = portMap.find(*iter)->second;
+ fatal("%s has two ports with same range:\n\t%s\n\t%s\n",
+ name(), interfaces[id]->getPeer()->name(),
+ interfaces[conflict_id]->getPeer()->name());
+ }
}
}
DPRINTF(MMU, "port list has %d entries\n", portMap.size());