summaryrefslogtreecommitdiff
path: root/src/mem/ruby/system/RubyPort.hh
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2012-03-02 09:16:50 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2012-03-02 09:16:50 -0500
commitadc419a13a698414a0623ce286cafebcdf2f272e (patch)
treec23df45d74fc761927fe7adc20a2b32ef55855fa /src/mem/ruby/system/RubyPort.hh
parentb129d7ce00a2cb6f0bbdcee90f0202cda8449117 (diff)
downloadgem5-adc419a13a698414a0623ce286cafebcdf2f272e.tar.xz
Ruby: Rename RubyPort::sendTiming to avoid overriding base class
This patch renames the sendTiming member function in the RubyPort to avoid inadvertently hiding Port::sendTiming (discovered through some rather painful debugging). The RubyPort does, in fact, rely on the functionality of the queued port and the implementation merely schedules a send the next cycle. The new name for the member function is sendNextCycle to better reflect this behaviour. In the unlikely event that we ever shift to using C++11 the member functions in Port should have a "final" identifier to prevent any overriding in derived classes.
Diffstat (limited to 'src/mem/ruby/system/RubyPort.hh')
-rw-r--r--src/mem/ruby/system/RubyPort.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/ruby/system/RubyPort.hh b/src/mem/ruby/system/RubyPort.hh
index 0d84ec216..4aa132131 100644
--- a/src/mem/ruby/system/RubyPort.hh
+++ b/src/mem/ruby/system/RubyPort.hh
@@ -57,7 +57,7 @@ class RubyPort : public MemObject
public:
M5Port(const std::string &_name, RubyPort *_port,
RubySystem*_system, bool _access_phys_mem);
- bool sendTiming(PacketPtr pkt);
+ bool sendNextCycle(PacketPtr pkt);
void hitCallback(PacketPtr pkt);
void evictionCallback(const Address& address);
unsigned deviceBlockSize() const;
@@ -88,7 +88,7 @@ class RubyPort : public MemObject
public:
PioPort(const std::string &_name, RubyPort *_port);
- bool sendTiming(PacketPtr pkt);
+ bool sendNextCycle(PacketPtr pkt);
protected:
virtual bool recvTiming(PacketPtr pkt);