From: Marcus Shawcroft <mshawcroft@sourceware.org>
Date: Tue, 5 Feb 2013 13:54:38 +0000 (+0000)
Subject:         * aarch64-tdep.c (aarch64_analyze_prologue): ARI fix:
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=14ac654fb82690ec8bf8b9dd621c174ff8321460;p=binutils-gdb.git

    * aarch64-tdep.c (aarch64_analyze_prologue): ARI fix:
        Refactor if statement to avoid trailing || operator.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 283f1868852..a88999123ee 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 ac4ed172b97..ebc78d6a50c 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;