1 files changed, 33 insertions, 14 deletions

diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index 5d7d7382a..a49959e51 100644
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -52,7 +52,7 @@ using namespace std;
 using namespace TheISA;
 
 PhysicalMemory::PhysicalMemory(Params *p)
-    : MemObject(p->name), pmemAddr(NULL), port(NULL), lat(p->latency), _params(p)
+    : MemObject(p->name), pmemAddr(NULL), lat(p->latency), _params(p)
 {
     if (params()->addrRange.size() % TheISA::PageBytes != 0)
         panic("Memory Size not divisible by page size\n");
@@ -76,9 +76,10 @@ PhysicalMemory::PhysicalMemory(Params *p)
 void
 PhysicalMemory::init()
 {
-    if (!port)
-        panic("PhysicalMemory not connected to anything!");
-    port->sendStatusChange(Port::RangeChange);
+    for (PortIterator pi = ports.begin(); pi != ports.end(); ++pi) {
+        if (*pi)
+            (*pi)->sendStatusChange(Port::RangeChange);
+    }
 }
 
 PhysicalMemory::~PhysicalMemory()
@@ -335,19 +336,33 @@ PhysicalMemory::doFunctionalAccess(PacketPtr pkt)
 Port *
 PhysicalMemory::getPort(const std::string &if_name, int idx)
 {
-    if (if_name == "port" && idx == -1) {
-        if (port != NULL)
-           panic("PhysicalMemory::getPort: additional port requested to memory!");
-        port = new MemoryPort(name() + "-port", this);
-        return port;
-    } else if (if_name == "functional") {
-        /* special port for functional writes at startup. And for memtester */
-        return new MemoryPort(name() + "-funcport", this);
-    } else {
+    // Accept request for "functional" port for backwards compatibility
+    // with places where this function is called from C++.  I'd prefer
+    // to move all these into Python someday.
+    if (if_name == "functional") {
+        return new MemoryPort(csprintf("%s-functional", name()), this);
+    }
+
+    if (if_name != "port") {
         panic("PhysicalMemory::getPort: unknown port %s requested", if_name);
     }
+
+    if (idx >= ports.size()) {
+        ports.resize(idx+1);
+    }
+
+    if (ports[idx] != NULL) {
+        panic("PhysicalMemory::getPort: port %d already assigned", idx);
+    }
+
+    MemoryPort *port =
+        new MemoryPort(csprintf("%s-port%d", name(), idx), this);
+
+    ports[idx] = port;
+    return port;
 }
 
+
 void
 PhysicalMemory::recvStatusChange(Port::Status status)
 {
@@ -420,7 +435,11 @@ PhysicalMemory::MemoryPort::recvFunctional(PacketPtr pkt)
 unsigned int
 PhysicalMemory::drain(Event *de)
 {
-    int count = port->drain(de);
+    int count = 0;
+    for (PortIterator pi = ports.begin(); pi != ports.end(); ++pi) {
+        count += (*pi)->drain(de);
+    }
+
     if (count)
         changeState(Draining);
     else