diff options
| author | Derek Hower <drh5@cs.wisc.edu> | 2009-08-25 10:37:21 -0500 |
|---|---|---|
| committer | Derek Hower <drh5@cs.wisc.edu> | 2009-08-25 10:37:21 -0500 |
| commit | 15aa18057030e00535b6c6df7649f73e6b794d50 (patch) | |
| tree | 8496ed38761ce3b042dae422d3ef6d4fca95e1b6 /src/mem/ruby/system/Sequencer.hh | |
| parent | 6cd552483b3499acea94568221a4723ce290fe41 (diff) | |
| parent | a4fc1bad94f028111dcf36ac53c42e5dab79605d (diff) | |
| download | gem5-15aa18057030e00535b6c6df7649f73e6b794d50.tar.xz | |
merge
Diffstat (limited to 'src/mem/ruby/system/Sequencer.hh')
| -rw-r--r-- | src/mem/ruby/system/Sequencer.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh index 2b1f023c5..e75cdaa3a 100644 --- a/src/mem/ruby/system/Sequencer.hh +++ b/src/mem/ruby/system/Sequencer.hh @@ -84,7 +84,7 @@ public: // called by Tester or Simics int64_t makeRequest(const RubyRequest & request); - bool isReady(const RubyRequest& request); + bool isReady(const RubyRequest& request, bool dont_set = false); bool empty() const; void print(ostream& out) const; @@ -125,7 +125,7 @@ private: // Global outstanding request count, across all request tables int m_outstanding_count; bool m_deadlock_check_scheduled; - int m_servicing_atomic; + unsigned m_servicing_atomic; int m_atomics_counter; }; |