diff options
| author | Tom Tromey <tromey@adacore.com> | 2019-07-10 11:05:20 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-07-10 14:48:53 -0600 |
| commit | f06f1252b0b8ef20adb4296faaf8293c9d36f615 (patch) | |
| tree | 3fd450906d0d4f71e257283f03d6ae3558a2ac36 /gdb/breakpoint.c | |
| parent | 7a5d944b9e86bf73ae5acaa984df24d175b80f68 (diff) | |
| download | fsf-binutils-gdb-f06f1252b0b8ef20adb4296faaf8293c9d36f615.zip fsf-binutils-gdb-f06f1252b0b8ef20adb4296faaf8293c9d36f615.tar.gz fsf-binutils-gdb-f06f1252b0b8ef20adb4296faaf8293c9d36f615.tar.bz2 | |
Change Ada catchpoints to be bp_catchpoint
Like Pedro's earlier patches to change catchpoint to be of type
bp_catchpoint, this changes the Ada catchpoints to follow.
Tested on x86-64 Fedora 29.
gdb/ChangeLog
2019-07-10 Tom Tromey <tromey@adacore.com>
* ada-lang.h (is_ada_exception_catchpoint): Declare.
* breakpoint.c (init_ada_exception_breakpoint): Register as
bp_catchpoint.
(print_one_breakpoint_location, print_one_breakpoint): Use
is_ada_exception_catchpoint.
* ada-lang.c (class ada_catchpoint_location): Pass
bp_loc_software_breakpoint to bp_location constructor.
(is_ada_exception_catchpoint): New function.
gdb/testsuite/ChangeLog
2019-07-10 Tom Tromey <tromey@adacore.com>
* gdb.ada/mi_ex_cond.exp: Update expected results.
* gdb.ada/mi_catch_ex_hand.exp: Update expected results.
* gdb.ada/mi_catch_ex.exp: Update expected results.
* gdb.ada/mi_catch_assert.exp: Update expected results.
* gdb.ada/catch_ex.exp (catch_exception_info)
(catch_exception_entry, catch_assert_entry)
(catch_unhandled_entry): Update.
* gdb.ada/catch_assert_if.exp: Update expected results.
Diffstat (limited to 'gdb/breakpoint.c')
| -rw-r--r-- | gdb/breakpoint.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 8ae7cd6..09c2a27 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -6054,7 +6054,8 @@ print_one_breakpoint_location (struct breakpoint *b, annotate_field (5); uiout->field_string ("what", w->exp_string); } - else if (!is_catchpoint (b) || is_exception_catchpoint (b)) + else if (!is_catchpoint (b) || is_exception_catchpoint (b) + || is_ada_exception_catchpoint (b)) { if (opts.addressprint) { @@ -6329,7 +6330,8 @@ print_one_breakpoint (struct breakpoint *b, exposed to users. We do however display the internal breakpoint locations with "maint info breakpoints". */ if (!is_hardware_watchpoint (b) - && (!is_catchpoint (b) || is_exception_catchpoint (b)) + && (!is_catchpoint (b) || is_exception_catchpoint (b) + || is_ada_exception_catchpoint (b)) && (allflag || (b->loc && (b->loc->next || !b->loc->enabled)))) { @@ -11212,7 +11214,7 @@ init_ada_exception_breakpoint (struct breakpoint *b, enough for now, though. */ } - init_raw_breakpoint (b, gdbarch, sal, bp_breakpoint, ops); + init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint, ops); b->enable_state = enabled ? bp_enabled : bp_disabled; b->disposition = tempflag ? disp_del : disp_donttouch; |