diff options
author | William Wang <william.wang@arm.com> | 2012-01-17 12:55:09 -0600 |
---|---|---|
committer | William Wang <william.wang@arm.com> | 2012-01-17 12:55:09 -0600 |
commit | e731cf4c1df8db0c7bcb689aba0146199a93b64e (patch) | |
tree | db67ff2b15ad6aca1c7f640d873237f59e9146a6 /src/mem/bus.cc | |
parent | 07cf9d914b292008ead7021182ec2ef8fc4671f1 (diff) | |
download | gem5-e731cf4c1df8db0c7bcb689aba0146199a93b64e.tar.xz |
MEM: Remove the functional ports from the memory system
The functional ports are no longer used and this patch cleans up the
legacy that is still present in buses, memories, CPUs etc. Note that
this does not refer to the class FunctionalPort (already removed), but
rather ports with the name (and use) functional.
Diffstat (limited to 'src/mem/bus.cc')
-rw-r--r-- | src/mem/bus.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/mem/bus.cc b/src/mem/bus.cc index 00caa8289..ea1ec7322 100644 --- a/src/mem/bus.cc +++ b/src/mem/bus.cc @@ -59,7 +59,7 @@ Bus::Bus(const BusParams *p) : MemObject(p), busId(p->bus_id), clock(p->clock), headerCycles(p->header_cycles), width(p->width), tickNextIdle(0), drainEvent(NULL), busIdle(this), inRetry(false), maxId(0), - defaultPort(NULL), funcPort(NULL), funcPortId(-4), + defaultPort(NULL), useDefaultRange(p->use_default_range), defaultBlockSize(p->block_size), cachedBlockSize(0), cachedBlockSizeValid(false) { @@ -87,16 +87,6 @@ Bus::getPort(const std::string &if_name, int idx) 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? id = maxId++; assert(maxId < std::numeric_limits<typeof(maxId)>::max()); @@ -546,7 +536,7 @@ Bus::recvRangeChange(int id) m5::hash_map<short,BusPort*>::iterator intIter; for (intIter = interfaces.begin(); intIter != interfaces.end(); intIter++) - if (intIter->first != id && intIter->first != funcPortId) + if (intIter->first != id) intIter->second->sendRangeChange(); if (id != defaultId && defaultPort) |