derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ruby: cleaned up access permission enum

Browse Source
This commit is contained in:
Brad Beckmann
2011-02-23 16:41:58 -08:00
parent c09a33e5d5
commit 3bc33eeaea
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mem/protocol/MESI_CMP_directory-L2cache.sm
View File

@@ -219,7 +219,7 @@ machine(L2Cache, "MESI Directory L2 Cache CMP")
} else if (state == State:M) {
cache_entry.changePermission(AccessPermission:Read_Write);
} else if (state == State:MT) {
cache_entry.changePermission(AccessPermission:Stale);
cache_entry.changePermission(AccessPermission:Invalid);
} else {
cache_entry.changePermission(AccessPermission:Busy);
}

20
src/mem/protocol/RubySlicc_Exports.sm
View File

@@ -47,14 +47,20 @@ external_type(DataBlock, desc="..."){
// Declarations of external types that are common to all protocols
// AccessPermission
// The following five states define the access permission of all memory blocks.
// These permissions have multiple uses. They coordinate locking and
// synchronization primitives, as well as enable functional accesses.
// One should not need to add any additional permission values and it is very
// risky to do so.
enumeration(AccessPermission, desc="...", default="AccessPermission_NotPresent") {
Busy, desc="No Read or Write";
Read_Only, desc="Read Only";
Read_Write, desc="Read/Write";
Invalid, desc="Invalid";
NotPresent, desc="NotPresent";
ReadUpgradingToWrite, desc="Read only, but trying to get Read/Write";
Stale, desc="local L1 has a modified copy, assume L2 copy is stale data";
// Valid data
Read_Only, desc="block is Read Only (modulo functional writes)";
Read_Write, desc="block is Read/Write";
// Invalid data
Invalid, desc="block is in an Invalid base state";
NotPresent, desc="block is NotPresent";
Busy, desc="block is in a transient state, currently invalid";
}
// TesterStatus

3
src/mem/ruby/slicc_interface/AbstractCacheEntry.cc
View File

@@ -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;
}
}

2
src/mem/ruby/system/PerfectCacheMemory.hh
View File

@@ -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;
}