From 253e8edf13c4d7bee6bd13f84fdfa6cf40a0c5c3 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Sun, 10 Feb 2013 21:43:10 -0600 Subject: ruby: replace Time with Cycles (final patch in the series) This patch is as of now the final patch in the series of patches that replace Time with Cycles.This patch further replaces Time with Cycles in Sequencer, Profiler, different protocols and related entities. Though Time has not been completely removed, the places where it is in use seem benign as of now. --- src/mem/ruby/system/Sequencer.hh | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/mem/ruby/system/Sequencer.hh') diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh index 3fccd2566..b3ec4d10a 100644 --- a/src/mem/ruby/system/Sequencer.hh +++ b/src/mem/ruby/system/Sequencer.hh @@ -70,29 +70,29 @@ class Sequencer : public RubyPort void writeCallback(const Address& address, DataBlock& data); - void writeCallback(const Address& address, - GenericMachineType mach, + void writeCallback(const Address& address, + GenericMachineType mach, DataBlock& data); - void writeCallback(const Address& address, - GenericMachineType mach, + void writeCallback(const Address& address, + GenericMachineType mach, DataBlock& data, - Time initialRequestTime, - Time forwardRequestTime, - Time firstResponseTime); + Cycles initialRequestTime, + Cycles forwardRequestTime, + Cycles firstResponseTime); void readCallback(const Address& address, DataBlock& data); - void readCallback(const Address& address, - GenericMachineType mach, + void readCallback(const Address& address, + GenericMachineType mach, DataBlock& data); - void readCallback(const Address& address, - GenericMachineType mach, + void readCallback(const Address& address, + GenericMachineType mach, DataBlock& data, - Time initialRequestTime, - Time forwardRequestTime, - Time firstResponseTime); + Cycles initialRequestTime, + Cycles forwardRequestTime, + Cycles firstResponseTime); RequestStatus makeRequest(PacketPtr pkt); bool empty() const; @@ -122,13 +122,13 @@ class Sequencer : public RubyPort private: void issueRequest(PacketPtr pkt, RubyRequestType type); - void hitCallback(SequencerRequest* request, + void hitCallback(SequencerRequest* request, GenericMachineType mach, DataBlock& data, bool success, - Time initialRequestTime, - Time forwardRequestTime, - Time firstResponseTime); + Cycles initialRequestTime, + Cycles forwardRequestTime, + Cycles firstResponseTime); RequestStatus insertRequest(PacketPtr pkt, RubyRequestType request_type); @@ -152,10 +152,10 @@ class Sequencer : public RubyPort int m_outstanding_count; bool m_deadlock_check_scheduled; - int m_store_waiting_on_load_cycles; - int m_store_waiting_on_store_cycles; - int m_load_waiting_on_store_cycles; - int m_load_waiting_on_load_cycles; + uint32_t m_store_waiting_on_load_cycles; + uint32_t m_store_waiting_on_store_cycles; + uint32_t m_load_waiting_on_store_cycles; + uint32_t m_load_waiting_on_load_cycles; bool m_usingNetworkTester; -- cgit v1.2.3