merge, no manual changes

--HG--
extra : convert_revision : 6d6b744bbdfb09e7c3092368870a4f372241f9e8

src/mem/bridge.cc

@@ -78,8 +78,9 @@ Bridge::getPort(const std::string &if_name, int idx)
     else
         return NULL;
 
-    if (port->getPeer() != NULL)
-        panic("bridge side %s already connected to.", if_name);
+    if (port->getPeer() != NULL && !port->getPeer()->isDefaultPort())
+        panic("bridge side %s already connected to %s.",
+                if_name, port->getPeer()->name());
     return port;
 }
 

src/mem/port.cc

@@ -39,6 +39,64 @@
 #include "mem/mem_object.hh"
 #include "mem/port.hh"
 
+class defaultPeerPortClass: public Port
+{
+  protected:
+    void blowUp()
+    {
+        fatal("Unconnected port!");
+    }
+
+  public:
+    defaultPeerPortClass() : Port("default_port")
+    {}
+
+    bool recvTiming(PacketPtr)
+    {
+        blowUp();
+        return false;
+    }
+
+    Tick recvAtomic(PacketPtr)
+    {
+        blowUp();
+        return 0;
+    }
+
+    void recvFunctional(PacketPtr)
+    {
+        blowUp();
+    }
+
+    void recvStatusChange(Status)
+    {
+        blowUp();
+    }
+
+    int deviceBlockSize()
+    {
+        blowUp();
+        return 0;
+    }
+
+    void getDeviceAddressRanges(AddrRangeList &, bool &)
+    {
+        blowUp();
+    }
+
+    bool isDefaultPort() { return true; }
+
+} defaultPeerPort;
+
+Port::Port() : peer(&defaultPeerPort), owner(NULL)
+{
+}
+
+Port::Port(const std::string &_name, MemObject *_owner) :
+    portName(_name), peer(&defaultPeerPort), owner(_owner)
+{
+}
+
 void
 Port::setPeer(Port *port)
 {

src/mem/port.hh

@@ -88,9 +88,7 @@ class Port
 
   public:
 
-    Port()
-        : peer(NULL), owner(NULL)
-    { }
+    Port();
 
     /**
      * Constructor.
@@ -100,9 +98,7 @@ class Port
      * @param _owner Pointer to the MemObject that owns this port.
      * Will not necessarily be set.
      */
-    Port(const std::string &_name, MemObject *_owner = NULL)
-        : portName(_name), peer(NULL), owner(_owner)
-    { }
+    Port(const std::string &_name, MemObject *_owner = NULL);
 
     /** Return port name (for DPRINTF). */
     const std::string &name() const { return portName; }
@@ -135,6 +131,7 @@ class Port
      * demise. */
     void removeConn();
 
+    virtual bool isDefaultPort() { return false; }
 
   protected: