diff options
| author | Korey Sewell <ksewell@umich.edu> | 2009-07-31 10:40:42 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2009-07-31 10:40:42 -0400 |
| commit | aa75b9a7a7489bf86c4e6d406ff612e596ddff96 (patch) | |
| tree | 58a6816583a21c19c181e32bff10bf74aa9ad15f /src/arch/arm/isa/formats/pred.isa | |
| parent | 60063cc700912666fa8b7968d692d00a1e82cb67 (diff) | |
| parent | 3dd3de5feb31055a48acb39575da25a9cea2626d (diff) | |
| download | gem5-aa75b9a7a7489bf86c4e6d406ff612e596ddff96.tar.xz | |
merge mips fix and statetrace changes
Diffstat (limited to 'src/arch/arm/isa/formats/pred.isa')
| -rw-r--r-- | src/arch/arm/isa/formats/pred.isa | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/arm/isa/formats/pred.isa b/src/arch/arm/isa/formats/pred.isa index 50e162f3d..e90788c91 100644 --- a/src/arch/arm/isa/formats/pred.isa +++ b/src/arch/arm/isa/formats/pred.isa @@ -105,7 +105,8 @@ let {{ def getCcCode(flagtype): icReg = icImm = iv = '' if flagtype == "none": - icReg = icImm = iv = '1' + icReg = icImm = 'Cpsr<29:>' + iv = 'Cpsr<28:>' elif flagtype == "add": icReg = icImm = 'findCarry(32, resTemp, Rn, op2)' iv = 'findOverflow(32, resTemp, Rn, op2)' @@ -125,7 +126,8 @@ let {{ def getImmCcCode(flagtype): ivValue = icValue = '' if flagtype == "none": - icValue = ivValue = '1' + icValue = 'Cpsr<29:>' + ivValue = 'Cpsr<28:>' elif flagtype == "add": icValue = 'findCarry(32, resTemp, Rn, rotated_imm)' ivValue = 'findOverflow(32, resTemp, Rn, rotated_imm)' |