diff options
| author | Kevin Lim <ktlim@umich.edu> | 2007-04-04 15:39:13 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2007-04-04 15:39:13 -0400 |
| commit | b247e02f6ecb6e8e95d0aa41b068efd3b2d7edbc (patch) | |
| tree | 87afbb8b6b1b53ee905efdb5bdb40d55063e2315 /src/mem/bus.cc | |
| parent | 6ff6621f20eb6513e12c769f601dba0b47b47697 (diff) | |
| parent | d9ab45d066667d291f5508ccfacc563005682dd3 (diff) | |
| download | gem5-b247e02f6ecb6e8e95d0aa41b068efd3b2d7edbc.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/head
--HG--
extra : convert_revision : 7181d8c2ee673322372484cf288a94ebd91b5265
Diffstat (limited to 'src/mem/bus.cc')
| -rw-r--r-- | src/mem/bus.cc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/mem/bus.cc b/src/mem/bus.cc index 6e6ba2380..b0636ecc2 100644 --- a/src/mem/bus.cc +++ b/src/mem/bus.cc @@ -52,9 +52,19 @@ Bus::getPort(const std::string &if_name, int idx) } else fatal("Default port already set\n"); } + int id; + if (if_name == "functional") { + if (!funcPort) { + id = maxId++; + funcPort = new BusPort(csprintf("%s-p%d-func", name(), id), this, id); + funcPortId = id; + interfaces[id] = funcPort; + } + return funcPort; + } // if_name ignored? forced to be empty? - int id = maxId++; + id = maxId++; assert(maxId < std::numeric_limits<typeof(maxId)>::max()); BusPort *bp = new BusPort(csprintf("%s-p%d", name(), id), this, id); interfaces[id] = bp; @@ -64,10 +74,15 @@ Bus::getPort(const std::string &if_name, int idx) void Bus::deletePortRefs(Port *p) { + BusPort *bp = dynamic_cast<BusPort*>(p); if (bp == NULL) panic("Couldn't convert Port* to BusPort*\n"); + // If this is our one functional port + if (funcPort == bp) + return; interfaces.erase(bp->getId()); + delete bp; } /** Get the ranges of anyone other buses that we are connected to. */ @@ -520,7 +535,7 @@ Bus::recvStatusChange(Port::Status status, int id) m5::hash_map<short,BusPort*>::iterator intIter; for (intIter = interfaces.begin(); intIter != interfaces.end(); intIter++) - if (intIter->first != id) + if (intIter->first != id && intIter->first != funcPortId) intIter->second->sendStatusChange(Port::RangeChange); if (id != defaultId && defaultPort) |