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/arch/arm | |
| 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/arch/arm')
| -rw-r--r-- | src/arch/arm/table_walker.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc index f58d8a268..297054131 100644 --- a/src/arch/arm/table_walker.cc +++ b/src/arch/arm/table_walker.cc @@ -139,7 +139,7 @@ TableWalker::completeDrain() { if (drainManager && stateQueues[L1].empty() && stateQueues[L2].empty() && pendingQueue.empty()) { - setDrainState(Drainable::Drained); + setDrainState(DrainState::Drained); DPRINTF(Drain, "TableWalker done draining, processing drain event\n"); drainManager->signalDrainDone(); drainManager = NULL; @@ -160,13 +160,13 @@ TableWalker::drain(DrainManager *dm) if (state_queues_not_empty || pendingQueue.size()) { drainManager = dm; - setDrainState(Drainable::Draining); + setDrainState(DrainState::Draining); DPRINTF(Drain, "TableWalker not drained\n"); // return port drain count plus the table walker itself needs to drain return 1; } else { - setDrainState(Drainable::Drained); + setDrainState(DrainState::Drained); DPRINTF(Drain, "TableWalker free, no need to drain\n"); // table walker is drained, but its ports may still need to be drained |