aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/aarch64-tdep.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 283f186..a889991 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-05 Marcus Shawcroft <marcus.shawcroft@arm.com>
+
+ * aarch64-tdep.c (aarch64_analyze_prologue): ARI fix:
+ Refactor if statement to avoid trailing || operator.
+
2013-02-05 Andreas Tobler <andreast@fgznet.ch>
* NEWS: Add PowerPC FreeBSD as a new native configuration.
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index ac4ed17..ebc78d6 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -773,8 +773,10 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch,
(perhaps because rn is not known) then we should abandon
further prologue analysis. */
if (pv_area_store_would_trash (stack,
- pv_add_constant (regs[rn], imm)) ||
- pv_area_store_would_trash (stack,
+ pv_add_constant (regs[rn], imm)))
+ break;
+
+ if (pv_area_store_would_trash (stack,
pv_add_constant (regs[rn], imm + 8)))
break;