diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2011-07-01 18:35:36 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2011-07-01 18:35:36 +0000 |
| commit | 00eb2c4ae81736e51d2bac0fbab4f8b04ab3d319 (patch) | |
| tree | ab6eea88206b85df3e784f31f598a65b47555335 /gdb/ada-lang.c | |
| parent | 85a20c42eacf836502c5dc0cc2afbd24666b2e86 (diff) | |
| download | gdb-00eb2c4ae81736e51d2bac0fbab4f8b04ab3d319.zip gdb-00eb2c4ae81736e51d2bac0fbab4f8b04ab3d319.tar.gz gdb-00eb2c4ae81736e51d2bac0fbab4f8b04ab3d319.tar.bz2 | |
bettter display for temporary Ada exception catchpoints
Temporary catchpoints on Ada exceptions are now displayed as "Temporary
catchpoint" as opposed to just "Catchpoint". This is cosmetic only, but
in line with what's done for other catchpoints as well as breakpoints.
gdb/ChangeLog:
* ada-lang.c (print_it_exception): Print temporary catchpoints
as "Temporary catchpoint".
(print_mention_exception): Likewise.
gdb/testsuite/ChangeLog:
* gdb.ada/catch_ex.exp: Add temporary catchpoint tests.
Diffstat (limited to 'gdb/ada-lang.c')
| -rw-r--r-- | gdb/ada-lang.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 766bfc8..752af87 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -11085,7 +11085,9 @@ print_it_exception (enum exception_catchpoint_kind ex, struct breakpoint *b) ui_out_field_string (uiout, "disp", bpdisp_text (b->disposition)); } - ui_out_text (uiout, "\nCatchpoint "); + ui_out_text (uiout, + b->disposition == disp_del ? "\nTemporary catchpoint " + : "\nCatchpoint "); ui_out_field_int (uiout, "bkptno", b->number); ui_out_text (uiout, ", "); @@ -11194,24 +11196,32 @@ print_mention_exception (enum exception_catchpoint_kind ex, { struct ada_catchpoint *c = (struct ada_catchpoint *) b; + ui_out_text (uiout, b->disposition == disp_del ? _("Temporary catchpoint ") + : _("Catchpoint ")); + ui_out_field_int (uiout, "bkptno", b->number); + ui_out_text (uiout, ": "); + switch (ex) { case ex_catch_exception: if (c->excep_string != NULL) - printf_filtered (_("Catchpoint %d: `%s' Ada exception"), - b->number, c->excep_string); + { + char *info = xstrprintf (_("`%s' Ada exception"), c->excep_string); + struct cleanup *old_chain = make_cleanup (xfree, info); + + ui_out_text (uiout, info); + do_cleanups (old_chain); + } else - printf_filtered (_("Catchpoint %d: all Ada exceptions"), b->number); - + ui_out_text (uiout, _("all Ada exceptions")); break; case ex_catch_exception_unhandled: - printf_filtered (_("Catchpoint %d: unhandled Ada exceptions"), - b->number); + ui_out_text (uiout, _("unhandled Ada exceptions")); break; case ex_catch_assert: - printf_filtered (_("Catchpoint %d: failed Ada assertions"), b->number); + ui_out_text (uiout, _("failed Ada assertions")); break; default: |