2013-08-12 Muhammad Waqas <mwaqas@codesourcery.com>
PR gdb/15501 * breakpoint.c (enable_command, disable_command): Iterate over all specified breakpoint locations. 2013-07-12 Muhammad Waqas <mwaqas@codesourccery.com> PR gdb/15501 * gdb.base/ena-dis-br.exp: Add test to verify enable/disable commands work correctly with multiple arguments that include multiple locations.
This commit is contained in:
Muhammad Waqas
parent
101158d99a
commit
9eaabc7557
4 changed files with 177 additions and 36 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2013-08-12 Muhammad Waqas <mwaqas@codesourcery.com>
|
||||
|
||||
PR gdb/15501
|
||||
* breakpoint.c (enable_command, disable_command): Iterate over
|
||||
all specified breakpoint locations.
|
||||
|
||||
2013-08-22 Luis Machado <lgustavo@codesourcery.com>
|
||||
|
||||
* common/linux-ptrace.c (linux_fork_to_function): Push #
|
||||
|
|
|
|||
|
|
@ -14553,25 +14553,35 @@ disable_command (char *args, int from_tty)
|
|||
if (user_breakpoint_p (bpt))
|
||||
disable_breakpoint (bpt);
|
||||
}
|
||||
else if (strchr (args, '.'))
|
||||
{
|
||||
struct bp_location *loc = find_location_by_number (args);
|
||||
if (loc)
|
||||
{
|
||||
if (loc->enabled)
|
||||
{
|
||||
loc->enabled = 0;
|
||||
mark_breakpoint_location_modified (loc);
|
||||
}
|
||||
if (target_supports_enable_disable_tracepoint ()
|
||||
&& current_trace_status ()->running && loc->owner
|
||||
&& is_tracepoint (loc->owner))
|
||||
target_disable_tracepoint (loc);
|
||||
}
|
||||
update_global_location_list (0);
|
||||
}
|
||||
else
|
||||
map_breakpoint_numbers (args, do_map_disable_breakpoint, NULL);
|
||||
{
|
||||
char *num = extract_arg (&args);
|
||||
|
||||
while (num)
|
||||
{
|
||||
if (strchr (num, '.'))
|
||||
{
|
||||
struct bp_location *loc = find_location_by_number (num);
|
||||
|
||||
if (loc)
|
||||
{
|
||||
if (loc->enabled)
|
||||
{
|
||||
loc->enabled = 0;
|
||||
mark_breakpoint_location_modified (loc);
|
||||
}
|
||||
if (target_supports_enable_disable_tracepoint ()
|
||||
&& current_trace_status ()->running && loc->owner
|
||||
&& is_tracepoint (loc->owner))
|
||||
target_disable_tracepoint (loc);
|
||||
}
|
||||
update_global_location_list (0);
|
||||
}
|
||||
else
|
||||
map_breakpoint_numbers (num, do_map_disable_breakpoint, NULL);
|
||||
num = extract_arg (&args);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -14677,25 +14687,35 @@ enable_command (char *args, int from_tty)
|
|||
if (user_breakpoint_p (bpt))
|
||||
enable_breakpoint (bpt);
|
||||
}
|
||||
else if (strchr (args, '.'))
|
||||
{
|
||||
struct bp_location *loc = find_location_by_number (args);
|
||||
if (loc)
|
||||
{
|
||||
if (!loc->enabled)
|
||||
{
|
||||
loc->enabled = 1;
|
||||
mark_breakpoint_location_modified (loc);
|
||||
}
|
||||
if (target_supports_enable_disable_tracepoint ()
|
||||
&& current_trace_status ()->running && loc->owner
|
||||
&& is_tracepoint (loc->owner))
|
||||
target_enable_tracepoint (loc);
|
||||
}
|
||||
update_global_location_list (1);
|
||||
}
|
||||
else
|
||||
map_breakpoint_numbers (args, do_map_enable_breakpoint, NULL);
|
||||
{
|
||||
char *num = extract_arg (&args);
|
||||
|
||||
while (num)
|
||||
{
|
||||
if (strchr (num, '.'))
|
||||
{
|
||||
struct bp_location *loc = find_location_by_number (num);
|
||||
|
||||
if (loc)
|
||||
{
|
||||
if (!loc->enabled)
|
||||
{
|
||||
loc->enabled = 1;
|
||||
mark_breakpoint_location_modified (loc);
|
||||
}
|
||||
if (target_supports_enable_disable_tracepoint ()
|
||||
&& current_trace_status ()->running && loc->owner
|
||||
&& is_tracepoint (loc->owner))
|
||||
target_enable_tracepoint (loc);
|
||||
}
|
||||
update_global_location_list (1);
|
||||
}
|
||||
else
|
||||
map_breakpoint_numbers (num, do_map_enable_breakpoint, NULL);
|
||||
num = extract_arg (&args);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* This struct packages up disposition data for application to multiple
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
2013-07-12 Muhammad Waqas <mwaqas@codesourccery.com>
|
||||
|
||||
PR gdb/15501
|
||||
* gdb.base/ena-dis-br.exp: Add test to verify
|
||||
enable/disable commands work correctly with
|
||||
multiple arguments that include multiple locations.
|
||||
|
||||
2013-08-22 Samuel Bronson <naesten@gmail.com>
|
||||
|
||||
ARM Linux support for `catch syscall'.
|
||||
|
|
|
|||
|
|
@ -301,5 +301,113 @@ gdb_test_multiple "continue 2" "$test" {
|
|||
}
|
||||
}
|
||||
|
||||
# Verify that GDB correctly handles the "enable/disable" command
|
||||
# with arguments, that include multiple locations.
|
||||
#
|
||||
if ![runto_main] then { fail "enable/disable break tests suppressed" }
|
||||
|
||||
set b1 0
|
||||
set b2 0
|
||||
set b3 0
|
||||
set b4 0
|
||||
set b1 [break_at main ""]
|
||||
set b2 [break_at main ""]
|
||||
set b3 [break_at main ""]
|
||||
set b4 [break_at main ""]
|
||||
|
||||
# Perform tests for disable/enable commands on multiple
|
||||
# locations and breakpoints.
|
||||
#
|
||||
# WHAT - the command to test (disable/enable).
|
||||
#
|
||||
proc test_ena_dis_br { what } {
|
||||
global b1
|
||||
global b2
|
||||
global b3
|
||||
global b4
|
||||
global gdb_prompt
|
||||
|
||||
# OPPOS - the command opposite to WHAT.
|
||||
# WHAT_RES - whether breakpoints are expected to end
|
||||
# up enabled or disabled.
|
||||
# OPPOS_RES- same as WHAT_RES but opposite.
|
||||
# P1/P2 - proc to call (pass/fail). Must be
|
||||
# opposites.
|
||||
# Set variable values for disable command.
|
||||
set oppos "enable"
|
||||
set oppos_res "y"
|
||||
set what_res "n"
|
||||
set p1 "pass"
|
||||
set p2 "fail"
|
||||
|
||||
if { "$what" == "enable" } {
|
||||
# Set varibale values for enable command.
|
||||
set oppos "disable"
|
||||
set oppos_res "n"
|
||||
set what_res "y"
|
||||
set p1 "fail"
|
||||
set p2 "pass"
|
||||
}
|
||||
|
||||
# Now enable(disable) $b.1 $b2.1.
|
||||
gdb_test_no_output "$what $b1.1 $b2.1" "$what \$b1.1 \$b2.1"
|
||||
set test1 "${what}d \$b1.1 and \$b2.1"
|
||||
|
||||
# Now $b1.1 and $b2.1 should be enabled(disabled).
|
||||
gdb_test_multiple "info break" "$test1" {
|
||||
-re "(${b1}.1)(\[^\n\r\]*)( n.*)(${b2}.1)(\[^\n\r\]*)( n.*)$gdb_prompt $" {
|
||||
$p1 "$test1"
|
||||
}
|
||||
-re ".*$gdb_prompt $" {
|
||||
$p2 "$test1"
|
||||
}
|
||||
}
|
||||
|
||||
# Now enable(disable) $b1 fooo.1, it should give error on fooo.
|
||||
gdb_test "$what $b1 fooo.1" \
|
||||
"Bad breakpoint number 'fooo'" \
|
||||
"$what \$b1 fooo.1"
|
||||
|
||||
# $b1 should be enabled(disabled).
|
||||
gdb_test "info break" \
|
||||
"(${b1})(\[^\n\r]*)( $what_res.*)" \
|
||||
"${what}d \$b1"
|
||||
|
||||
gdb_test_no_output "$oppos $b3" "$oppos \$b3"
|
||||
gdb_test_no_output "$what $b4 $b3.1" "$what \$b4 \$b3.1"
|
||||
set test1 "${what}d \$b4 and \$b3.1,remain ${oppos}d \$b3"
|
||||
|
||||
# Now $b4 $b3.1 should be enabled(disabled) and
|
||||
# $b3 should remain disabled(enabled).
|
||||
gdb_test_multiple "info break" "$test1" {
|
||||
-re "(${b3})(\[^\n\r]*)( $oppos_res.*)(${b3}.1)(\[^\n\r\]*)( n.*)(${b4})(\[^\n\r\]*)( $what_res.*)$gdb_prompt $" {
|
||||
$p1 "$test1"
|
||||
}
|
||||
-re "(${b3})(\[^\n\r]*)( $oppos_res.*)(${b4})(\[^\n\r\]*)( $what_res.*)$gdb_prompt $" {
|
||||
$p2 "$test1"
|
||||
}
|
||||
}
|
||||
|
||||
# Now enable(disable) $b4.1 fooobaar and
|
||||
# it should give warning on fooobaar.
|
||||
gdb_test "$what $b4.1 fooobaar" \
|
||||
"warning: bad breakpoint number at or near 'fooobaar'" \
|
||||
"$what \$b4.1 fooobar"
|
||||
set test1 "${what}d \$b4.1"
|
||||
|
||||
# $b4.1 should be enabled(disabled).
|
||||
gdb_test_multiple "info break" "$test1" {
|
||||
-re "(${b4}.1)(\[^\n\r\]*)( n.*)$gdb_prompt $" {
|
||||
$p1 "$test1"
|
||||
}
|
||||
-re ".*$gdb_prompt $" {
|
||||
$p2 "$test1"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
test_ena_dis_br "disable"
|
||||
test_ena_dis_br "enable"
|
||||
|
||||
gdb_exit
|
||||
return 0
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue