summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2009-05-12 22:33:05 -0700
committerNathan Binkert <nate@binkert.org>2009-05-12 22:33:05 -0700
commit82c9e6a5fc9bd2b68e19e00381e5e87f291da659 (patch)
treebd64f0138069f3f67aa33f637bcf61d43456c336
parent0c2b9cf90dc7c63f8d102a0d4285101a03bc5b91 (diff)
downloadgem5-82c9e6a5fc9bd2b68e19e00381e5e87f291da659.tar.xz
gcc: work around a bogus gcc error
-rw-r--r--src/arch/arm/isa/util.isa16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/arch/arm/isa/util.isa b/src/arch/arm/isa/util.isa
index 4fe0d732c..20eb80ecf 100644
--- a/src/arch/arm/isa/util.isa
+++ b/src/arch/arm/isa/util.isa
@@ -242,8 +242,8 @@ output exec {{
return ((arm_NEG(lhs) && arm_NEG(rhs)) ||
(arm_NEG(lhs) && arm_POS(result)) ||
(arm_NEG(rhs) && arm_POS(result)));
- else
- return 0;
+
+ return 0;
}
// Generate the appropriate carry bit for a subtraction operation
@@ -254,8 +254,8 @@ output exec {{
return ((arm_NEG(lhs) && arm_POS(rhs)) ||
(arm_NEG(lhs) && arm_POS(result)) ||
(arm_POS(rhs) && arm_POS(result)));
- else
- return 0;
+
+ return 0;
}
inline int32_t
@@ -264,8 +264,8 @@ output exec {{
if ((lhs | rhs) >> 30)
return ((arm_NEG(lhs) && arm_NEG(rhs) && arm_POS(result)) ||
(arm_POS(lhs) && arm_POS(rhs) && arm_NEG(result)));
- else
- return 0;
+
+ return 0;
}
inline int32_t
@@ -274,8 +274,8 @@ output exec {{
if ((lhs >= rhs) || ((rhs | lhs) >> 31))
return ((arm_NEG(lhs) && arm_POS(rhs) && arm_POS(result)) ||
(arm_POS(lhs) && arm_NEG(rhs) && arm_NEG(result)));
- else
- return 0;
+
+ return 0;
}
}};