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/fp.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/fp.isa')
| -rw-r--r-- | src/arch/arm/isa/formats/fp.isa | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/src/arch/arm/isa/formats/fp.isa b/src/arch/arm/isa/formats/fp.isa index 1dd05c223..fda1175b0 100644 --- a/src/arch/arm/isa/formats/fp.isa +++ b/src/arch/arm/isa/formats/fp.isa @@ -65,12 +65,11 @@ def template FPAExecute {{ %(op_decl)s; %(op_rd)s; - %(code)s; - - if (testPredicate(xc->readMiscReg(ArmISA::MISCREG_CPSR), condCode) && - fault == NoFault) - { - %(op_wb)s; + if (%(predicate_test)s) { + %(code)s; + if (fault == NoFault) { + %(op_wb)s; + } } return fault; @@ -102,13 +101,19 @@ def format FloatOp(code, *flags) {{ orig_code = code cblk = code - iop = InstObjParams(name, Name, 'FPAOp', cblk, flags) + iop = InstObjParams(name, Name, 'FPAOp', + {"code": cblk, + "predicate_test": predicateTest}, + flags) header_output = BasicDeclare.subst(iop) decoder_output = BasicConstructor.subst(iop) exec_output = FPAExecute.subst(iop) sng_cblk = code - sng_iop = InstObjParams(name, Name+'S', 'FPAOp', sng_cblk, flags) + sng_iop = InstObjParams(name, Name+'S', 'FPAOp', + {"code": sng_cblk, + "predicate_test": predicateTest}, + flags) header_output += BasicDeclare.subst(sng_iop) decoder_output += BasicConstructor.subst(sng_iop) exec_output += FPAExecute.subst(sng_iop) @@ -116,7 +121,10 @@ def format FloatOp(code, *flags) {{ dbl_code = re.sub(r'\.sf', '.df', orig_code) dbl_cblk = dbl_code - dbl_iop = InstObjParams(name, Name+'D', 'FPAOp', dbl_cblk, flags) + dbl_iop = InstObjParams(name, Name+'D', 'FPAOp', + {"code": dbl_cblk, + "predicate_test": predicateTest}, + flags) header_output += BasicDeclare.subst(dbl_iop) decoder_output += BasicConstructor.subst(dbl_iop) exec_output += FPAExecute.subst(dbl_iop) @@ -140,7 +148,10 @@ let {{ def format FloatCmp(fReg1, fReg2, *flags) {{ code = calcFPCcCode % vars() - iop = InstObjParams(name, Name, 'FPAOp', code, flags) + iop = InstObjParams(name, Name, 'FPAOp', + {"code": code, + "predicate_test": predicateTest}, + flags) header_output = BasicDeclare.subst(iop) decoder_output = BasicConstructor.subst(iop) decode_block = BasicDecode.subst(iop) |