diff options
| author | Vladimir Prus <vladimir@codesourcery.com> | 2008-02-26 08:14:11 +0000 |
|---|---|---|
| committer | Vladimir Prus <vladimir@codesourcery.com> | 2008-02-26 08:14:11 +0000 |
| commit | 54e52265e21981a41ef297b0733bf2cb8eb9fc69 (patch) | |
| tree | bad52cf32e5e62d00489b457a3d4df2c11ce1d84 /gdb/breakpoint.c | |
| parent | 5ee461eeda97efb928944b46920db71f495bf7f4 (diff) | |
| download | gdb-54e52265e21981a41ef297b0733bf2cb8eb9fc69.zip gdb-54e52265e21981a41ef297b0733bf2cb8eb9fc69.tar.gz gdb-54e52265e21981a41ef297b0733bf2cb8eb9fc69.tar.bz2 | |
* breakpoint.c (print_one_breakpoint_location): Revert Enb field
to old format. Discard breakpoint address if shared library is
unloaded.
(breakpoint_1): Adjust formatting of table header accordingly.
Diffstat (limited to 'gdb/breakpoint.c')
| -rw-r--r-- | gdb/breakpoint.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index dca4ca1..019f4c8 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -3426,23 +3426,11 @@ print_one_breakpoint_location (struct breakpoint *b, /* 4 */ annotate_field (3); if (part_of_multiple) - ui_out_field_string (uiout, "enabled", - loc->shlib_disabled - ? (loc->enabled ? "y(p)" : "n(p)") - : (loc->enabled ? "y" : "n")); + ui_out_field_string (uiout, "enabled", loc->enabled ? "y" : "n"); else - { - int pending = (b->loc == NULL || b->loc->shlib_disabled); - /* For header of multiple, there's no point showing pending - state -- it will be apparent from the locations. */ - if (header_of_multiple) - pending = 0; - ui_out_field_fmt (uiout, "enabled", "%c%s", - bpenables[(int) b->enable_state], - pending ? "(p)" : ""); - if (!pending) - ui_out_spaces (uiout, 3); - } + ui_out_field_fmt (uiout, "enabled", "%c", + bpenables[(int) b->enable_state]); + ui_out_spaces (uiout, 2); /* 5 and 6 */ @@ -3553,10 +3541,10 @@ print_one_breakpoint_location (struct breakpoint *b, if (addressprint) { annotate_field (4); - if (b->loc == NULL) - ui_out_field_string (uiout, "addr", "<PENDING>"); - else if (header_of_multiple) + if (header_of_multiple) ui_out_field_string (uiout, "addr", "<MULTIPLE>"); + if (b->loc == NULL || loc->shlib_disabled) + ui_out_field_string (uiout, "addr", "<PENDING>"); else ui_out_field_core_addr (uiout, "addr", loc->address); } @@ -3781,7 +3769,7 @@ breakpoint_1 (int bnum, int allflag) ui_out_table_header (uiout, 4, ui_left, "disp", "Disp"); /* 3 */ if (nr_printable_breakpoints > 0) annotate_field (3); - ui_out_table_header (uiout, 4, ui_left, "enabled", "Enb"); /* 4 */ + ui_out_table_header (uiout, 3, ui_left, "enabled", "Enb"); /* 4 */ if (addressprint) { if (nr_printable_breakpoints > 0) |