summaryrefslogtreecommitdiff
path: root/src/mem/physical.cc
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-06-15 11:46:13 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2006-06-15 11:46:13 -0400
commitf06d508af0ff78d7fc0e774d658cb6aedf330635 (patch)
tree1d400914f66e9ec03e34ad12a3989d3bad147d02 /src/mem/physical.cc
parent74b9868c786a8c58ef8fe65bebd2fd8e9573d0be (diff)
parent88e22ee081f1b0259b624fe320af22a58f144251 (diff)
downloadgem5-f06d508af0ff78d7fc0e774d658cb6aedf330635.tar.xz
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head --HG-- extra : convert_revision : 8a1cd7ff43aa4ebbfce0ff174d2f4ba3f095dd47
Diffstat (limited to 'src/mem/physical.cc')
-rw-r--r--src/mem/physical.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index fb31fb4a3..2d66602ab 100644
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -173,9 +173,9 @@ PhysicalMemory::doFunctionalAccess(Packet *pkt)
}
Port *
-PhysicalMemory::getPort(const std::string &if_name)
+PhysicalMemory::getPort(const std::string &if_name, int idx)
{
- if (if_name == "") {
+ if (if_name == "port" && idx == -1) {
if (port != NULL)
panic("PhysicalMemory::getPort: additional port requested to memory!");
port = new MemoryPort(name() + "-port", this);