diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2015-07-07 09:51:04 +0100 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2015-07-07 09:51:04 +0100 |
| commit | e9c3d59aae58f8fcf77ce5cf4b985dc9e2a90de2 (patch) | |
| tree | 799c50d9a0b99f1623a16d9c1d49f4cb0d1fcbaf /src/mem/cache | |
| parent | 1dc5e63b889647a153f01351f560a3beaa41f293 (diff) | |
| download | gem5-e9c3d59aae58f8fcf77ce5cf4b985dc9e2a90de2.tar.xz | |
sim: Make the drain state a global typed enum
The drain state enum is currently a part of the Drainable
interface. The same state machine will be used by the DrainManager to
identify the global state of the simulator. Make the drain state a
global typed enum to better cater for this usage scenario.
Diffstat (limited to 'src/mem/cache')
| -rw-r--r-- | src/mem/cache/base.cc | 4 | ||||
| -rw-r--r-- | src/mem/cache/mshr_queue.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc index 1d0b9a3dd..e58d5f6b9 100644 --- a/src/mem/cache/base.cc +++ b/src/mem/cache/base.cc @@ -783,12 +783,12 @@ BaseCache::drain(DrainManager *dm) // Set status if (count != 0) { - setDrainState(Drainable::Draining); + setDrainState(DrainState::Draining); DPRINTF(Drain, "Cache not drained\n"); return count; } - setDrainState(Drainable::Drained); + setDrainState(DrainState::Drained); return 0; } diff --git a/src/mem/cache/mshr_queue.cc b/src/mem/cache/mshr_queue.cc index f8587e1f1..3736c9f21 100644 --- a/src/mem/cache/mshr_queue.cc +++ b/src/mem/cache/mshr_queue.cc @@ -186,7 +186,7 @@ MSHRQueue::deallocateOne(MSHR *mshr) DPRINTF(Drain, "MSHRQueue now empty, signalling drained\n"); drainManager->signalDrainDone(); drainManager = NULL; - setDrainState(Drainable::Drained); + setDrainState(DrainState::Drained); } return retval; } @@ -269,11 +269,11 @@ unsigned int MSHRQueue::drain(DrainManager *dm) { if (allocated == 0) { - setDrainState(Drainable::Drained); + setDrainState(DrainState::Drained); return 0; } else { drainManager = dm; - setDrainState(Drainable::Draining); + setDrainState(DrainState::Draining); return 1; } } |