Fix PR gdb/15289 - "set remote hardware-watchpoint-limit" broken (zinteger commands)

This is a regression from 7.5, introduced/exposed by:
  http://sourceware.org/ml/gdb-patches/2012-07/msg00259.html

There are a series of issues with this code.

It does:

	unsigned int val = parse_and_eval_long (arg);
	^^^^^^^^^^^^

(unsigned, usually 32-bit) while parse_and_eval_long returns a LONGEST
(usually 64-bit), so we lose precision without noticing:

  (gdb) set remote hardware-watchpoint-limit 0x100000000
  (gdb) show remote hardware-watchpoint-limit 0x100000000
  The maximum number of target hardware watchpoints is 0.

While at it, print the invalid number with plongest, so the user sees
what GDB thought the number was:

  (gdb) set remote hardware-watchpoint-limit 0x100000000
  integer 4294967296 out of range

So with "set remote hardware-watchpoint-limit -1", val ends converted
to 0xffffffff, which then fails the

	else if (val >= INT_MAX)
	  error (_("integer %u out of range"), val);

test.

Looking at that INT_MAX check, we forbid INT_MAX itself, but we
shouldn't, as that does fit in 'int' -- we want to forbid values
_greater_ than INT_MAX (and less than INT_MIN, while at it):

  (gdb) set remote hardware-watchpoint-limit 2147483647
  integer 2147483647 out of range

The same problem is in the new var_zuinteger_unlimited code, which
also uses "int" for variable.

Also, when printing a 'signed int', we should use %d, not %u.

This adds a couple regression tests.  Not completely thorough in checking
all kinds of invalid input; I'm saving more exaustive testing around
zXXinteger commands for something like new test-assisting commands
like "maint test cmd-zinteger -1", where testing would focus on the
command types, and thus be independent of particular user commands of
particular GDB features.

Tested on x86_64 Fedora 17.

gdb/
2013-03-20  Pedro Alves  <palves@redhat.com>

	PR gdb/15289

	* cli/cli-setshow.c (do_set_command)
	<var_uinteger, var_zuinteger>: Use LONGEST for variable holding
	the result of parsing the command argument.  Throw error if the
	value is greater than UINT_MAX.  Print the invalid value with
	plongest.
	<var_integer, var_zinteger>: Use LONGEST for variable holding the
	result of parsing the command argument.  Throw error if the value
	is greater than INT_MAX, not greater or equal.  Also throw error
	if the value is less than INT_MIN.  Print the invalid value with
	plongest.
	<var_zuinteger_unlimited>: Throw error if the value is greater
	than INT_MAX, not greater or equal.
	(do_show_command) <var_integer, var_zinteger,
	var_zuinteger_unlimited>: Use %d for printing int, not %u.

gdb/testsuite/
2013-03-20  Pedro Alves  <palves@redhat.com>

	PR gdb/15289

	* gdb.base/remote.exp: Test
	"set remote hardware-watchpoint-limit -1",
	"set remote hardware-breakpoint-limit -1",
	"set remote hardware-watchpoint-limit 2147483647" and
	"set remote hardware-breakpoint-limit 2147483647".

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aee132e..aaad736 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,22 @@
+2013-03-20  Pedro Alves  <palves@redhat.com>
+
+       PR gdb/15289
+
+       * cli/cli-setshow.c (do_set_command)
+       <var_uinteger, var_zuinteger>: Use LONGEST for variable holding
+       the result of parsing the command argument.  Throw error if the
+       value is greater than UINT_MAX.  Print the invalid value with
+       plongest.
+       <var_integer, var_zinteger>: Use LONGEST for variable holding the
+       result of parsing the command argument.  Throw error if the value
+       is greater than INT_MAX, not greater or equal.  Also throw error
+       if the value is less than INT_MIN.  Print the invalid value with
+       plongest.
+       <var_zuinteger_unlimited>: Throw error if the value is greater
+       than INT_MAX, not greater or equal.
+       (do_show_command) <var_integer, var_zinteger,
+       var_zuinteger_unlimited>: Use %d for printing int, not %u.
+
 2013-03-20  Tom Tromey  <tromey@redhat.com>
 
        * ax-gdb.c (gen_var_ref): Unconditionally call via computed ops,

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 0a859c2..3a0e978 100644 (file)
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -272,13 +272,17 @@ do_set_command (char *arg, int from_tty, struct cmd_list_element *c)
       break;
     case var_uinteger:
     case var_zuinteger:
