[PATCH] Display var_zinteger as signed

[PATCH] Display var_zinteger as signed

[Andrew Burgess]

Currently the behaviour of var_zinteger variables is to print as 
unsigned, so,

(gdb) set debug infrun -5
(gdb) show debug infrun
Inferior debugging is 4294967291.

With the patch it is displayed as -5.


Cheers,
Andrew

2011-07-04  Andrew Burgess  <aburgess@broadcom.com>

	* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
	variables as signed, not unsigned.

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 6acdd91..d35f43a 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -365,7 +365,6 @@ do_setshow_command (char *arg, int from_tty, struct 
cmd_list_element *c)
  	    }
  	  /* else fall through */
  	case var_zuinteger:
-	case var_zinteger:
  	  fprintf_filtered (stb->stream, "%u", *(unsigned int *) c->var);
  	  break;
  	case var_integer:
@@ -373,8 +372,9 @@ do_setshow_command (char *arg, int from_tty, struct 
cmd_list_element *c)
  	    {
  	      fputs_filtered ("unlimited", stb->stream);
  	    }
-	  else
-	    fprintf_filtered (stb->stream, "%d", *(int *) c->var);
+	  /* else fall through */
+	case var_zinteger:
+	  fprintf_filtered (stb->stream, "%d", *(int *) c->var);
  	  break;

  	default:

Re: [PATCH] Display var_zinteger as signed

[Andreas Schwab]

"Andrew Burgess" <aburgess@broadcom.com> writes:

> @@ -373,8 +372,9 @@ do_setshow_command (char *arg, int from_tty,
> struct cmd_list_element *c)
>  	    {
>  	      fputs_filtered ("unlimited", stb->stream);
>  	    }
> -	  else
> -	    fprintf_filtered (stb->stream, "%d", *(int *) c->var);
> +	  /* else fall through */
> +	case var_zinteger:
> +	  fprintf_filtered (stb->stream, "%d", *(int *) c->var);
>  	  break;

The "unlimited" case should not fall through.

Andreas.

-- 
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."

Re: [PATCH] Display var_zinteger as signed

[Andrew Burgess]

On 04/07/2011 12:26, Andreas Schwab wrote:
> "Andrew Burgess"<aburgess@broadcom.com>  writes:
>
>> < something with a really silly mistake in >
>
> The "unlimited" case should not fall through.

Ooops. Thanks for pointing that out. Updated patch below.

Thanks,
Andrew


2011-07-04  Andrew Burgess  <aburgess@broadcom.com>

	* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
	variables as signed, not unsigned.

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 6acdd91..868fff1 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -365,16 +365,17 @@ do_setshow_command (char *arg, int from_tty, 
struct cmd_list_element *c)
  	    }
  	  /* else fall through */
  	case var_zuinteger:
-	case var_zinteger:
  	  fprintf_filtered (stb->stream, "%u", *(unsigned int *) c->var);
  	  break;
  	case var_integer:
  	  if (*(int *) c->var == INT_MAX)
  	    {
  	      fputs_filtered ("unlimited", stb->stream);
+              break;
  	    }
-	  else
-	    fprintf_filtered (stb->stream, "%d", *(int *) c->var);
+	  /* else fall through */
+	case var_zinteger:
+	  fprintf_filtered (stb->stream, "%d", *(int *) c->var);
  	  break;

  	default:

Re: [PATCH] Display var_zinteger as signed

[Joel Brobecker]

> 2011-07-04  Andrew Burgess  <aburgess@broadcom.com>
> 
> 	* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
> 	variables as signed, not unsigned.

I'm not a fan of fall throughs, like this, because I think it
makes the code harder to read, but if no other maintainer has
an objection to it, then the patch is OK (please wait for a couple
of days to give everyone else a little time to comment on this).

>  	case var_integer:
>  	  if (*(int *) c->var == INT_MAX)
>  	    {
>  	      fputs_filtered ("unlimited", stb->stream);
> +              break;
>  	    }
> -	  else
> -	    fprintf_filtered (stb->stream, "%d", *(int *) c->var);
> +	  /* else fall through */
> +	case var_zinteger:
> +	  fprintf_filtered (stb->stream, "%d", *(int *) c->var);
>  	  break;

I'd personally write this:

        case var_integer:
        case var_zinteger:
          if (c->var_type == var_integer && *(int *) c->var == INT_MAX)
            fputs_filtered ("unlimited", stb->stream);
          else
            fprintf_filtered (stb->stream, "%d", *(int *) c->var);

-- 
Joel

Re: [PATCH] Display var_zinteger as signed

[Mark Kettenis]

> Date: Mon, 4 Jul 2011 11:09:02 -0700
> From: Joel Brobecker <brobecker@adacore.com>
> 
> > 2011-07-04  Andrew Burgess  <aburgess@broadcom.com>
> > 
> > 	* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
> > 	variables as signed, not unsigned.
> 
> I'm not a fan of fall throughs, like this, because I think it
> makes the code harder to read, but if no other maintainer has
> an objection to it, then the patch is OK (please wait for a couple
> of days to give everyone else a little time to comment on this).

And if the fallthrough stays, the proper spelling is /* FALLTHROUGH
*/.  There are several code analysis tools that understand that
comment as signalling an intentional fallthrough instead of an
unintentional one that they need to warn about.

