summaryrefslogtreecommitdiff
path: root/src/arch/arm/isa/formats/util.isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2009-06-21 09:37:41 -0700
committerGabe Black <gblack@eecs.umich.edu>2009-06-21 09:37:41 -0700
commitc20ce20e4c218e801db6f3495cb6bd1f5870156b (patch)
tree73df979f0fb24cc9e74c8643996b453188b0154e /src/arch/arm/isa/formats/util.isa
parent71e0d1ded278a85e33a628ddc842c975a216854f (diff)
downloadgem5-c20ce20e4c218e801db6f3495cb6bd1f5870156b.tar.xz
ARM: Make the isa parser aware that CPSR is being used.
Diffstat (limited to 'src/arch/arm/isa/formats/util.isa')
-rw-r--r--src/arch/arm/isa/formats/util.isa14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/arch/arm/isa/formats/util.isa b/src/arch/arm/isa/formats/util.isa
index 354f936d7..f60988bbb 100644
--- a/src/arch/arm/isa/formats/util.isa
+++ b/src/arch/arm/isa/formats/util.isa
@@ -58,14 +58,18 @@ def LoadStoreBase(name, Name, ea_code, memacc_code, mem_flags, inst_flags,
# they differ only in the set of code objects contained (which in
# turn affects the object's overall operand list).
iop = InstObjParams(name, Name, base_class,
- { 'ea_code':ea_code, 'memacc_code':memacc_code},
+ {'ea_code': ea_code,
+ 'memacc_code': memacc_code,
+ 'predicate_test': predicateTest},
inst_flags)
ea_iop = InstObjParams(name, Name, base_class,
- { 'ea_code':ea_code },
- inst_flags)
+ {'ea_code': ea_code,
+ 'predicate_test': predicateTest},
+ inst_flags)
memacc_iop = InstObjParams(name, Name, base_class,
- { 'memacc_code':memacc_code},
- inst_flags)
+ {'memacc_code': memacc_code,
+ 'predicate_test': predicateTest},
+ inst_flags)
if mem_flags:
s = '\n\tmemAccessFlags = ' + string.join(mem_flags, '|') + ';'