[RFA] ARI fix: Remove OP at end of line in xstormy16-tdep.c

[RFA] ARI fix: Remove OP at end of line in xstormy16-tdep.c

[Pierre Muller]

  Still trying to reduce the number of files appearing in ARI list.

  To avoid both operator at end of line and stay below 80-column limit,
I had to use another formatting option for the third parameter of
regcache_cooked_write_unsigned function call:
  As the parameter is aa long function call with multiple parameters, 
I just indented it with 2 spaces relative to regcache_cooked_write_unsigned
start.

Is this type of indentation OK?


Pierre Muller
GDB pascal language maintainer

2011-04-19  Pierre Muller  <muller@ics.u-strasbg.fr>

	* xstormy16-tdep.c (xstormy16_push_dummy_call): Avoid == at end of
	line as this is against GNU coding standards.

Index: xstormy16-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/xstormy16-tdep.c,v
retrieving revision 1.114
diff -u -p -r1.114 xstormy16-tdep.c
--- xstormy16-tdep.c	18 Mar 2011 18:52:32 -0000	1.114
+++ xstormy16-tdep.c	19 Apr 2011 10:35:47 -0000
@@ -264,11 +264,9 @@ xstormy16_push_dummy_call (struct gdbarc
       val = value_contents (args[i]);
       for (j = 0; j < typelen; j += xstormy16_reg_size)
 	regcache_cooked_write_unsigned (regcache, argreg++,
-			extract_unsigned_integer (val + j,
-						  typelen - j ==
-						  1 ? 1 :
-						  xstormy16_reg_size,
-						  byte_order));
+	  extract_unsigned_integer (val + j,
+				    typelen - j == 1 ? 1 :
xstormy16_reg_size,
+				    byte_order));
     }
 
   /* Align SP */

Re: [RFA] ARI fix: Remove OP at end of line in xstormy16-tdep.c

[Pedro Alves]

On Tuesday 19 April 2011 11:41:34, Pierre Muller wrote:
> --- xstormy16-tdep.c    18 Mar 2011 18:52:32 -0000      1.114
> +++ xstormy16-tdep.c    19 Apr 2011 10:35:47 -0000
> @@ -264,11 +264,9 @@ xstormy16_push_dummy_call (struct gdbarc
>        val = value_contents (args[i]);
>        for (j = 0; j < typelen; j += xstormy16_reg_size)
>         regcache_cooked_write_unsigned (regcache, argreg++,
> -                       extract_unsigned_integer (val + j,
> -                                                 typelen - j ==
> -                                                 1 ? 1 :
> -                                                 xstormy16_reg_size,
> -                                                 byte_order));
> +         extract_unsigned_integer (val + j,
> +                                   typelen - j == 1 ? 1 :
> xstormy16_reg_size,
> +                                   byte_order));

A sign that temporary variables would help, IMO:

       for (j = 0; j < typelen; j += xstormy16_reg_size)
		  {
	       ULONGEST regval;
          int size;

			size = typelen - j == 1 ? 1 : xstormy16_reg_size;
          val = extract_unsigned_integer (val + j, size, byte_order);
          regcache_cooked_write_unsigned (regcache, argreg++, regval);
         );

-- 
Pedro Alves

RE: [RFA] ARI fix: Remove OP at end of line in xstormy16-tdep.c

[Pierre Muller]

Thank you for the suggestion, this makes the things
cleaner.


> -----Message d'origine-----
> De : gdb-patches-owner@sourceware.org [mailto:gdb-patches-
> owner@sourceware.org] De la part de Pedro Alves
> Envoyé : mardi 19 avril 2011 13:08
> À : gdb-patches@sourceware.org
> Cc : Pierre Muller
> Objet : Re: [RFA] ARI fix: Remove OP at end of line in xstormy16-tdep.c
> 
> On Tuesday 19 April 2011 11:41:34, Pierre Muller wrote:
> > --- xstormy16-tdep.c    18 Mar 2011 18:52:32 -0000      1.114
> > +++ xstormy16-tdep.c    19 Apr 2011 10:35:47 -0000
> > @@ -264,11 +264,9 @@ xstormy16_push_dummy_call (struct gdbarc
> >        val = value_contents (args[i]);
> >        for (j = 0; j < typelen; j += xstormy16_reg_size)
> >         regcache_cooked_write_unsigned (regcache, argreg++,
> > -                       extract_unsigned_integer (val + j,
> > -                                                 typelen - j ==
> > -                                                 1 ? 1 :
> > -                                                 xstormy16_reg_size,
> > -                                                 byte_order));
> > +         extract_unsigned_integer (val + j,
> > +                                   typelen - j == 1 ? 1 :
> > xstormy16_reg_size,
> > +                                   byte_order));
> 
> A sign that temporary variables would help, IMO:
> 
>        for (j = 0; j < typelen; j += xstormy16_reg_size)
> 		  {
> 	       ULONGEST regval;
>           int size;
> 
> 			size = typelen - j == 1 ? 1 : xstormy16_reg_size;
>           val = extract_unsigned_integer (val + j, size, byte_order);
>           regcache_cooked_write_unsigned (regcache, argreg++, regval);
>          );

  So here is the new proposal:

