summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2013-02-10 21:26:25 -0600
committerNilay Vaish <nilay@cs.wisc.edu>2013-02-10 21:26:25 -0600
commit89f86dbd282066595f90a2163140b347f84aee44 (patch)
tree1102e699ebbe243c6ff5985105da663fa7a56bc6
parent7862478eef88d58d8da3c43663aa39bd4b604fc5 (diff)
downloadgem5-89f86dbd282066595f90a2163140b347f84aee44.tar.xz
ruby: Replace Time with Cycles in SequencerMessage
-rw-r--r--src/mem/ruby/system/Sequencer.cc2
-rw-r--r--src/mem/ruby/system/Sequencer.hh5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index d4cfe77b1..3481369bb 100644
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -88,7 +88,7 @@ Sequencer::wakeup()
assert(getDrainState() != Drainable::Draining);
// Check for deadlock of any of the requests
- Time current_time = curCycle();
+ Cycles current_time = curCycle();
// Check across all outstanding requests
int total_outstanding = 0;
diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh
index cc63a93a4..3fccd2566 100644
--- a/src/mem/ruby/system/Sequencer.hh
+++ b/src/mem/ruby/system/Sequencer.hh
@@ -46,9 +46,10 @@ struct SequencerRequest
{
PacketPtr pkt;
RubyRequestType m_type;
- Time issue_time;
+ Cycles issue_time;
- SequencerRequest(PacketPtr _pkt, RubyRequestType _m_type, Time _issue_time)
+ SequencerRequest(PacketPtr _pkt, RubyRequestType _m_type,
+ Cycles _issue_time)
: pkt(_pkt), m_type(_m_type), issue_time(_issue_time)
{}
};