Giacomo Travaglini has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/15816 )
Change subject: arch-arm: IsStoreConditional flag set depending on flavor
......................................................................
arch-arm: IsStoreConditional flag set depending on flavor
This patch is aligning A32 with A64 where the IsStoreConditional flag
doesn't have to be specified manually in the instruction implementation,
but will be automatically added to any exclusive store.
Change-Id: Id02ed6fc2beeca6d125017393714a7c6eb3d8a33
Signed-off-by: Giacomo Travaglini <[email protected]>
Reviewed-by: Nikos Nikoleris <[email protected]>
Reviewed-by: Andreas Sandberg <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/15816
Maintainer: Andreas Sandberg <[email protected]>
---
M src/arch/arm/isa/insts/str.isa
1 file changed, 12 insertions(+), 11 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
diff --git a/src/arch/arm/isa/insts/str.isa b/src/arch/arm/isa/insts/str.isa
index c165eaf..ea412aa 100644
--- a/src/arch/arm/isa/insts/str.isa
+++ b/src/arch/arm/isa/insts/str.isa
@@ -48,8 +48,7 @@
execBase = 'Store'
def __init__(self, mnem, post, add, writeback, size=4,
- sign=False, user=False, flavor="normal",
- instFlags = []):
+ sign=False, user=False, flavor="normal"):
super(StoreInst, self).__init__()
self.name = mnem
@@ -60,7 +59,7 @@
self.sign = sign
self.user = user
self.flavor = flavor
- self.instFlags = instFlags
+ self.instFlags = []
if self.add:
self.op = " +"
else:
@@ -185,6 +184,7 @@
self.memFlags.append("ArmISA::TLB::UserMode")
if self.flavor == "exclusive":
+ self.instFlags.append("IsStoreConditional")
self.memFlags.append("Request::LLSC")
elif self.flavor != "fp":
self.memFlags.append("ArmISA::TLB::AllowUnaligned")
@@ -259,6 +259,7 @@
# Add memory request flags where necessary
if self.flavor == "exclusive":
+ self.instFlags.append("IsStoreConditional")
self.memFlags.append("Request::LLSC")
self.memFlags.append("ArmISA::TLB::AlignDoubleWord")
else:
@@ -379,14 +380,14 @@
buildDoubleStores("strd")
- StoreImmEx("strex", False, True, False, size=4, flavor="exclusive",
- instFlags = ['IsStoreConditional']).emit()
- StoreImmEx("strexh", False, True, False, size=2, flavor="exclusive",
- instFlags = ['IsStoreConditional']).emit()
- StoreImmEx("strexb", False, True, False, size=1, flavor="exclusive",
- instFlags = ['IsStoreConditional']).emit()
- StoreDoubleImmEx("strexd", False, True, False, flavor="exclusive",
- instFlags = ['IsStoreConditional']).emit()
+ StoreImmEx("strex", False, True, False, size=4,
+ flavor="exclusive").emit()
+ StoreImmEx("strexh", False, True, False, size=2,
+ flavor="exclusive").emit()
+ StoreImmEx("strexb", False, True, False, size=1,
+ flavor="exclusive").emit()
+ StoreDoubleImmEx("strexd", False, True, False,
+ flavor="exclusive").emit()
StoreImm("vstr", False, True, False, size=4, flavor="fp").emit()
StoreImm("vstr", False, False, False, size=4, flavor="fp").emit()
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15816
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Id02ed6fc2beeca6d125017393714a7c6eb3d8a33
Gerrit-Change-Number: 15816
Gerrit-PatchSet: 2
Gerrit-Owner: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
