diff options
| -rw-r--r-- | gdb/ChangeLog | 36 | ||||
| -rw-r--r-- | gdb/NEWS | 4 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 267 | ||||
| -rw-r--r-- | gdb/breakpoint.h | 5 | ||||
| -rw-r--r-- | gdb/doc/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/doc/gdb.texinfo | 14 | ||||
| -rw-r--r-- | gdb/symtab.c | 33 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/commands.exp | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/default.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/extern-c.exp | 19 |
11 files changed, 302 insertions, 97 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7f0aff9..37670c4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,41 @@ 2010-03-24 Tom Tromey <tromey@redhat.com> + PR breakpoints/9352: + * NEWS: Mention changes to `commands' and `rbreak'. + * symtab.c (do_end_rbreak_breakpoints): New function. + (rbreak_command): Call start_rbreak_breakpoints; arrange to call + end_rbreak_breakpoints. + * breakpoint.c (breakpoint_count, tracepoint_count): Now static. + (set_breakpoint_count): Likewise. Clear last_was_multi. + (multi_start, multi_end, last_was_multi): New globals. + (start_rbreak_breakpoints, end_rbreak_breakpoints): New + functions. + (struct commands_info): New + (do_map_commands_command): New function. + (commands_command_1): New function. + (commands_command): Use it. + (commands_from_control_command): Likewise. + (do_delete_breakpoint): New function. + (delete_command): Use it. + (map_breakpoint_numbers): Add 'data' argument. Pass to callback. + (do_map_disable_breakpoint): New function. + (disable_command): Use it. + (do_map_enable_breakpoint): New function. + (enable_command): Use it. + (enable_once_breakpoint): Add argument. + (enable_once_command): Update. + (enable_delete_breakpoint): Add argument. + (enable_delete_command): Update. + (break_command_really): Set last_was_multi when needed. + (check_tracepoint_command): Fix formatting. + (validate_commands_for_breakpoint): New function. + (breakpoint_set_commands): Use it. + (tracepoint_save_command): Update. + * breakpoint.h (start_rbreak_breakpoints, end_rbreak_breakpoints): + Declare. + +2010-03-24 Tom Tromey <tromey@redhat.com> + * breakpoint.h (struct counted_command_line): New struct. (struct breakpoint) <commands>: Change type. (struct bpstats) <commands>: Change type. @@ -13,6 +13,10 @@ 16-bit word register AX that are actually portions of the 32-bit register EAX or 64-bit register RAX. +* The `commands' command now accepts a range of breakpoints to modify. + A plain `commands' following an `rbreak' will affect all the + breakpoints set by `rbreak'. + * Python scripting ** The GDB Python API now has access to symbols, symbol tables, and diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 2cd802e..2cc1f08 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -79,17 +79,15 @@ static void enable_delete_command (char *, int); -static void enable_delete_breakpoint (struct breakpoint *); - static void enable_once_command (char *, int); -static void enable_once_breakpoint (struct breakpoint *); - static void disable_command (char *, int); static void enable_command (char *, int); -static void map_breakpoint_numbers (char *, void (*)(struct breakpoint *)); +static void map_breakpoint_numbers (char *, void (*) (struct breakpoint *, + void *), + void *); static void ignore_command (char *, int); @@ -146,8 +144,6 @@ static void condition_command (char *, int); static int get_number_trailer (char **, int); -void set_breakpoint_count (int); - typedef enum { mark_inserted, @@ -392,11 +388,19 @@ VEC(bp_location_p) *moribund_locations = NULL; /* Number of last breakpoint made. */ -int breakpoint_count; +static int breakpoint_count; + +/* If the last command to create a breakpoint created multiple + breakpoints, this holds the start and end breakpoint numbers. */ +static int multi_start; +static int multi_end; +/* True if the last breakpoint set was part of a group set with a + single command, e.g., "rbreak". */ +static int last_was_multi; /* Number of last tracepoint made. */ -int tracepoint_count; +static int tracepoint_count; /* Return whether a breakpoint is an active enabled breakpoint. */ static int @@ -407,13 +411,34 @@ breakpoint_enabled (struct breakpoint *b) /* Set breakpoint count to NUM. */ -void +static void set_breakpoint_count (int num) { breakpoint_count = num; + last_was_multi = 0; set_internalvar_integer (lookup_internalvar ("bpnum"), num); } +/* Called at the start an "rbreak" command to record the first + breakpoint made. */ +void +start_rbreak_breakpoints (void) +{ + multi_start = breakpoint_count + 1; +} + +/* Called at the end of an "rbreak" command to record the last + breakpoint made. */ +void +end_rbreak_breakpoints (void) +{ + if (breakpoint_count >= multi_start) + { + multi_end = breakpoint_count; + last_was_multi = 1; + } +} + /* Used in run_command to zero the hit count when a new run starts. */ void @@ -792,12 +817,13 @@ breakpoint_is_tracepoint (const struct breakpoint *b) } } -/* Set the command list of B to COMMANDS. If breakpoint is tracepoint, - validate that only allowed commands are included. -*/ +/* A helper function that validsates that COMMANDS are valid for a + breakpoint. This function will throw an exception if a problem is + found. */ -void -breakpoint_set_commands (struct breakpoint *b, struct command_line *commands) +static void +validate_commands_for_breakpoint (struct breakpoint *b, + struct command_line *commands) { if (breakpoint_is_tracepoint (b)) { @@ -839,6 +865,16 @@ breakpoint_set_commands (struct breakpoint *b, struct command_line *commands) { check_no_tracepoint_commands (commands); } +} + +/* Set the command list of B to COMMANDS. If breakpoint is tracepoint, + validate that only allowed commands are included. +*/ + +void +breakpoint_set_commands (struct breakpoint *b, struct command_line *commands) +{ + validate_commands_for_breakpoint (b, commands); decref_counted_command_line (&b->commands); b->commands = alloc_counted_command_line (commands); @@ -846,43 +882,100 @@ breakpoint_set_commands (struct breakpoint *b, struct command_line *commands) observer_notify_breakpoint_modified (b->number); } -void check_tracepoint_command (char *line, void *closure) +void +check_tracepoint_command (char *line, void *closure) { struct breakpoint *b = closure; validate_actionline (&line, b); } +/* A structure used to pass information through + map_breakpoint_numbers. */ + +struct commands_info +{ + /* True if the command was typed at a tty. */ + int from_tty; + /* Non-NULL if the body of the commands are being read from this + already-parsed command. */ + struct command_line *control; + /* The command lines read from the user, or NULL if they have not + yet been read. */ + struct counted_command_line *cmd; +}; + +/* A callback for map_breakpoint_numbers that sets the commands for + commands_command. */ + static void -commands_command (char *arg, int from_tty) +do_map_commands_command (struct breakpoint *b, void *data) { - struct breakpoint *b; - char *p; - int bnum; - struct command_line *l; + struct commands_info *info = data; - p = arg; - bnum = get_number (&p); + if (info->cmd == NULL) + { + struct command_line *l; - if (p && *p) - error (_("Unexpected extra arguments following breakpoint number.")); + if (info->control != NULL) + l = copy_command_lines (info->control->body_list[0]); + else - ALL_BREAKPOINTS (b) - if (b->number == bnum) - { - char *tmpbuf = xstrprintf ("Type commands for when breakpoint %d is hit, one per line.", - bnum); - struct cleanup *cleanups = make_cleanup (xfree, tmpbuf); + l = read_command_lines (_("Type commands for all specified breakpoints"), + info->from_tty, 1, + (breakpoint_is_tracepoint (b) + ? check_tracepoint_command : 0), + b); - if (breakpoint_is_tracepoint (b)) - l = read_command_lines (tmpbuf, from_tty, 1, - check_tracepoint_command, b); - else - l = read_command_lines (tmpbuf, from_tty, 1, 0, 0); - do_cleanups (cleanups); - breakpoint_set_commands (b, l); - return; + info->cmd = alloc_counted_command_line (l); + } + + /* If a breakpoint was on the list more than once, we don't need to + do anything. */ + if (b->commands != info->cmd) + { + validate_commands_for_breakpoint (b, info->cmd->commands); + incref_counted_command_line (info->cmd); + decref_counted_command_line (&b->commands); + b->commands = info->cmd; + breakpoints_changed (); + observer_notify_breakpoint_modified (b->number); } - error (_("No breakpoint number %d."), bnum); +} + +static void +commands_command_1 (char *arg, int from_tty, struct command_line *control) +{ + struct cleanup *cleanups; + struct commands_info info; + + info.from_tty = from_tty; + info.control = control; + info.cmd = NULL; + /* If we read command lines from the user, then `info' will hold an + extra reference to the commands that we must clean up. */ + cleanups = make_cleanup_decref_counted_command_line (&info.cmd); + + if (arg == NULL || !*arg) + { + if (last_was_multi) + arg = xstrprintf ("%d-%d", multi_start, multi_end); + else if (breakpoint_count > 0) + arg = xstrprintf ("%d", breakpoint_count); + make_cleanup (xfree, arg); + } + + map_breakpoint_numbers (arg, do_map_commands_command, &info); + + if (info.cmd == NULL) + error (_("No breakpoints specified.")); + + do_cleanups (cleanups); +} + +static void +commands_command (char *arg, int from_tty) +{ + commands_command_1 (arg, from_tty, NULL); } /* Like commands_command, but instead of reading the commands from @@ -893,36 +986,8 @@ commands_command (char *arg, int from_tty) enum command_control_type commands_from_control_command (char *arg, struct command_line *cmd) { - struct breakpoint *b; - char *p; - int bnum; - - /* An empty string for the breakpoint number means the last - breakpoint, but get_number expects a NULL pointer. */ - if (arg && !*arg) - p = NULL; - else - p = arg; - bnum = get_number (&p); - - if (p && *p) - error (_("Unexpected extra arguments following breakpoint number.")); - - ALL_BREAKPOINTS (b) - if (b->number == bnum) - { - decref_counted_command_line (&b->commands); - if (cmd->body_count != 1) - error (_("Invalid \"commands\" block structure.")); - /* We need to copy the commands because if/while will free the - list after it finishes execution. */ - b->commands - = alloc_counted_command_line (copy_command_lines (cmd->body_list[0])); - breakpoints_changed (); - observer_notify_breakpoint_modified (b->number); - return simple_control; - } - error (_("No breakpoint number %d."), bnum); + commands_command_1 (arg, 0, cmd); + return simple_control; } /* Return non-zero if BL->TARGET_INFO contains valid information. */ @@ -7111,6 +7176,7 @@ create_breakpoint (struct gdbarch *gdbarch, int not_found = 0; enum bptype type_wanted; int task = 0; + int first_bp_set = breakpoint_count + 1; sals.sals = NULL; sals.nelts = 0; @@ -7267,8 +7333,14 @@ create_breakpoint (struct gdbarch *gdbarch, } if (sals.nelts > 1) - warning (_("Multiple breakpoints were set.\n" - "Use the \"delete\" command to delete unwanted breakpoints.")); + { + warning (_("Multiple breakpoints were set.\n" + "Use the \"delete\" command to delete unwanted breakpoints.")); + multi_start = first_bp_set; + multi_end = breakpoint_count; + last_was_multi = 1; + } + /* That's it. Discard the cleanups for data inserted into the breakpoint. */ discard_cleanups (bkpt_chain); @@ -9124,6 +9196,15 @@ make_cleanup_delete_breakpoint (struct breakpoint *b) return make_cleanup (do_delete_breakpoint_cleanup, b); } +/* A callback for map_breakpoint_numbers that calls + delete_breakpoint. */ + +static void +do_delete_breakpoint (struct breakpoint *b, void *ignore) +{ + delete_breakpoint (b); +} + void delete_command (char *arg, int from_tty) { @@ -9171,7 +9252,7 @@ delete_command (char *arg, int from_tty) } } else - map_breakpoint_numbers (arg, delete_breakpoint); + map_breakpoint_numbers (arg, do_delete_breakpoint, NULL); } static int @@ -9632,7 +9713,9 @@ ignore_command (char *args, int from_tty) whose numbers are given in ARGS. */ static void -map_breakpoint_numbers (char *args, void (*function) (struct breakpoint *)) +map_breakpoint_numbers (char *args, void (*function) (struct breakpoint *, + void *), + void *data) { char *p = args; char *p1; @@ -9660,9 +9743,9 @@ map_breakpoint_numbers (char *args, void (*function) (struct breakpoint *)) { struct breakpoint *related_breakpoint = b->related_breakpoint; match = 1; - function (b); + function (b, data); if (related_breakpoint) - function (related_breakpoint); + function (related_breakpoint, data); break; } if (match == 0) @@ -9738,6 +9821,15 @@ disable_breakpoint (struct breakpoint *bpt) observer_notify_breakpoint_modified (bpt->number); } +/* A callback for map_breakpoint_numbers that calls + disable_breakpoint. */ + +static void +do_map_disable_breakpoint (struct breakpoint *b, void *ignore) +{ + disable_breakpoint (b); +} + static void disable_command (char *args, int from_tty) { @@ -9771,7 +9863,7 @@ disable_command (char *args, int from_tty) update_global_location_list (0); } else - map_breakpoint_numbers (args, disable_breakpoint); + map_breakpoint_numbers (args, do_map_disable_breakpoint, NULL); } static void @@ -9828,6 +9920,15 @@ enable_breakpoint (struct breakpoint *bpt) do_enable_breakpoint (bpt, bpt->disposition); } +/* A callback for map_breakpoint_numbers that calls + enable_breakpoint. */ + +static void +do_map_enable_breakpoint (struct breakpoint *b, void *ignore) +{ + enable_breakpoint (b); +} + /* The enable command enables the specified breakpoints (or all defined breakpoints) so they once again become (or continue to be) effective in stopping the inferior. */ @@ -9865,11 +9966,11 @@ enable_command (char *args, int from_tty) update_global_location_list (1); } else - map_breakpoint_numbers (args, enable_breakpoint); + map_breakpoint_numbers (args, do_map_enable_breakpoint, NULL); } static void -enable_once_breakpoint (struct breakpoint *bpt) +enable_once_breakpoint (struct breakpoint *bpt, void *ignore) { do_enable_breakpoint (bpt, disp_disable); } @@ -9877,11 +9978,11 @@ enable_once_breakpoint (struct breakpoint *bpt) static void enable_once_command (char *args, int from_tty) { - map_breakpoint_numbers (args, enable_once_breakpoint); + map_breakpoint_numbers (args, enable_once_breakpoint, NULL); } static void -enable_delete_breakpoint (struct breakpoint *bpt) +enable_delete_breakpoint (struct breakpoint *bpt, void *ignore) { do_enable_breakpoint (bpt, disp_del); } @@ -9889,7 +9990,7 @@ enable_delete_breakpoint (struct breakpoint *bpt) static void enable_delete_command (char *args, int from_tty) { - map_breakpoint_numbers (args, enable_delete_breakpoint); + map_breakpoint_numbers (args, enable_delete_breakpoint, NULL); } static void @@ -10312,7 +10413,7 @@ delete_trace_command (char *arg, int from_tty) } } else - map_breakpoint_numbers (arg, delete_breakpoint); + map_breakpoint_numbers (arg, do_delete_breakpoint, NULL); } /* Set passcount for tracepoint. diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 4a1a7ad..197bbc4 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1025,4 +1025,9 @@ extern int breakpoint_is_tracepoint (const struct breakpoint *b); that each command is suitable for tracepoint command list. */ extern void check_tracepoint_command (char *line, void *closure); +/* Call at the start and end of an "rbreak" command to register + breakpoint numbers for a later "commands" command. */ +extern void start_rbreak_breakpoints (void); +extern void end_rbreak_breakpoints (void); + #endif /* !defined (BREAKPOINT_H) */ diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 52abfbe..d99937a 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2010-03-24 Tom Tromey <tromey@redhat.com> + + PR breakpoints/9352: + * gdb.texinfo (Break Commands): Update. + 2010-03-24 Vladimir Prus <vladimir@codesourcery.com> * gdb.texinfo (GDB/MI Tracepoint Commands): Document MI tracepoint diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 87bbdf1..369556d 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -4328,19 +4328,23 @@ enable other breakpoints. @table @code @kindex commands @kindex end@r{ (breakpoint commands)} -@item commands @r{[}@var{bnum}@r{]} +@item commands @r{[}@var{range}@dots{}@r{]} @itemx @dots{} @var{command-list} @dots{} @itemx end -Specify a list of commands for breakpoint number @var{bnum}. The commands +Specify a list of commands for the given breakpoints. The commands themselves appear on the following lines. Type a line containing just @code{end} to terminate the commands. To remove all commands from a breakpoint, type @code{commands} and follow it immediately with @code{end}; that is, give no commands. -With no @var{bnum} argument, @code{commands} refers to the last -breakpoint, watchpoint, or catchpoint set (not to the breakpoint most -recently encountered). +With no argument, @code{commands} refers to the last breakpoint, +watchpoint, or catchpoint set (not to the breakpoint most recently +encountered). If the most recent breakpoints were set with a single +command, then the @code{commands} will apply to all the breakpoints +set by that command. This applies to breakpoints set by +@code{rbreak}, and also breakpoints set with @code{break} that have +multiple locations. @end table Pressing @key{RET} as a means of repeating the last @value{GDBN} command is diff --git a/gdb/symtab.c b/gdb/symtab.c index ecf0cb6..0a82073 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -3170,23 +3170,41 @@ rbreak_command_wrapper (char *regexp, int from_tty) rbreak_command (regexp, from_tty); } +/* A cleanup function that calls end_rbreak_breakpoints. */ + +static void +do_end_rbreak_breakpoints (void *ignore) +{ + end_rbreak_breakpoints (); +} + static void rbreak_command (char *regexp, int from_tty) { struct symbol_search *ss; struct symbol_search *p; struct cleanup *old_chain; + char *string = NULL; + int len = 0; search_symbols (regexp, FUNCTIONS_DOMAIN, 0, (char **) NULL, &ss); old_chain = make_cleanup_free_search_symbols (ss); + make_cleanup (free_current_contents, &string); + start_rbreak_breakpoints (); + make_cleanup (do_end_rbreak_breakpoints, NULL); for (p = ss; p != NULL; p = p->next) { if (p->msymbol == NULL) { - char *string = alloca (strlen (p->symtab->filename) - + strlen (SYMBOL_LINKAGE_NAME (p->symbol)) - + 4); + int newlen = (strlen (p->symtab->filename) + + strlen (SYMBOL_LINKAGE_NAME (p->symbol)) + + 4); + if (newlen > len) + { + string = xrealloc (string, newlen); + len = newlen; + } strcpy (string, p->symtab->filename); strcat (string, ":'"); strcat (string, SYMBOL_LINKAGE_NAME (p->symbol)); @@ -3200,8 +3218,13 @@ rbreak_command (char *regexp, int from_tty) } else { - char *string = alloca (strlen (SYMBOL_LINKAGE_NAME (p->msymbol)) - + 3); + int newlen = (strlen (SYMBOL_LINKAGE_NAME (p->msymbol)) + + 3); + if (newlen > len) + { + string = xrealloc (string, newlen); + len = newlen; + } strcpy (string, "'"); strcat (string, SYMBOL_LINKAGE_NAME (p->msymbol)); strcat (string, "'"); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5aa6398..d031729 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2010-03-24 Tom Tromey <tromey@redhat.com> + + PR breakpoints/9352: + * gdb.base/default.exp: Update. + * gdb.base/commands.exp: Update. + * gdb.cp/extern-c.exp: Test setting commands on multiple + breakpoints at once. + 2010-03-24 Daniel Jacobowitz <dan@codesourcery.com> * gdb.base/call-signal-resume.exp, gdb.base/unwindonsignal.exp: Skip diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index 8bb4147..ee3d787 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -299,7 +299,7 @@ proc watchpoint_command_test {} { send_gdb "commands $wp_id\n" gdb_expect { - -re "Type commands for when breakpoint $wp_id is hit, one per line.*>" { + -re "Type commands for all specified breakpoints.*>" { pass "begin commands on watch" } -re "$gdb_prompt $" {fail "begin commands on watch"} @@ -452,7 +452,7 @@ proc bp_deleted_in_command_test {} { send_gdb "commands\n" gdb_expect { - -re "Type commands for when breakpoint .* is hit, one per line.*>" { + -re "Type commands for all specified breakpoints.*>" { pass "begin commands in bp_deleted_in_command_test" } -re "$gdb_prompt $" {fail "begin commands in bp_deleted_in_command_test"} @@ -519,7 +519,7 @@ proc temporary_breakpoint_commands {} { send_gdb "commands\n" gdb_expect { - -re "Type commands for when breakpoint .* is hit, one per line.*>" { + -re "Type commands for all specified breakpoints.*>" { pass "begin commands in bp_deleted_in_command_test" } -re "$gdb_prompt $" {fail "begin commands in bp_deleted_in_command_test"} diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp index 808435d..bed00e6 100644 --- a/gdb/testsuite/gdb.base/default.exp +++ b/gdb/testsuite/gdb.base/default.exp @@ -100,7 +100,7 @@ gdb_test "cd" "Argument required .new working directory.*" "cd" gdb_test "clear" "No source file specified..*" "clear" #test commands -gdb_test "commands" "No breakpoint number 0..*" "commands" +gdb_test "commands" "Argument required .one or more breakpoint numbers...*" "commands" #test condition gdb_test "condition" "Argument required .breakpoint number.*" "condition" diff --git a/gdb/testsuite/gdb.cp/extern-c.exp b/gdb/testsuite/gdb.cp/extern-c.exp index 99b7874..5ad4e9c 100644 --- a/gdb/testsuite/gdb.cp/extern-c.exp +++ b/gdb/testsuite/gdb.cp/extern-c.exp @@ -40,7 +40,26 @@ if { [gdb_breakpoint "c_func"] == 1 } { } gdb_continue_to_breakpoint "c_func" ".*c_func.*" +gdb_test "set \$counter = 0" "" "initialize counter" + gdb_test "rbreak c_funcs" \ "Breakpoint.* at .*c_funcs_1.*Breakpoint.* at .*c_funcs_2.*" + +# Test that "commands" without an argument puts commands on both +# breakpoints. +gdb_test_multiple "commands" "set commands on multiple breakpoints" { + -re "Type commands for all specified breakpoints\r\nEnd with a line saying just \"end\".\r\n>$" { + gdb_test_multiple "set \$counter = \$counter + 1\nend" \ + "command details for multiple breakpoints" { + -re "$gdb_prompt $" { + pass "command details for multiple breakpoints" + } + } + pass "set commands on multiple breakpoints" + } +} + gdb_continue_to_breakpoint "c_funcs_1" ".*c_funcs_1.*" +gdb_test "print \$counter" " = 1" "verify counter at first breakpoint" gdb_continue_to_breakpoint "c_funcs_2" ".*c_funcs_2.*" +gdb_test "print \$counter" " = 2" "verify counter at second breakpoint" |