diff options
| -rw-r--r-- | gdb/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/annotate.c | 22 | ||||
| -rw-r--r-- | gdb/annotate.h | 1 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 1 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/annota1.exp | 5 |
6 files changed, 20 insertions, 25 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index eb02b37d01c..fd4e37f3925 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2013-01-22 Pedro Alves <palves@redhat.com> + + * annotate.c (ignore_count_changed): Delete. + (annotate_breakpoints_changed): Don't clear ignore_count_changed. + (annotate_ignore_count_change): Delete. + (annotate_stopped): Don't emit a delayed breakpoints-changed + annotation. + * annotate.h (annotate_ignore_count_change): Delete. + * breakpoint.c (bpstat_check_breakpoint_conditions): Don't call + annotate_ignore_count_change. + 2013-01-22 Tom Tromey <tromey@redhat.com> * dwarf2loc.c (dwarf2_compile_expr_to_ax) <DW_OP_fbreg>: Only diff --git a/gdb/annotate.c b/gdb/annotate.c index 1919467e743..25f765986c6 100644 --- a/gdb/annotate.c +++ b/gdb/annotate.c @@ -37,8 +37,6 @@ static void breakpoint_changed (struct breakpoint *b); void (*deprecated_annotate_signalled_hook) (void); void (*deprecated_annotate_signal_hook) (void); -static int ignore_count_changed = 0; - static void print_value_flags (struct type *t) { @@ -55,24 +53,9 @@ annotate_breakpoints_changed (void) { target_terminal_ours (); printf_unfiltered (("\n\032\032breakpoints-invalid\n")); - if (ignore_count_changed) - ignore_count_changed = 0; /* Avoid multiple break annotations. */ } } -/* The GUI needs to be informed of ignore_count changes, but we don't - want to provide successive multiple breakpoints-invalid messages - that are all caused by the fact that the ignore count is changing - (which could keep the GUI very busy). One is enough, after the - target actually "stops". */ - -void -annotate_ignore_count_change (void) -{ - if (annotation_level > 1) - ignore_count_changed = 1; -} - void annotate_breakpoint (int num) { @@ -106,11 +89,6 @@ annotate_stopped (void) { if (annotation_level > 1) printf_filtered (("\n\032\032stopped\n")); - if (annotation_level > 1 && ignore_count_changed) - { - ignore_count_changed = 0; - annotate_breakpoints_changed (); - } } void diff --git a/gdb/annotate.h b/gdb/annotate.h index 2ea465aa1ab..ea8ad15c8f7 100644 --- a/gdb/annotate.h +++ b/gdb/annotate.h @@ -21,7 +21,6 @@ extern void annotate_breakpoints_changed (void); -extern void annotate_ignore_count_change (void); extern void annotate_breakpoint (int); extern void annotate_catchpoint (int); extern void annotate_watchpoint (int); diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index fd4132f49f6..35848b4a8b3 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -5137,7 +5137,6 @@ bpstat_check_breakpoint_conditions (bpstat bs, ptid_t ptid) else if (b->ignore_count > 0) { b->ignore_count--; - annotate_ignore_count_change (); bs->stop = 0; /* Increase the hit count even though we don't stop. */ ++(b->hit_count); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1010c998455..5d3ed122a52 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-01-22 Pedro Alves <palves@redhat.com> + + * gdb.base/annota1.exp (annotate ignore count change): Add + expected output for failure case. + 2013-01-22 Tom Tromey <tromey@redhat.com> * gdb.gdb/selftest.exp (do_steps_and_nexts): Handle bfd_init diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp index 89fbd947276..776738a6590 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -365,7 +365,10 @@ gdb_test_multiple "ignore 5 4" "ignore 5 4" { } gdb_test_multiple "continue" "annotate ignore count change" { - -re ".*$srcfile:$value_inc_line:.*\032\032stopped\r\n\r\n\032\032breakpoints-invalid\r\n$gdb_prompt$" { + -re ".*breakpoints-invalid.*breakpoints-invalid.*$gdb_prompt$" { + fail "annotate ignore count change" + } + -re ".*$srcfile:$value_inc_line:.*\032\032stopped\r\n$gdb_prompt$" { pass "annotate ignore count change" } } |