summaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
authorDerek Hower <drh5@cs.wisc.edu>2009-10-07 15:48:26 -0500
committerDerek Hower <drh5@cs.wisc.edu>2009-10-07 15:48:26 -0500
commit45052162821bf3da71322302a7aeb758b5e0901c (patch)
treebc5c302a06143aad3061b004004c303eb93e4366 /src/mem
parentd9a24500543a4c2f0e28f9a1c66118a19f85f495 (diff)
parent4f463b3a266f4d7524f5f7b0c6722a1a2660e120 (diff)
downloadgem5-45052162821bf3da71322302a7aeb758b5e0901c.tar.xz
merge
Diffstat (limited to 'src/mem')
-rw-r--r--src/mem/ruby/system/Sequencer.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index bcfa0e954..bef0d5412 100644
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -45,7 +45,7 @@
//Sequencer::Sequencer(int core_id, MessageBuffer* mandatory_q)
#define LLSC_FAIL -2
-
+long int already = 0;
Sequencer::Sequencer(const string & name)
:RubyPort(name)
{
@@ -354,9 +354,6 @@ void Sequencer::hitCallback(SequencerRequest* srequest, DataBlock& data) {
// Returns true if the sequencer already has a load or store outstanding
int Sequencer::isReady(const RubyRequest& request) {
- // POLINA: check if we are currently flushing the write buffer, if so Ruby is returned as not ready
- // to simulate stalling of the front-end
- // Do we stall all the sequencers? If it is atomic instruction - yes!
if (m_outstanding_count >= m_max_outstanding_requests) {
return LIBRUBY_BUFFER_FULL;
}
@@ -417,6 +414,8 @@ void Sequencer::issueRequest(const RubyRequest& request) {
case RubyRequestType_IFETCH:
if (m_atomic_reads > 0 && m_atomic_writes == 0) {
m_controller->reset_atomics();
+ m_atomic_writes = 0;
+ m_atomic_reads = 0;
}
else if (m_atomic_writes > 0) {
assert(m_atomic_reads > m_atomic_writes);
@@ -428,6 +427,8 @@ void Sequencer::issueRequest(const RubyRequest& request) {
case RubyRequestType_LD:
if (m_atomic_reads > 0 && m_atomic_writes == 0) {
m_controller->reset_atomics();
+ m_atomic_writes = 0;
+ m_atomic_reads = 0;
}
else if (m_atomic_writes > 0) {
assert(m_atomic_reads > m_atomic_writes);
@@ -439,6 +440,8 @@ void Sequencer::issueRequest(const RubyRequest& request) {
case RubyRequestType_ST:
if (m_atomic_reads > 0 && m_atomic_writes == 0) {
m_controller->reset_atomics();
+ m_atomic_writes = 0;
+ m_atomic_reads = 0;
}
else if (m_atomic_writes > 0) {
assert(m_atomic_reads > m_atomic_writes);