diff options
Diffstat (limited to 'src/mem')
-rw-r--r-- | src/mem/ruby/system/RubyPort.cc | 10 | ||||
-rw-r--r-- | src/mem/ruby/system/RubyPort.hh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mem/ruby/system/RubyPort.cc b/src/mem/ruby/system/RubyPort.cc index c55b4a2c2..aff129b50 100644 --- a/src/mem/ruby/system/RubyPort.cc +++ b/src/mem/ruby/system/RubyPort.cc @@ -188,7 +188,7 @@ RubyPort::M5Port::recvTiming(PacketPtr pkt) "Request for address 0x%#x is assumed to be a pio request\n", pkt->getAddr()); - return ruby_port->pio_port.sendTiming(pkt); + return ruby_port->pio_port.sendNextCycle(pkt); } assert(Address(pkt->getAddr()).getOffset() + pkt->getSize() <= @@ -637,7 +637,7 @@ RubyPort::M5Port::hitCallback(PacketPtr pkt) // turn packet around to go back to requester if response expected if (needsResponse) { DPRINTF(RubyPort, "Sending packet back over port\n"); - sendTiming(pkt); + sendNextCycle(pkt); } else { delete pkt; } @@ -645,7 +645,7 @@ RubyPort::M5Port::hitCallback(PacketPtr pkt) } bool -RubyPort::M5Port::sendTiming(PacketPtr pkt) +RubyPort::M5Port::sendNextCycle(PacketPtr pkt) { //minimum latency, must be > 0 schedSendTiming(pkt, curTick() + (1 * g_eventQueue_ptr->getClock())); @@ -653,7 +653,7 @@ RubyPort::M5Port::sendTiming(PacketPtr pkt) } bool -RubyPort::PioPort::sendTiming(PacketPtr pkt) +RubyPort::PioPort::sendNextCycle(PacketPtr pkt) { //minimum latency, must be > 0 schedSendTiming(pkt, curTick() + (1 * g_eventQueue_ptr->getClock())); @@ -690,6 +690,6 @@ RubyPort::ruby_eviction_callback(const Address& address) Request req(address.getAddress(), 0, 0, Request::funcMasterId); for (CpuPortIter it = cpu_ports.begin(); it != cpu_ports.end(); it++) { Packet *pkt = new Packet(&req, MemCmd::InvalidationReq, -1); - (*it)->sendTiming(pkt); + (*it)->sendNextCycle(pkt); } } 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); |