mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-15 04:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Breakpoint location parsing: always error instead of warning

Browse Source 
It's odd that when parsing a breakpoint or location number, we error out
in most cases, but warn in others.

  (gdb) disable 1-
  bad breakpoint number at or near: '1-'
  (gdb) disable -1
  bad breakpoint number at or near: '-1'
  (gdb) disable .foo
  bad breakpoint number at or near: '.foo'
  (gdb) disable foo.1
  Bad breakpoint number 'foo.1'
  (gdb) disable 1.foo
  warning: bad breakpoint number at or near '1.foo'

This changes GDB to always error out.  It required touching one testcase
that expected the warning.

gdb/ChangeLog:
2017-11-07  Pedro Alves  <palves@redhat.com>

	* breakpoint.c (extract_bp_number_and_location): Change return
	type to void.  Throw error instead of warning.
	(enable_disable_command): Adjust.

gdb/testsuite/ChangeLog:
2017-11-07  Pedro Alves  <palves@redhat.com>

	* gdb.base/ena-dis-br.exp: Don't expect "warning:".
This commit is contained in:
Pedro Alves 2017-11-07 11:00:31 +00:00
parent d0fe47010f
commit cc638e867c
4 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2017-11-07 Pedro Alves <palves@redhat.com>
* breakpoint.c (extract_bp_number_and_location): Change return
type to void. Throw error instead of warning.
(enable_disable_command): Adjust.
2017-11-07 Xavier Roirand <roirand@adacore.com>
Pedro Alves <palves@redhat.com>

47
gdb/breakpoint.c
View File

@ -14225,7 +14225,7 @@ find_location_by_number (int bp_num, int loc_num)
location number range.
*/
static bool
static void
extract_bp_number_and_location (const std::string &arg,
std::pair<int, int> &bp_num_range,
std::pair<int, int> &bp_loc_range)
@ -14267,10 +14267,7 @@ extract_bp_number_and_location (const std::string &arg,
const char *ptls = bp_loc;
bp_loc_range.first = get_number_trailer (&ptls, '\0');
if (bp_loc_range.first == 0)
{
warning (_("bad breakpoint number at or near '%s'"), arg.c_str ());
return false;
}
error (_("bad breakpoint number at or near '%s'"), arg.c_str ());
bp_loc_range.second = bp_loc_range.first;
}
}
@ -14294,10 +14291,7 @@ extract_bp_number_and_location (const std::string &arg,
const char *ptf = arg.c_str ();
bp_num_range.first = get_number (&ptf);
if (bp_num_range.first == 0)
{
warning (_("bad breakpoint number at or near '%s'"), arg.c_str ());
return false;
}
error (_("bad breakpoint number at or near '%s'"), arg.c_str ());
bp_num_range.second = bp_num_range.first;
}
bp_loc_range.first = 0;
@ -14306,8 +14300,6 @@ extract_bp_number_and_location (const std::string &arg,
if (bp_num_range.first == 0 || bp_num_range.second == 0)
error (_("bad breakpoint number at or near: '%s'"), arg.c_str ());
return true;
}
/* Enable or disable a breakpoint location BP_NUM.LOC_NUM. ENABLE
@ -14408,24 +14400,23 @@ enable_disable_command (const char *args, int from_tty, bool enable)
{
std::pair<int, int> bp_num_range, bp_loc_range;
if (extract_bp_number_and_location (num, bp_num_range, bp_loc_range))
extract_bp_number_and_location (num, bp_num_range, bp_loc_range);
if (bp_loc_range.first == bp_loc_range.second
&& bp_loc_range.first == 0)
{
if (bp_loc_range.first == bp_loc_range.second
&& bp_loc_range.first == 0)
{
/* Handle breakpoint ids with formats 'x' or 'x-z'. */
map_breakpoint_number_range (bp_num_range,
enable
? enable_breakpoint
: disable_breakpoint);
}
else
{
/* Handle breakpoint ids with formats 'x.y' or
'x.y-z'. */
enable_disable_breakpoint_location_range
(bp_num_range.first, bp_loc_range, enable);
}
/* Handle breakpoint ids with formats 'x' or 'x-z'. */
map_breakpoint_number_range (bp_num_range,
enable
? enable_breakpoint
: disable_breakpoint);
}
else
{
/* Handle breakpoint ids with formats 'x.y' or
'x.y-z'. */
enable_disable_breakpoint_location_range
(bp_num_range.first, bp_loc_range, enable);
}
num = extract_arg (&args);
}

4
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2017-11-07 Pedro Alves <palves@redhat.com>
* gdb.base/ena-dis-br.exp: Don't expect "warning:".
2017-11-07 Xavier Roirand <roirand@adacore.com>
Pedro Alves <palves@redhat.com>

6
gdb/testsuite/gdb.base/ena-dis-br.exp
View File

@ -395,10 +395,10 @@ proc test_ena_dis_br { what } {
}
}
# Now enable(disable) $b4.1 fooobaar and
# it should give warning on fooobaar.
# Now enable(disable) '$b4.1 fooobaar'. This should error on
# fooobaar.
gdb_test "$what $b4.1 fooobaar" \
"warning: bad breakpoint number at or near 'fooobaar'" \
"bad breakpoint number at or near 'fooobaar'" \
"$what \$b4.1 fooobar"
set test1 "${what}d \$b4.1"