summaryrefslogtreecommitdiff
path: root/src/arch/arm/isa/templates/pred.isa
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2013-03-04 23:33:47 -0500
committerAli Saidi <saidi@eecs.umich.edu>2013-03-04 23:33:47 -0500
commitf4fd12d49e9a4aea3ab3b538301b5fd0f657137b (patch)
tree6eb188a2f04f56c17061b21ec779095ab12c581a /src/arch/arm/isa/templates/pred.isa
parentaf8eb67fb44f7ab1831d6651ea4a079f2ebc99ff (diff)
downloadgem5-f4fd12d49e9a4aea3ab3b538301b5fd0f657137b.tar.xz
ARM: fix some cases where instructions that write to fp reg 15 are accidently branches.
Diffstat (limited to 'src/arch/arm/isa/templates/pred.isa')
-rw-r--r--src/arch/arm/isa/templates/pred.isa4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/arm/isa/templates/pred.isa b/src/arch/arm/isa/templates/pred.isa
index 918029cc2..42f515a3c 100644
--- a/src/arch/arm/isa/templates/pred.isa
+++ b/src/arch/arm/isa/templates/pred.isa
@@ -77,7 +77,7 @@ def template DataImmConstructor {{
}
}
- if (%(is_branch)s){
+ if (%(is_branch)s && !isFloating()){
flags[IsControl] = true;
flags[IsIndirectControl] = true;
if (condCode == COND_AL || condCode == COND_UC)
@@ -117,7 +117,7 @@ def template DataRegConstructor {{
}
}
- if (%(is_branch)s){
+ if (%(is_branch)s && !isFloating()){
flags[IsControl] = true;
flags[IsIndirectControl] = true;
if (condCode == COND_AL || condCode == COND_UC)