[PATCH] Fix layout in aarch64-tdep.c

[PATCH] Fix layout in aarch64-tdep.c

[Marcus Shawcroft]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

This patch fixes the gripe:

0a1,2
 > gdb/aarch64-tdep.c:776: code: OP eol: Do not use &&, or || at the end 
of a line
gdb/aarch64-tdep.c:776:                                  pv_add_constant 
(regs[rn], imm)) ||


OK?

/Marcus

ChangeLog:
 

        * aarch64-tdep.c (aarch64_analyze_prologue): Refactor if statement
        with trailing || operator.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-aarch64-tdep-layout.diff --]
[-- Type: text/x-patch; name=0001-aarch64-tdep-layout.diff, Size: 607 bytes --]

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;
 

RE: [PATCH] Fix layout in aarch64-tdep.c

[Pierre Muller]

 All changes that simply remove the additional entry in the ARI
web page, and generated a "New ARI warning" message,
can be checked in as obvious.

  Thus, please do commit this fix,
the best would be to mention ARI rule in the ChangeLog entry.

Something like

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


Pierre Muller
as ARI maintainer. 

> -----Message d'origine-----
> De : gdb-patches-owner@sourceware.org [mailto:gdb-patches-
> owner@sourceware.org] De la part de Marcus Shawcroft
> Envoyé : mardi 5 février 2013 13:58
> À : gdb-patches@sourceware.org
> Objet : [PATCH] Fix layout in aarch64-tdep.c
> 
> This patch fixes the gripe:
> 
> 0a1,2
>  > gdb/aarch64-tdep.c:776: code: OP eol: Do not use &&, or || at the end
> of a line
> gdb/aarch64-tdep.c:776:                                  pv_add_constant
> (regs[rn], imm)) ||
> 
> 
> OK?
> 
> /Marcus
> 
> ChangeLog:
> 
> 
>         * aarch64-tdep.c (aarch64_analyze_prologue): Refactor if statement
>         with trailing || operator.

Re: [PATCH] Fix layout in aarch64-tdep.c

[Pedro Alves]

On 02/05/2013 12:57 PM, Marcus Shawcroft wrote:
> This patch fixes the gripe:
> 
> 0a1,2
>> gdb/aarch64-tdep.c:776: code: OP eol: Do not use &&, or || at the end of a line
> gdb/aarch64-tdep.c:776:                                  pv_add_constant (regs[rn], imm)) ||
> 
> 
> OK?

Of course.  Thanks.

-- 
Pedro Alves