RFA: score-tdep.c: avoid mixed declarations and statements

RFA: score-tdep.c: avoid mixed declarations and statements

[Jim Blandy]

We recently added -Wdeclaration-after-statement to GDB's set of build
warnings, which caught the new S+core port.

Okay to commit?

gdb/ChangeLog:
2007-01-08  Jim Blandy  <jimb@codesourcery.com>

	* score-tdep.c (score_push_dummy_call): Don't mix declarations and
	statements.

? gdb/autom4te.cache
Index: gdb/score-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/score-tdep.c,v
retrieving revision 1.1
diff -u -p -r1.1 score-tdep.c
--- gdb/score-tdep.c	4 Jan 2007 07:09:54 -0000	1.1
+++ gdb/score-tdep.c	8 Jan 2007 22:57:33 -0000
@@ -435,14 +435,15 @@ score_push_dummy_call (struct gdbarch *g
     {
       struct value *arg = args[argnum];
       struct type *arg_type = check_typedef (value_type (arg));
-      arglen = TYPE_LENGTH (arg_type);
       enum type_code typecode = TYPE_CODE (arg_type);
       const gdb_byte *val = value_contents (arg);
       int downward_offset = 0;
+      int odd_sized_struct_p;
+      int arg_last_part_p = 0;
 
-      int odd_sized_struct_p = (arglen > SCORE_REGSIZE
+      arglen = TYPE_LENGTH (arg_type);
+      odd_sized_struct_p = (arglen > SCORE_REGSIZE
                                 && arglen % SCORE_REGSIZE != 0);
-      int arg_last_part_p = 0;
 
       /* If a arg should be aligned to 8 bytes (long long or double),
          the value should be put to even register numbers.  */

Re: RFA: score-tdep.c: avoid mixed declarations and statements

[Daniel Jacobowitz]

On Mon, Jan 08, 2007 at 03:04:09PM -0800, Jim Blandy wrote:
> 
> We recently added -Wdeclaration-after-statement to GDB's set of build
> warnings, which caught the new S+core port.
> 
> Okay to commit?

OK.

-- 
Daniel Jacobowitz
CodeSourcery

Re: RFA: score-tdep.c: avoid mixed declarations and statements

[qinwei]

> We recently added -Wdeclaration-after-statement to GDB's set of build
> warnings, which caught the new S+core port.
> 
> Okay to commit?
> 
> gdb/ChangeLog:
> 2007-01-08  Jim Blandy  <jimb@codesourcery.com>
> 
>    * score-tdep.c (score_push_dummy_call): Don't mix declarations and
>    statements.
> 
> ? gdb/autom4te.cache
> Index: gdb/score-tdep.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/score-tdep.c,v
> retrieving revision 1.1
> diff -u -p -r1.1 score-tdep.c
> --- gdb/score-tdep.c   4 Jan 2007 07:09:54 -0000   1.1
> +++ gdb/score-tdep.c   8 Jan 2007 22:57:33 -0000
> @@ -435,14 +435,15 @@ score_push_dummy_call (struct gdbarch *g
>      {
>        struct value *arg = args[argnum];
>        struct type *arg_type = check_typedef (value_type (arg));
> -      arglen = TYPE_LENGTH (arg_type);
>        enum type_code typecode = TYPE_CODE (arg_type);
>        const gdb_byte *val = value_contents (arg);
>        int downward_offset = 0;
> +      int odd_sized_struct_p;
> +      int arg_last_part_p = 0;
> 
> -      int odd_sized_struct_p = (arglen > SCORE_REGSIZE
> +      arglen = TYPE_LENGTH (arg_type);
> +      odd_sized_struct_p = (arglen > SCORE_REGSIZE
>                                  && arglen % SCORE_REGSIZE != 0);
> -      int arg_last_part_p = 0;
> 
>        /* If a arg should be aligned to 8 bytes (long long or double),
>           the value should be put to even register numbers.  */

OK.

Best regards,
Qinwei
Mail  qinwei@sunnorth.com.cn
Phone +86-010-62981668-2708
Fax   +86-010-62985972

Re: RFA: score-tdep.c: avoid mixed declarations and statements

[Mark Kettenis]

> From: Jim Blandy <jimb@codesourcery.com>
> Date: Mon, 08 Jan 2007 15:04:09 -0800
> 
> We recently added -Wdeclaration-after-statement to GDB's set of build
> warnings, which caught the new S+core port.
> 
> Okay to commit?

I'd say this is abvious.

> gdb/ChangeLog:
> 2007-01-08  Jim Blandy  <jimb@codesourcery.com>
> 
> 	* score-tdep.c (score_push_dummy_call): Don't mix declarations and
> 	statements.

Re: RFA: score-tdep.c: avoid mixed declarations and statements

[Jim Blandy]

qinwei<qinwei@sunnorth.com.cn> writes:
>> gdb/ChangeLog:
>> 2007-01-08  Jim Blandy  <jimb@codesourcery.com>
>> 
>>    * score-tdep.c (score_push_dummy_call): Don't mix declarations and
>>    statements.
>> 
>
> OK.

Committed --- thanks.