diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-11-29 00:23:14 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-11-29 00:23:14 -0500 |
| commit | a84d9716d63e16e01bdcef34b115c6dcd20e4146 (patch) | |
| tree | be81458d0230a4767a1ebc3d6f30d953768b582e /src/mem/bridge.cc | |
| parent | 376c7285eedf5b235a414accf9f5253a4d55633e (diff) | |
| parent | 8a020d40d3e7c9ecd3a41cfa5ab720080f5a9bbf (diff) | |
| download | gem5-a84d9716d63e16e01bdcef34b115c6dcd20e4146.tar.xz | |
merge, no manual changes
--HG--
extra : convert_revision : 6d6b744bbdfb09e7c3092368870a4f372241f9e8
Diffstat (limited to 'src/mem/bridge.cc')
| -rw-r--r-- | src/mem/bridge.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mem/bridge.cc b/src/mem/bridge.cc index 3fa9e5bb9..aa059ad13 100644 --- a/src/mem/bridge.cc +++ b/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; } |