Re: [PATCH] Display var_zinteger as signed

[Andrew Burgess]

On 04/07/2011 19:09, Joel Brobecker wrote:
>> 2011-07-04  Andrew Burgess<aburgess@broadcom.com>
>>
>> 	* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
>> 	variables as signed, not unsigned.
> 
> I'm not a fan of fall throughs, like this, because I think it
> makes the code harder to read, but if no other maintainer has
> an objection to it, then the patch is OK (please wait for a couple
> of days to give everyone else a little time to comment on this).
> 
> I'd personally write this:
> 
>          case var_integer:
>          case var_zinteger:
>            if (c->var_type == var_integer&&  *(int *) c->var == INT_MAX)
>              fputs_filtered ("unlimited", stb->stream);
>            else
>              fprintf_filtered (stb->stream, "%d", *(int *) c->var);
> 

The revised patch below removes the fall through from both the signed and unsigned cases (I just couldn't have different code for the two cases).

Thanks,
Andrew

2011-07-04  Andrew Burgess  <aburgess@broadcom.com>

	* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
	variables as signed, not unsigned.

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 6acdd91..ef04aac 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -358,21 +358,18 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
 	    }
 	  break;
 	case var_uinteger:
-	  if (*(unsigned int *) c->var == UINT_MAX)
-	    {
-	      fputs_filtered ("unlimited", stb->stream);
-	      break;
-	    }
-	  /* else fall through */
 	case var_zuinteger:
-	case var_zinteger:
-	  fprintf_filtered (stb->stream, "%u", *(unsigned int *) c->var);
+	  if (c->var_type == var_uinteger &&
+	    *(unsigned int *) c->var == UINT_MAX)
+	    fputs_filtered ("unlimited", stb->stream);
+	  else
+	    fprintf_filtered (stb->stream, "%u", *(unsigned int *) c->var);
 	  break;
 	case var_integer:
-	  if (*(int *) c->var == INT_MAX)
-	    {
-	      fputs_filtered ("unlimited", stb->stream);
-	    }
+	case var_zinteger:
+	  if (c->var_type == var_integer &&
+	    *(int *) c->var == INT_MAX)
+	    fputs_filtered ("unlimited", stb->stream);
 	  else
 	    fprintf_filtered (stb->stream, "%d", *(int *) c->var);
 	  break;

Re: [PATCH] Display var_zinteger as signed

[Andreas Schwab]

"Andrew Burgess" <aburgess@broadcom.com> writes:

> +	  if (c->var_type == var_uinteger &&
> +	    *(unsigned int *) c->var == UINT_MAX)

GNU style is to break before the operator.

Andreas.

-- 
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."

Re: [PATCH] Display var_zinteger as signed

[Andrew Burgess]

On 05/07/2011 09:47, Andreas Schwab wrote:
> "Andrew Burgess"<aburgess@broadcom.com>  writes:
> 
>> +	  if (c->var_type == var_uinteger&&
>> +	    *(unsigned int *) c->var == UINT_MAX)
> 
> GNU style is to break before the operator.

Updated patch below. Thanks for the feedback.

Thanks,
Andrew


2011-07-04  Andrew Burgess  <aburgess@broadcom.com>

	* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
	variables as signed, not unsigned.

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 6acdd91..8dbfaad 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -358,21 +358,18 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
 	    }
 	  break;
 	case var_uinteger:
-	  if (*(unsigned int *) c->var == UINT_MAX)
-	    {
-	      fputs_filtered ("unlimited", stb->stream);
-	      break;
-	    }
-	  /* else fall through */
 	case var_zuinteger:
-	case var_zinteger:
-	  fprintf_filtered (stb->stream, "%u", *(unsigned int *) c->var);
+	  if (c->var_type == var_uinteger
+	      && *(unsigned int *) c->var == UINT_MAX)
+	    fputs_filtered ("unlimited", stb->stream);
+	  else
+	    fprintf_filtered (stb->stream, "%u", *(unsigned int *) c->var);
 	  break;
 	case var_integer:
-	  if (*(int *) c->var == INT_MAX)
-	    {
-	      fputs_filtered ("unlimited", stb->stream);
-	    }
+	case var_zinteger:
+	  if (c->var_type == var_integer
+	      && *(int *) c->var == INT_MAX)
+	    fputs_filtered ("unlimited", stb->stream);
 	  else
 	    fprintf_filtered (stb->stream, "%d", *(int *) c->var);
 	  break;

Re: [PATCH] Display var_zinteger as signed

[Joel Brobecker]

> 2011-07-04  Andrew Burgess  <aburgess@broadcom.com>
> 
> 	* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
> 	variables as signed, not unsigned.

Thanks! OK if tested against the gdb-testsuite.

-- 
Joel

Re: [PATCH] Display var_zinteger as signed

[Andrew Burgess]

On 05/07/2011 16:08, Joel Brobecker wrote:
>> 2011-07-04  Andrew Burgess<aburgess@broadcom.com>
>>
>> 	* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
>> 	variables as signed, not unsigned.
>
> Thanks! OK if tested against the gdb-testsuite.

No regressions seen here so I committed the change.

Thanks,
Andrew