Fix two misleading indentation warnings

Message ID 1454006626-10564-1-git-send-email-simon.marchi@ericsson.com
State Superseded
Headers

Commit Message

Simon Marchi Jan. 28, 2016, 6:43 p.m. UTC
  Two small changes so everything builds with latest GCC and its
-Wmisleading-indentation.

There is a slight possibility that these were actually bugs, and that the code
was meant to be included in the control structure just above, so I am not
pushing it as obvious.

gdb/ChangeLog:

	* aarch64-tdep.c (aarch64_record_asimd_load_store): Fix
	indentation.
	* xcoffread.c (scan_xcoff_symtab): Likewise.
---
 gdb/aarch64-tdep.c |  4 ++--
 gdb/xcoffread.c    | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)
  

Comments

Yao Qi Jan. 29, 2016, 1:57 p.m. UTC | #1
Simon Marchi <simon.marchi@ericsson.com> writes:

Hi Simon,

> diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
> index c7da618..4ac4191 100644
> --- a/gdb/aarch64-tdep.c
> +++ b/gdb/aarch64-tdep.c
> @@ -3199,8 +3199,8 @@ aarch64_record_asimd_load_store (insn_decode_record *aarch64_insn_r)
>                  record_buf_mem[mem_index++] = esize / 8;
>                  record_buf_mem[mem_index++] = address + addr_offset;
>                }
> -            addr_offset = addr_offset + (esize / 8);
> -            reg_rt = (reg_rt + 1) % 32;
> +	  addr_offset = addr_offset + (esize / 8);
> +	  reg_rt = (reg_rt + 1) % 32;
>          }
>      }

It is a bug.  The code here is to record the Advanced SIMD instructions
which load/store multiple elements into multiple registers.  So the
"reg_rt" should be updated in each iteration, and we should write these
two lines into the "for" loop body.

Do you want me to fix that or you want to adjust your patch and fix it
by yourself?  Either is OK to me.
  
Yao Qi Jan. 29, 2016, 2:07 p.m. UTC | #2
Simon Marchi <simon.marchi@ericsson.com> writes:

Hi Simon,

> diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
> index 533a33a..938261a 100644
> --- a/gdb/xcoffread.c
> +++ b/gdb/xcoffread.c
> @@ -2381,13 +2381,13 @@ scan_xcoff_symtab (struct objfile *objfile)
>  		    if (first_fun_line_offset == 0 && symbol.n_numaux > 1)
>  		      first_fun_line_offset =
>  			main_aux[0].x_sym.x_fcnary.x_fcn.x_lnnoptr;
> -		      {
> -			record_minimal_symbol
> -			  (namestring, symbol.n_value,
> -			   sclass == C_HIDEXT ? mst_file_text : mst_text,
> -			   symbol.n_scnum, objfile);
> -			misc_func_recorded = 1;
> -		      }
> +		    {
> +		      record_minimal_symbol
> +			(namestring, symbol.n_value,
> +			 sclass == C_HIDEXT ? mst_file_text : mst_text,
> +			 symbol.n_scnum, objfile);
> +		      misc_func_recorded = 1;
> +		    }
>  		    break;

This looks an indentation issue.  This block was added as a replacement
to RECORD_MINIMAL_SYMBOL which was indented correctly.
https://sourceware.org/ml/gdb-patches/2012-04/msg00440.html

A nit, can we remove the brackets ("{" and "}")?  Change to xcoffread.c
looks good to me.
  

Patch

diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index c7da618..4ac4191 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -3199,8 +3199,8 @@  aarch64_record_asimd_load_store (insn_decode_record *aarch64_insn_r)
                 record_buf_mem[mem_index++] = esize / 8;
                 record_buf_mem[mem_index++] = address + addr_offset;
               }
-            addr_offset = addr_offset + (esize / 8);
-            reg_rt = (reg_rt + 1) % 32;
+	  addr_offset = addr_offset + (esize / 8);
+	  reg_rt = (reg_rt + 1) % 32;
         }
     }
   /* Load/store multiple structure.  */
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 533a33a..938261a 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -2381,13 +2381,13 @@  scan_xcoff_symtab (struct objfile *objfile)
 		    if (first_fun_line_offset == 0 && symbol.n_numaux > 1)
 		      first_fun_line_offset =
 			main_aux[0].x_sym.x_fcnary.x_fcn.x_lnnoptr;
-		      {
-			record_minimal_symbol
-			  (namestring, symbol.n_value,
-			   sclass == C_HIDEXT ? mst_file_text : mst_text,
-			   symbol.n_scnum, objfile);
-			misc_func_recorded = 1;
-		      }
+		    {
+		      record_minimal_symbol
+			(namestring, symbol.n_value,
+			 sclass == C_HIDEXT ? mst_file_text : mst_text,
+			 symbol.n_scnum, objfile);
+		      misc_func_recorded = 1;
+		    }
 		    break;
 
 		  case XMC_GL: