* aarch64-tdep.c (aarch64_analyze_prologue): ARI fix:

        Refactor if statement to avoid trailing || operator.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 283f186885266c1c3d23caa19203043b3a56c8a1..a88999123eea372d76e9952735ffa8030ec521f5 100644 (file)
--- 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 ac4ed172b97f2625375962144c6a957e1a04d514..ebc78d6a50cf0eebfc4b8444949a55dd40349870 100644 (file)
--- 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;