diff options
| author | Christian Biesinger <cbiesinger@google.com> | 2019-10-07 17:38:51 -0500 |
|---|---|---|
| committer | Christian Biesinger <cbiesinger@google.com> | 2019-10-15 15:30:00 +0200 |
| commit | 81e6b8eb208c427028d919afb2b5cabbc355fc88 (patch) | |
| tree | 20cbd7f0f060297fe1e21538704f5a733968fb47 /gdb | |
| parent | 95da600f404ca159242f49441d9b4ea78183852b (diff) | |
| download | gdb-81e6b8eb208c427028d919afb2b5cabbc355fc88.zip gdb-81e6b8eb208c427028d919afb2b5cabbc355fc88.tar.gz gdb-81e6b8eb208c427028d919afb2b5cabbc355fc88.tar.bz2 | |
Make tui-winsource not use breakpoint_chain
That's an internal variable of breakpoint.c. Insted, use
iterate_over_breakpoints to update the breakpoint list.
gdb/ChangeLog:
2019-10-15 Christian Biesinger <cbiesinger@google.com>
* breakpoint.c (breakpoint_chain): Make static.
* tui/tui-winsource.c: Call iterate_over_breakpoints instead
of accessing breakpoint_chain.
Change-Id: Ic259b2c3a4c1f5a47f34cfd7fccbdcf274417429
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 2 | ||||
| -rw-r--r-- | gdb/tui/tui-winsource.c | 11 |
3 files changed, 11 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 39a8374..9d3ec1f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2019-10-15 Christian Biesinger <cbiesinger@google.com> + * breakpoint.c (breakpoint_chain): Make static. + * tui/tui-winsource.c: Call iterate_over_breakpoints instead + of accessing breakpoint_chain. + +2019-10-15 Christian Biesinger <cbiesinger@google.com> + * breakpoint.c (iterate_over_breakpoints): Change function pointer to a gdb::function_view and return value to bool. * breakpoint.h (iterate_over_breakpoints): Likewise. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 9bbb28f..2fd2438 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -517,7 +517,7 @@ bool target_exact_watchpoints = false; /* Chains of all breakpoints defined. */ -struct breakpoint *breakpoint_chain; +static struct breakpoint *breakpoint_chain; /* Array is sorted by bp_locations_compare - primarily by the ADDRESS. */ diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index f1c9f95..3fbc49f 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -401,8 +401,6 @@ tui_source_window_base::update_breakpoint_info for (i = 0; i < content.size (); i++) { - struct breakpoint *bp; - extern struct breakpoint *breakpoint_chain; struct tui_source_element *line; line = &content[i]; @@ -413,9 +411,7 @@ tui_source_window_base::update_breakpoint_info do with it. Identify enable/disabled breakpoints as well as those that we already hit. */ tui_bp_flags mode = 0; - for (bp = breakpoint_chain; - bp != NULL; - bp = bp->next) + iterate_over_breakpoints ([&] (breakpoint *bp) -> bool { struct bp_location *loc; @@ -423,7 +419,7 @@ tui_source_window_base::update_breakpoint_info || line->line_or_addr.loa == LOA_ADDRESS); if (bp == being_deleted) - continue; + return false; for (loc = bp->loc; loc != NULL; loc = loc->next) { @@ -441,7 +437,8 @@ tui_source_window_base::update_breakpoint_info mode |= TUI_BP_HARDWARE; } } - } + return false; + }); if (line->break_mode != mode) { line->break_mode = mode; |