summaryrefslogtreecommitdiff
path: root/src/mem/cache/coherence/coherence_protocol.hh
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-10-21 13:43:14 -0700
committerSteve Reinhardt <stever@eecs.umich.edu>2006-10-21 13:43:14 -0700
commit1e6aa0d0d0810f19a896714e3d13561ebb401543 (patch)
treeb13fd7d7245ff08b0a3f681fd0649394c33a9547 /src/mem/cache/coherence/coherence_protocol.hh
parentfdad936f799d38f1763ffd0b39855b179458cb8c (diff)
downloadgem5-1e6aa0d0d0810f19a896714e3d13561ebb401543.tar.xz
Refactor coherence state table initialization.
--HG-- extra : convert_revision : eb36dd2cc1463e5076f4758a59cf68cc6b2bafc5
Diffstat (limited to 'src/mem/cache/coherence/coherence_protocol.hh')
-rw-r--r--src/mem/cache/coherence/coherence_protocol.hh20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/mem/cache/coherence/coherence_protocol.hh b/src/mem/cache/coherence/coherence_protocol.hh
index b30fb053b..481277523 100644
--- a/src/mem/cache/coherence/coherence_protocol.hh
+++ b/src/mem/cache/coherence/coherence_protocol.hh
@@ -211,31 +211,25 @@ class CoherenceProtocol : public SimObject
friend class CoherenceProtocol::StateTransition;
/** Mask to select status bits relevant to coherence protocol. */
- const static CacheBlk::State
- stateMask = BlkValid | BlkWritable | BlkDirty;
+ static const int stateMask = BlkValid | BlkWritable | BlkDirty;
/** The Modified (M) state. */
- const static CacheBlk::State
- Modified = BlkValid | BlkWritable | BlkDirty;
+ static const int Modified = BlkValid | BlkWritable | BlkDirty;
/** The Owned (O) state. */
- const static CacheBlk::State
- Owned = BlkValid | BlkDirty;
+ static const int Owned = BlkValid | BlkDirty;
/** The Exclusive (E) state. */
- const static CacheBlk::State
- Exclusive = BlkValid | BlkWritable;
+ static const int Exclusive = BlkValid | BlkWritable;
/** The Shared (S) state. */
- const static CacheBlk::State
- Shared = BlkValid;
+ static const int Shared = BlkValid;
/** The Invalid (I) state. */
- const static CacheBlk::State
- Invalid = 0;
+ static const int Invalid = 0;
/**
* Maximum state encoding value (used to size transition lookup
* table). Could be more than number of states, depends on
* encoding of status bits.
*/
- const static int stateMax = stateMask;
+ static const int stateMax = stateMask;
/**
* The table of all possible transitions, organized by starting state and