diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2009-06-21 09:37:41 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2009-06-21 09:37:41 -0700 |
| commit | c20ce20e4c218e801db6f3495cb6bd1f5870156b (patch) | |
| tree | 73df979f0fb24cc9e74c8643996b453188b0154e /src/arch/arm/isa/formats/macromem.isa | |
| parent | 71e0d1ded278a85e33a628ddc842c975a216854f (diff) | |
| download | gem5-c20ce20e4c218e801db6f3495cb6bd1f5870156b.tar.xz | |
ARM: Make the isa parser aware that CPSR is being used.
Diffstat (limited to 'src/arch/arm/isa/formats/macromem.isa')
| -rw-r--r-- | src/arch/arm/isa/formats/macromem.isa | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/arch/arm/isa/formats/macromem.isa b/src/arch/arm/isa/formats/macromem.isa index bc055d74e..36a43de5e 100644 --- a/src/arch/arm/isa/formats/macromem.isa +++ b/src/arch/arm/isa/formats/macromem.isa @@ -370,7 +370,10 @@ def format ArmMacroStore(code, mem_flags = [], inst_flag = [], *opt_flags) {{ }}; def format ArmMacroFPAOp(code, mem_flags = [], inst_flag = [], *opt_flags) {{ - iop = InstObjParams(name, Name, 'ArmMacroFPAOp', code, opt_flags) + iop = InstObjParams(name, Name, 'ArmMacroFPAOp', + {"code": code, + "predicate_test": predicateTest}, + opt_flags) header_output = BasicDeclare.subst(iop) decoder_output = MacroFPAConstructor.subst(iop) decode_block = BasicDecode.subst(iop) @@ -378,7 +381,10 @@ def format ArmMacroFPAOp(code, mem_flags = [], inst_flag = [], *opt_flags) {{ }}; def format ArmMacroFMOp(code, mem_flags = [], inst_flag = [], *opt_flags) {{ - iop = InstObjParams(name, Name, 'ArmMacroFMOp', code, opt_flags) + iop = InstObjParams(name, Name, 'ArmMacroFMOp', + {"code": code, + "predicate_test": predicateTest}, + opt_flags) header_output = BasicDeclare.subst(iop) decoder_output = MacroFMConstructor.subst(iop) decode_block = BasicDecode.subst(iop) |