-      if (arg == NULL)
-       error_no_arg (_("integer to set it to."));
       {
-       unsigned int val = parse_and_eval_long (arg);
+       LONGEST val;
+
+       if (arg == NULL)
+         error_no_arg (_("integer to set it to."));
+       val = parse_and_eval_long (arg);
 
        if (c->var_type == var_uinteger && val == 0)
          val = UINT_MAX;
+       else if (val > UINT_MAX)
+         error (_("integer %s out of range"), plongest (val));
 
        if (*(unsigned int *) c->var != val)
          {
@@ -291,15 +295,16 @@ do_set_command (char *arg, int from_tty, struct cmd_list_element *c)
     case var_integer:
     case var_zinteger:
       {
-       unsigned int val;
+       LONGEST val;
 
        if (arg == NULL)
          error_no_arg (_("integer to set it to."));
        val = parse_and_eval_long (arg);
+
        if (val == 0 && c->var_type == var_integer)
          val = INT_MAX;
-       else if (val >= INT_MAX)
-         error (_("integer %u out of range"), val);
+       else if (val > INT_MAX || val < INT_MIN)
+         error (_("integer %s out of range"), plongest (val));
 
        if (*(int *) c->var != val)
          {
@@ -387,7 +392,7 @@ do_set_command (char *arg, int from_tty, struct cmd_list_element *c)
          error_no_arg (_("integer to set it to."));
        val = parse_and_eval_long (arg);
 
-       if (val >= INT_MAX)
+       if (val > INT_MAX)
          error (_("integer %s out of range"), plongest (val));
        else if (val < -1)
          error (_("only -1 is allowed to set as unlimited"));
@@ -588,7 +593,7 @@ do_show_command (char *arg, int from_tty, struct cmd_list_element *c)
        if (*(int *) c->var == -1)
          fputs_filtered ("unlimited", stb);
        else
-         fprintf_filtered (stb, "%u", *(int *) c->var);
+         fprintf_filtered (stb, "%d", *(int *) c->var);
       }
       break;
     default:

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index bb4977b..b3a444d 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,4 +1,14 @@
 2013-03-20  Pedro Alves  <palves@redhat.com>
+
+       PR gdb/15289
+
+       * gdb.base/remote.exp: Test
+       "set remote hardware-watchpoint-limit -1",
+       "set remote hardware-breakpoint-limit -1",
+       "set remote hardware-watchpoint-limit 2147483647" and
+       "set remote hardware-breakpoint-limit 2147483647".
+
+2013-03-20  Pedro Alves  <palves@redhat.com>
            Yao Qi  <yao@codesourcery.com>
 
        * gdb.trace/tfile.c: Add comments.

diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
index dea9bdc..dfaf646 100644 (file)
--- a/gdb/testsuite/gdb.base/remote.exp
+++ b/gdb/testsuite/gdb.base/remote.exp
@@ -155,4 +155,14 @@ gdb_test "show remote memory-read-packet-size" \
 gdb_test "x/17ub random_data" \
        "<random_data>:\[ \t\]+60\[ \t\]+74\[ \t\]+216\[ \t\]+38\[ \t\]+149\[ \t\]+49\[ \t\]+207\[ \t\]+44.*<random_data\\+8>:\[ \t\]+124\[ \t\]+38\[ \t\]+93\[ \t\]+125\[ \t\]+232\[ \t\]+67\[ \t\]+228\[ \t\]+56.*<random_data\\+16>:\[ \t\]+161"
 
+# Regression test for gdb/15289.  Make sure -1 is accepted and handled
+# as "unlimited".
+gdb_test_no_output "set remote hardware-watchpoint-limit -1"
+gdb_test_no_output "set remote hardware-breakpoint-limit -1"
+
+# This is just being thorough.  Assume (at least) a 32-bit host int,
+# and make sure 32-bit INT_MAX is accepted by a zinteger command.
+gdb_test_no_output "set remote hardware-watchpoint-limit 2147483647"
+gdb_test_no_output "set remote hardware-breakpoint-limit 2147483647"
+
 gdb_exit