projects
/
gem5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e09ae14
)
ARM: Mul and mla ignore the c and v flags, but we were setting them to 1.
author
Gabe Black
<gblack@eecs.umich.edu>
Thu, 30 Jul 2009 05:24:00 +0000
(22:24 -0700)
committer
Gabe Black
<gblack@eecs.umich.edu>
Thu, 30 Jul 2009 05:24:00 +0000
(22:24 -0700)
src/arch/arm/isa/formats/pred.isa
patch
|
blob
|
history
diff --git
a/src/arch/arm/isa/formats/pred.isa
b/src/arch/arm/isa/formats/pred.isa
index 50e162f3d8100a6b05a689ebccbed58d89f4bdfc..e90788c918af38fefa1b747baeeb8b423a9dd6f3 100644
(file)
--- 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":
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)'
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":
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)'
elif flagtype == "add":
icValue = 'findCarry(32, resTemp, Rn, rotated_imm)'
ivValue = 'findOverflow(32, resTemp, Rn, rotated_imm)'