summaryrefslogtreecommitdiff
path: root/src/mem/ruby
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2011-02-23 16:41:58 -0800
committerBrad Beckmann <Brad.Beckmann@amd.com>2011-02-23 16:41:58 -0800
commit3bc33eeaea3172fa65ec40f1e0eef9554eb51d8f (patch)
tree714c65fbe63ab35f85b813842093fe42515d272a /src/mem/ruby
parentc09a33e5d50bf445545b053d8f15a654ca9c302b (diff)
downloadgem5-3bc33eeaea3172fa65ec40f1e0eef9554eb51d8f.tar.xz
ruby: cleaned up access permission enum
Diffstat (limited to 'src/mem/ruby')
-rw-r--r--src/mem/ruby/slicc_interface/AbstractCacheEntry.cc3
-rw-r--r--src/mem/ruby/system/PerfectCacheMemory.hh2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc b/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc
index c0fe6ffd3..d53697c76 100644
--- a/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc
+++ b/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc
@@ -50,8 +50,7 @@ AbstractCacheEntry::changePermission(AccessPermission new_perm)
{
m_Permission = new_perm;
if ((new_perm == AccessPermission_Invalid) ||
- (new_perm == AccessPermission_NotPresent) ||
- (new_perm == AccessPermission_Stale)) {
+ (new_perm == AccessPermission_NotPresent)) {
m_locked = -1;
}
}
diff --git a/src/mem/ruby/system/PerfectCacheMemory.hh b/src/mem/ruby/system/PerfectCacheMemory.hh
index b04a64717..772b3d1f9 100644
--- a/src/mem/ruby/system/PerfectCacheMemory.hh
+++ b/src/mem/ruby/system/PerfectCacheMemory.hh
@@ -149,7 +149,7 @@ inline void
PerfectCacheMemory<ENTRY>::allocate(const Address& address)
{
PerfectCacheLineState<ENTRY> line_state;
- line_state.m_permission = AccessPermission_Busy;
+ line_state.m_permission = AccessPermission_Invalid;
line_state.m_entry = ENTRY();
m_map[line_address(address)] = line_state;
}