Corinna, you are listed as maintainer of
xstormy16-tdep, could you tell if this is OK?

Pierre Muller


2011-04-19  Pierre Muller  <muller@ics.u-strasbg.fr>
	    Pedro Alves  <pedro@codesourcery.com>

	* xstormy16-tdep.c (xstormy16_push_dummy_call): Add local
	variables to simplify code and avoid == operator at end of
	line as this is against GNU coding standards.

Index: xstormy16-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/xstormy16-tdep.c,v
retrieving revision 1.114
diff -u -p -r1.114 xstormy16-tdep.c
--- xstormy16-tdep.c	18 Mar 2011 18:52:32 -0000	1.114
+++ xstormy16-tdep.c	19 Apr 2011 12:34:34 -0000
@@ -263,12 +263,13 @@ xstormy16_push_dummy_call (struct gdbarc
       /* Put argument into registers wordwise.  */
       val = value_contents (args[i]);
       for (j = 0; j < typelen; j += xstormy16_reg_size)
-	regcache_cooked_write_unsigned (regcache, argreg++,
-			extract_unsigned_integer (val + j,
-						  typelen - j ==
-						  1 ? 1 :
-						  xstormy16_reg_size,
-						  byte_order));
+	{
+	  ULONGEST regval;
+	  int size = (typelen -j == 1) ? 1 : xstormy16_reg_size;
+
+	  regval = extract_unsigned_integer (val + j, size, byte_order);
+	  regcache_cooked_write_unsigned (regcache, argreg++, regval);
+	}
     }
 
   /* Align SP */

Re: [RFA] ARI fix: Remove OP at end of line in xstormy16-tdep.c

[Corinna Vinschen]

On Apr 19 14:41, Pierre Muller wrote:
> Thank you for the suggestion, this makes the things
> cleaner.
> [...]
>   So here is the new proposal:
> 
> Corinna, you are listed as maintainer of
> xstormy16-tdep, could you tell if this is OK?

Except for a missing space, yes.

> Pierre Muller
> 
> 
> 2011-04-19  Pierre Muller  <muller@ics.u-strasbg.fr>
> 	    Pedro Alves  <pedro@codesourcery.com>
> 
> 	* xstormy16-tdep.c (xstormy16_push_dummy_call): Add local
> 	variables to simplify code and avoid == operator at end of
> 	line as this is against GNU coding standards.
> 
> Index: xstormy16-tdep.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/xstormy16-tdep.c,v
> retrieving revision 1.114
> diff -u -p -r1.114 xstormy16-tdep.c
> --- xstormy16-tdep.c	18 Mar 2011 18:52:32 -0000	1.114
> +++ xstormy16-tdep.c	19 Apr 2011 12:34:34 -0000
> @@ -263,12 +263,13 @@ xstormy16_push_dummy_call (struct gdbarc
>        /* Put argument into registers wordwise.  */
>        val = value_contents (args[i]);
>        for (j = 0; j < typelen; j += xstormy16_reg_size)
> -	regcache_cooked_write_unsigned (regcache, argreg++,
> -			extract_unsigned_integer (val + j,
> -						  typelen - j ==
> -						  1 ? 1 :
> -						  xstormy16_reg_size,
> -						  byte_order));
> +	{
> +	  ULONGEST regval;
> +	  int size = (typelen -j == 1) ? 1 : xstormy16_reg_size;
                              ^^^
                              - j

> +
> +	  regval = extract_unsigned_integer (val + j, size, byte_order);
> +	  regcache_cooked_write_unsigned (regcache, argreg++, regval);
> +	}
>      }
>  
>    /* Align SP */

Thanks,
Corinna

-- 
Corinna Vinschen
Cygwin Project Co-Leader
Red Hat

RE: [RFA] ARI fix: Remove OP at end of line in xstormy16-tdep.c

[Pierre Muller]

> -----Message d'origine-----
> De : gdb-patches-owner@sourceware.org [mailto:gdb-patches-
> owner@sourceware.org] De la part de Corinna Vinschen
> Envoyé : mardi 19 avril 2011 14:51
> À : gdb-patches@sourceware.org
> Objet : Re: [RFA] ARI fix: Remove OP at end of line in xstormy16-tdep.c
> 
> On Apr 19 14:41, Pierre Muller wrote:
> > Thank you for the suggestion, this makes the things
> > cleaner.
> > [...]
> >   So here is the new proposal:
> >
> > Corinna, you are listed as maintainer of
> > xstormy16-tdep, could you tell if this is OK?
> 
> Except for a missing space, yes.

  Thanks for noticing this,
patch committed with space added.

Pierre