summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2015-03-23 16:14:20 -0700
committerSteve Reinhardt <steve.reinhardt@amd.com>2015-03-23 16:14:20 -0700
commit6677b9122adb3d519843e187f72c0f0268dd732e (patch)
tree63604e61f6b40acac2c7b332e6f89b8cb4d4f206 /src/arch
parentc55749d9989cf472cebc0bc93ccfa5edff0f67a8 (diff)
downloadgem5-6677b9122adb3d519843e187f72c0f0268dd732e.tar.xz
mem: rename Locked/LOCKED to LockedRMW/LOCKED_RMW
Makes x86-style locked operations even more distinct from LLSC operations. Using "locked" by itself should be obviously ambiguous now.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/isa/microops/ldstop.isa4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/x86/isa/microops/ldstop.isa b/src/arch/x86/isa/microops/ldstop.isa
index c26e9932d..bccec36fe 100644
--- a/src/arch/x86/isa/microops/ldstop.isa
+++ b/src/arch/x86/isa/microops/ldstop.isa
@@ -409,7 +409,7 @@ let {{
'(StoreCheck << FlagShift)')
defineMicroLoadOp('Ldstl', 'Data = merge(Data, Mem, dataSize);',
'Data = Mem & mask(dataSize * 8);',
- '(StoreCheck << FlagShift) | Request::LOCKED')
+ '(StoreCheck << FlagShift) | Request::LOCKED_RMW')
defineMicroLoadOp('Ldfp', code='FpData_uqw = Mem', big = False)
@@ -461,7 +461,7 @@ let {{
defineMicroStoreOp('St', 'Mem = pick(Data, 2, dataSize);')
defineMicroStoreOp('Stul', 'Mem = pick(Data, 2, dataSize);',
- mem_flags="Request::LOCKED")
+ mem_flags="Request::LOCKED_RMW")
defineMicroStoreOp('Stfp', code='Mem = FpData_uqw;')