From 2a740aa09682c32eb8f1f8880f279c943d8c6ee1 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Mon, 15 Oct 2012 08:12:35 -0400 Subject: Port: Add protocol-agnostic ports in the port hierarchy This patch adds an additional level of ports in the inheritance hierarchy, separating out the protocol-specific and protocl-agnostic parts. All the functionality related to the binding of ports is now confined to use BaseMaster/BaseSlavePorts, and all the protocol-specific parts stay in the Master/SlavePort. In the future it will be possible to add other protocol-specific implementations. The functions used in the binding of ports, i.e. getMaster/SlavePort now use the base classes, and the index parameter is updated to use the PortID typedef with the symbolic InvalidPortID as the default. --- src/mem/addr_mapper.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/mem/addr_mapper.cc') diff --git a/src/mem/addr_mapper.cc b/src/mem/addr_mapper.cc index 28fc85245..b754cb7e6 100644 --- a/src/mem/addr_mapper.cc +++ b/src/mem/addr_mapper.cc @@ -59,8 +59,8 @@ AddrMapper::init() slavePort.peerBlockSize(), masterPort.peerBlockSize()); } -MasterPort& -AddrMapper::getMasterPort(const std::string& if_name, int idx) +BaseMasterPort& +AddrMapper::getMasterPort(const std::string& if_name, PortID idx) { if (if_name == "master") { return masterPort; @@ -69,8 +69,8 @@ AddrMapper::getMasterPort(const std::string& if_name, int idx) } } -SlavePort& -AddrMapper::getSlavePort(const std::string& if_name, int idx) +BaseSlavePort& +AddrMapper::getSlavePort(const std::string& if_name, PortID idx) { if (if_name == "slave") { return slavePort; @@ -192,7 +192,7 @@ AddrMapper::recvTimingSnoopResp(PacketPtr pkt) bool AddrMapper::isSnooping() const { - if (slavePort.getMasterPort().isSnooping()) + if (slavePort.isSnooping()) fatal("AddrMapper doesn't support remapping of snooping requests\n"); return false; } @@ -266,7 +266,7 @@ AddrRangeList RangeAddrMapper::getAddrRanges() const { AddrRangeList ranges; - AddrRangeList actualRanges = masterPort.getSlavePort().getAddrRanges(); + AddrRangeList actualRanges = masterPort.getAddrRanges(); for (AddrRangeIter r = actualRanges.begin(); r != actualRanges.end(); ++r) { AddrRange range = *r; -- cgit v1.2.3