From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Fri, 18 Mar 2011 00:20:19 +0000 (-0500)
Subject: ARM: Previous change didn't end up setting instFlags, this does.
X-Git-Tag: stable_2012_02_02~473^2~14
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db350536555d7509b703b0707141e3f677645df0;p=gem5.git

ARM: Previous change didn't end up setting instFlags, this does.
---

diff --git a/src/arch/arm/isa/insts/str.isa b/src/arch/arm/isa/insts/str.isa
index f661961f7..e5d47c28f 100644
--- a/src/arch/arm/isa/insts/str.isa
+++ b/src/arch/arm/isa/insts/str.isa
@@ -222,7 +222,6 @@ let {{
         decConstBase = 'StoreExImm'
         basePrefix = 'MemoryExImm'
         nameFunc = staticmethod(storeImmClassName)
-        instFlags = ['IsStoreConditional']
 
         def __init__(self, *args, **kargs):
             super(StoreImmEx, self).__init__(*args, **kargs)
@@ -302,7 +301,6 @@ let {{
         decConstBase = 'StoreExDImm'
         basePrefix = 'MemoryExDImm'
         nameFunc = staticmethod(storeDoubleImmClassName)
-        instFlags = ['IsStoreConditional']
 
         def __init__(self, *args, **kargs):
             super(StoreDoubleImmEx, self).__init__(*args, **kargs)
@@ -370,10 +368,14 @@ let {{
 
     buildDoubleStores("strd")
 
-    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()
+    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()
 
     StoreImm("vstr", False, True, False, size=4, flavor="fp").emit()
     StoreImm("vstr", False, False, False, size=4, flavor="fp").emit()