mips-tdep.c: Style fixes

mips-tdep.c: Style fixes

[Maciej W. Rozycki]

Hello,

 Applied as obvious:

2007-04-17  Maciej W. Rozycki  <macro@mips.com>

	* mips-tdep.c (mips_eabi_push_dummy_call): Rearrange some
	brackets.
	(mips_n32n64_push_dummy_call): Likewise.  Reformat some 
	expressions.
	(mips_o32_push_dummy_call): Likewise.
	(mips_o64_push_dummy_call): Likewise.

  Maciej

Index: gdb/mips-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mips-tdep.c,v
retrieving revision 1.412
diff -u -p -r1.412 mips-tdep.c
--- gdb/mips-tdep.c	17 Apr 2007 16:25:49 -0000	1.412
+++ gdb/mips-tdep.c	17 Apr 2007 16:26:24 -0000
@@ -2558,8 +2558,8 @@ mips_eabi_push_dummy_call (struct gdbarc
 	    {
 	      /* Remember if the argument was written to the stack.  */
 	      int stack_used_p = 0;
-	      int partial_len = (len < mips_abi_regsize (gdbarch)
-				 ? len : mips_abi_regsize (gdbarch));
+	      int partial_len = (len < mips_abi_regsize (gdbarch))
+				? len : mips_abi_regsize (gdbarch);
 
 	      if (mips_debug)
 		fprintf_unfiltered (gdb_stdlog, " -- partial=%d",
@@ -2785,8 +2785,8 @@ mips_n32n64_push_dummy_call (struct gdba
 	    {
 	      /* Remember if the argument was written to the stack.  */
 	      int stack_used_p = 0;
-	      int partial_len = (len < mips_abi_regsize (gdbarch)
-				 ? len : mips_abi_regsize (gdbarch));
+	      int partial_len = (len < mips_abi_regsize (gdbarch))
+				? len : mips_abi_regsize (gdbarch);
 
 	      if (mips_debug)
 		fprintf_unfiltered (gdb_stdlog, " -- partial=%d",
@@ -2871,10 +2871,10 @@ mips_n32n64_push_dummy_call (struct gdba
 
 		  if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG
 		      && partial_len < mips_abi_regsize (gdbarch)
-		      && (typecode == TYPE_CODE_STRUCT ||
-			  typecode == TYPE_CODE_UNION))
-		    regval <<= ((mips_abi_regsize (gdbarch) - partial_len) *
-				TARGET_CHAR_BIT);
+		      && (typecode == TYPE_CODE_STRUCT
+			  || typecode == TYPE_CODE_UNION))
+		    regval <<= (mips_abi_regsize (gdbarch) - partial_len)
+			       * TARGET_CHAR_BIT;
 
 		  if (mips_debug)
 		    fprintf_filtered (gdb_stdlog, " - reg=%d val=%s",
@@ -3219,8 +3219,8 @@ mips_o32_push_dummy_call (struct gdbarch
 	    {
 	      /* Remember if the argument was written to the stack.  */
 	      int stack_used_p = 0;
-	      int partial_len = (len < mips_abi_regsize (gdbarch)
-				 ? len : mips_abi_regsize (gdbarch));
+	      int partial_len = (len < mips_abi_regsize (gdbarch))
+				? len : mips_abi_regsize (gdbarch);
 
 	      if (mips_debug)
 		fprintf_unfiltered (gdb_stdlog, " -- partial=%d",
@@ -3306,10 +3306,10 @@ mips_o32_push_dummy_call (struct gdbarch
 		  if (mips_abi_regsize (gdbarch) < 8
 		      && TARGET_BYTE_ORDER == BFD_ENDIAN_BIG
 		      && partial_len < mips_abi_regsize (gdbarch)
-		      && (typecode == TYPE_CODE_STRUCT ||
-			  typecode == TYPE_CODE_UNION))
-		    regval <<= ((mips_abi_regsize (gdbarch) - partial_len) *
-				TARGET_CHAR_BIT);
+		      && (typecode == TYPE_CODE_STRUCT
+			  || typecode == TYPE_CODE_UNION))
+		    regval <<= (mips_abi_regsize (gdbarch) - partial_len)
+			       * TARGET_CHAR_BIT;
 
 		  if (mips_debug)
 		    fprintf_filtered (gdb_stdlog, " - reg=%d val=%s",
@@ -3680,8 +3680,8 @@ mips_o64_push_dummy_call (struct gdbarch
 	    {
 	      /* Remember if the argument was written to the stack.  */
 	      int stack_used_p = 0;
-	      int partial_len = (len < mips_abi_regsize (gdbarch)
-				 ? len : mips_abi_regsize (gdbarch));
+	      int partial_len = (len < mips_abi_regsize (gdbarch))
+				? len : mips_abi_regsize (gdbarch);
 
 	      if (mips_debug)
 		fprintf_unfiltered (gdb_stdlog, " -- partial=%d",
@@ -3750,10 +3750,10 @@ mips_o64_push_dummy_call (struct gdbarch
 
 		  if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG
 		      && partial_len < mips_abi_regsize (gdbarch)
-		      && (typecode == TYPE_CODE_STRUCT ||
-			  typecode == TYPE_CODE_UNION))
-		    regval <<= ((mips_abi_regsize (gdbarch) - partial_len) *
-				TARGET_CHAR_BIT);
+		      && (typecode == TYPE_CODE_STRUCT
+			  || typecode == TYPE_CODE_UNION))
+		    regval <<= (mips_abi_regsize (gdbarch) - partial_len)
+			       * TARGET_CHAR_BIT;
 
 		  if (mips_debug)
 		    fprintf_filtered (gdb_stdlog, " - reg=%d val=%s",

Re: mips-tdep.c: Style fixes

[Daniel Jacobowitz]

On Tue, Apr 17, 2007 at 06:57:09PM +0100, Maciej W. Rozycki wrote:
> -	      int partial_len = (len < mips_abi_regsize (gdbarch)
> -				 ? len : mips_abi_regsize (gdbarch));
> +	      int partial_len = (len < mips_abi_regsize (gdbarch))
> +				? len : mips_abi_regsize (gdbarch);

These (and most of the others) were actually there for a reason.
Emacs will move that second line leftwards if there isn't an outer
layer of parentheses; I believe GNU Indent and gdb_indent.sh will also.

-- 
Daniel Jacobowitz
CodeSourcery

Re: mips-tdep.c: Style fixes

[Maciej W. Rozycki]

On Tue, 17 Apr 2007, Daniel Jacobowitz wrote:

> > -	      int partial_len = (len < mips_abi_regsize (gdbarch)
> > -				 ? len : mips_abi_regsize (gdbarch));
> > +	      int partial_len = (len < mips_abi_regsize (gdbarch))
> > +				? len : mips_abi_regsize (gdbarch);
> 
> These (and most of the others) were actually there for a reason.
> Emacs will move that second line leftwards if there isn't an outer
> layer of parentheses; I believe GNU Indent and gdb_indent.sh will also.

 I can revert these, no problem -- it just looks strange and is not useful 
from the language's point of view to have the right-hand side of an 
assignment in brackets.  OTOH, this qualifies as a workaround for what 
should probably be considered a bug in the respective tools, so perhaps 
those should be fixed instead?

  Maciej

Re: mips-tdep.c: Style fixes

[Andreas Schwab]

"Maciej W. Rozycki" <macro@mips.com> writes:

> On Tue, 17 Apr 2007, Daniel Jacobowitz wrote:
>
>> > -	      int partial_len = (len < mips_abi_regsize (gdbarch)
>> > -				 ? len : mips_abi_regsize (gdbarch));
>> > +	      int partial_len = (len < mips_abi_regsize (gdbarch))
>> > +				? len : mips_abi_regsize (gdbarch);
>> 
>> These (and most of the others) were actually there for a reason.
>> Emacs will move that second line leftwards if there isn't an outer
>> layer of parentheses; I believe GNU Indent and gdb_indent.sh will also.
>
>  I can revert these, no problem -- it just looks strange and is not useful 
> from the language's point of view to have the right-hand side of an 
> assignment in brackets.

There are still redundant parens, and those are even less useful.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: mips-tdep.c: Style fixes

[Daniel Jacobowitz]

On Tue, Apr 17, 2007 at 07:12:29PM +0100, Maciej W. Rozycki wrote:
>  I can revert these, no problem

Please do.

> -- it just looks strange and is not useful 
> from the language's point of view to have the right-hand side of an 
> assignment in brackets.  OTOH, this qualifies as a workaround for what 
> should probably be considered a bug in the respective tools, so perhaps 
> those should be fixed instead?

Maybe, but I'm not about to suggest changes to GNU formatting at this
date :-)

-- 
Daniel Jacobowitz
CodeSourcery

Re: mips-tdep.c: Style fixes

[Maciej W. Rozycki]

On Tue, 17 Apr 2007, Daniel Jacobowitz wrote:

> >  I can revert these, no problem
> 
> Please do.

 Done now:

2007-04-18  Maciej W. Rozycki  <macro@mips.com>

	* mips-tdep.c (mips_eabi_push_dummy_call): Revert the last
	change to rearrange some brackets.
	(mips_n32n64_push_dummy_call): Likewise.
	(mips_o32_push_dummy_call): Likewise.
	(mips_o64_push_dummy_call): Likewise.

> > -- it just looks strange and is not useful 
> > from the language's point of view to have the right-hand side of an 
> > assignment in brackets.  OTOH, this qualifies as a workaround for what 
> > should probably be considered a bug in the respective tools, so perhaps 
> > those should be fixed instead?
> 
> Maybe, but I'm not about to suggest changes to GNU formatting at this
> date :-)

 OK -- the question is whether this is a bug in software not doing the GNU 
formatting correctly or whether it is our code that diverges.

  Maciej

Index: gdb/mips-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mips-tdep.c,v
retrieving revision 1.413
diff -u -p -r1.413 mips-tdep.c
--- gdb/mips-tdep.c	17 Apr 2007 17:57:03 -0000	1.413
+++ gdb/mips-tdep.c	18 Apr 2007 08:17:05 -0000
@@ -2558,8 +2558,8 @@ mips_eabi_push_dummy_call (struct gdbarc
 	    {
 	      /* Remember if the argument was written to the stack.  */
 	      int stack_used_p = 0;
-	      int partial_len = (len < mips_abi_regsize (gdbarch))
-				? len : mips_abi_regsize (gdbarch);
+	      int partial_len = (len < mips_abi_regsize (gdbarch)
+				 ? len : mips_abi_regsize (gdbarch));
 
 	      if (mips_debug)
 		fprintf_unfiltered (gdb_stdlog, " -- partial=%d",
@@ -2785,8 +2785,8 @@ mips_n32n64_push_dummy_call (struct gdba
 	    {
 	      /* Remember if the argument was written to the stack.  */
 	      int stack_used_p = 0;
-	      int partial_len = (len < mips_abi_regsize (gdbarch))
-				? len : mips_abi_regsize (gdbarch);
+	      int partial_len = (len < mips_abi_regsize (gdbarch)
+				 ? len : mips_abi_regsize (gdbarch));
 
 	      if (mips_debug)
 		fprintf_unfiltered (gdb_stdlog, " -- partial=%d",
@@ -2873,8 +2873,8 @@ mips_n32n64_push_dummy_call (struct gdba
 		      && partial_len < mips_abi_regsize (gdbarch)
 		      && (typecode == TYPE_CODE_STRUCT
 			  || typecode == TYPE_CODE_UNION))
-		    regval <<= (mips_abi_regsize (gdbarch) - partial_len)
-			       * TARGET_CHAR_BIT;
+		    regval <<= ((mips_abi_regsize (gdbarch) - partial_len)
+				* TARGET_CHAR_BIT);
 
 		  if (mips_debug)
 		    fprintf_filtered (gdb_stdlog, " - reg=%d val=%s",
@@ -3219,8 +3219,8 @@ mips_o32_push_dummy_call (struct gdbarch
 	    {
 	      /* Remember if the argument was written to the stack.  */
 	      int stack_used_p = 0;
-	      int partial_len = (len < mips_abi_regsize (gdbarch))
-				? len : mips_abi_regsize (gdbarch);
+	      int partial_len = (len < mips_abi_regsize (gdbarch)
+				 ? len : mips_abi_regsize (gdbarch));
 
 	      if (mips_debug)
 		fprintf_unfiltered (gdb_stdlog, " -- partial=%d",
@@ -3308,8 +3308,8 @@ mips_o32_push_dummy_call (struct gdbarch
 		      && partial_len < mips_abi_regsize (gdbarch)
 		      && (typecode == TYPE_CODE_STRUCT
 			  || typecode == TYPE_CODE_UNION))
-		    regval <<= (mips_abi_regsize (gdbarch) - partial_len)
-			       * TARGET_CHAR_BIT;
+		    regval <<= ((mips_abi_regsize (gdbarch) - partial_len)
+				* TARGET_CHAR_BIT);
 
 		  if (mips_debug)
 		    fprintf_filtered (gdb_stdlog, " - reg=%d val=%s",
@@ -3680,8 +3680,8 @@ mips_o64_push_dummy_call (struct gdbarch
 	    {
 	      /* Remember if the argument was written to the stack.  */
 	      int stack_used_p = 0;
-	      int partial_len = (len < mips_abi_regsize (gdbarch))
-				? len : mips_abi_regsize (gdbarch);
+	      int partial_len = (len < mips_abi_regsize (gdbarch)
+				 ? len : mips_abi_regsize (gdbarch));
 
 	      if (mips_debug)
 		fprintf_unfiltered (gdb_stdlog, " -- partial=%d",
@@ -3752,8 +3752,8 @@ mips_o64_push_dummy_call (struct gdbarch
 		      && partial_len < mips_abi_regsize (gdbarch)
 		      && (typecode == TYPE_CODE_STRUCT
 			  || typecode == TYPE_CODE_UNION))
-		    regval <<= (mips_abi_regsize (gdbarch) - partial_len)
-			       * TARGET_CHAR_BIT;
+		    regval <<= ((mips_abi_regsize (gdbarch) - partial_len)
+				* TARGET_CHAR_BIT);
 
 		  if (mips_debug)
 		    fprintf_filtered (gdb_stdlog, " - reg=%d val=%s",

Re: mips-tdep.c: Style fixes

[Michael Snyder]

On Tue, 2007-04-17 at 19:12 +0100, Maciej W. Rozycki wrote:
> On Tue, 17 Apr 2007, Daniel Jacobowitz wrote:
> 
> > > -	      int partial_len = (len < mips_abi_regsize (gdbarch)
> > > -				 ? len : mips_abi_regsize (gdbarch));
> > > +	      int partial_len = (len < mips_abi_regsize (gdbarch))
> > > +				? len : mips_abi_regsize (gdbarch);
> > 
> > These (and most of the others) were actually there for a reason.
> > Emacs will move that second line leftwards if there isn't an outer
> > layer of parentheses; I believe GNU Indent and gdb_indent.sh will also.
> 
>  I can revert these, no problem -- it just looks strange and is not useful 
> from the language's point of view to have the right-hand side of an 
> assignment in brackets. 

Both statements contain redundant parens.

>  OTOH, this qualifies as a workaround for what should probably be considered
>  a bug in the respective tools, so perhaps those should be fixed instead?

Probably, but we don't maintain those - we maintain gdb.