diff options
Diffstat (limited to 'src/mem/ruby')
-rw-r--r-- | src/mem/ruby/eventqueue/RubyEventQueue.hh | 2 | ||||
-rw-r--r-- | src/mem/ruby/system/RubyPort.cc | 4 | ||||
-rw-r--r-- | src/mem/ruby/system/Sequencer.cc | 4 | ||||
-rw-r--r-- | src/mem/ruby/system/System.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/mem/ruby/eventqueue/RubyEventQueue.hh b/src/mem/ruby/eventqueue/RubyEventQueue.hh index 6fa8b0ac3..3e2bc3f89 100644 --- a/src/mem/ruby/eventqueue/RubyEventQueue.hh +++ b/src/mem/ruby/eventqueue/RubyEventQueue.hh @@ -71,7 +71,7 @@ class RubyEventQueue : public EventManager RubyEventQueue(EventQueue* eventq, Tick _clock); ~RubyEventQueue(); - Time getTime() const { return curTick/m_clock; } + Time getTime() const { return curTick()/m_clock; } Tick getClock() const { return m_clock; } void scheduleEvent(Consumer* consumer, Time timeDelta); void scheduleEventAbsolute(Consumer* consumer, Time timeAbs); diff --git a/src/mem/ruby/system/RubyPort.cc b/src/mem/ruby/system/RubyPort.cc index f707af36f..ea1ff04f0 100644 --- a/src/mem/ruby/system/RubyPort.cc +++ b/src/mem/ruby/system/RubyPort.cc @@ -318,7 +318,7 @@ bool RubyPort::M5Port::sendTiming(PacketPtr pkt) { //minimum latency, must be > 0 - schedSendTiming(pkt, curTick + (1 * g_eventQueue_ptr->getClock())); + schedSendTiming(pkt, curTick() + (1 * g_eventQueue_ptr->getClock())); return true; } @@ -326,7 +326,7 @@ bool RubyPort::PioPort::sendTiming(PacketPtr pkt) { //minimum latency, must be > 0 - schedSendTiming(pkt, curTick + (1 * g_eventQueue_ptr->getClock())); + schedSendTiming(pkt, curTick() + (1 * g_eventQueue_ptr->getClock())); return true; } diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index 1a0f8a66a..6357980f2 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -132,7 +132,7 @@ Sequencer::wakeup() // If there are still outstanding requests, keep checking schedule(deadlockCheckEvent, m_deadlock_threshold * g_eventQueue_ptr->getClock() + - curTick); + curTick()); } } @@ -223,7 +223,7 @@ Sequencer::insertRequest(SequencerRequest* request) // See if we should schedule a deadlock check if (deadlockCheckEvent.scheduled() == false) { - schedule(deadlockCheckEvent, m_deadlock_threshold + curTick); + schedule(deadlockCheckEvent, m_deadlock_threshold + curTick()); } Address line_addr(request->ruby_request.paddr); diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc index a6d0d87d6..a704724ac 100644 --- a/src/mem/ruby/system/System.cc +++ b/src/mem/ruby/system/System.cc @@ -159,7 +159,7 @@ RubySystem::unserialize(Checkpoint *cp, const string §ion) // // The main purpose for clearing stats in the unserialize process is so // that the profiler can correctly set its start time to the unserialized - // value of curTick + // value of curTick() // clearStats(); } |