X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fbreak-catch-throw.c;h=87b38b3b6017c8666bc419a4401eb7f84721cfc4;hb=8948cc6971fb82feffc49e2d21747111466ad642;hp=f9f468478d80ad3d66c66bcb9dc294395eaf1495;hpb=a70b814420059e1f2de2130d532ddd7b2b2500fc;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c index f9f468478d..87b38b3b60 100644 --- a/gdb/break-catch-throw.c +++ b/gdb/break-catch-throw.c @@ -1,6 +1,6 @@ /* Everything about catch/throw catchpoints, for GDB. - Copyright (C) 1986-2019 Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -37,14 +37,6 @@ #include "cp-support.h" #include "location.h" -/* Enums for exception-handling support. */ -enum exception_event_kind -{ - EX_EVENT_THROW, - EX_EVENT_RETHROW, - EX_EVENT_CATCH -}; - /* Each spot where we may place an exception-related catchpoint has two names: the SDT probe point and the function name. This structure holds both. */ @@ -91,6 +83,14 @@ struct exception_catchpoint : public breakpoint std::unique_ptr pattern; }; +/* See breakpoint.h. */ + +bool +is_exception_catchpoint (breakpoint *bp) +{ + return bp->ops == &gnu_v3_exception_catchpoint_ops; +} + /* A helper function that fetches exception probe arguments. This @@ -106,14 +106,16 @@ fetch_probe_arguments (struct value **arg0, struct value **arg1) unsigned n_args; pc_probe = find_probe_by_pc (pc); - if (pc_probe.prob == NULL - || pc_probe.prob->get_provider () != "libstdcxx" + if (pc_probe.prob == NULL) + error (_("did not find exception probe (does libstdcxx have SDT probes?)")); + + if (pc_probe.prob->get_provider () != "libstdcxx" || (pc_probe.prob->get_name () != "catch" && pc_probe.prob->get_name () != "throw" && pc_probe.prob->get_name () != "rethrow")) error (_("not stopped at a C++ exception catchpoint")); - n_args = pc_probe.prob->get_argument_count (frame); + n_args = pc_probe.prob->get_argument_count (get_frame_arch (frame)); if (n_args < 2) error (_("C++ exception catchpoint has too few arguments")); @@ -166,7 +168,7 @@ check_status_exception_catchpoint (struct bpstats *bs) if (!canon.empty ()) std::swap (type_name, canon); } - catch (const gdb_exception_RETURN_MASK_ERROR &e) + catch (const gdb_exception_error &e) { exception_print (gdb_stderr, e); } @@ -194,7 +196,7 @@ re_set_exception_catchpoint (struct breakpoint *self) = new_probe_location (exception_functions[kind].probe); sals = parse_probes (location.get (), filter_pspace, NULL); } - catch (const gdb_exception_RETURN_MASK_ERROR &e) + catch (const gdb_exception_error &e) { /* Using the probe interface failed. Let's fallback to the normal catchpoint mode. */ @@ -209,12 +211,12 @@ re_set_exception_catchpoint (struct breakpoint *self) sals = self->ops->decode_location (self, location.get (), filter_pspace); } - catch (const gdb_exception_RETURN_MASK_ERROR &ex) + catch (const gdb_exception_error &ex) { /* NOT_FOUND_ERROR just means the breakpoint will be pending, so let it through. */ if (ex.error != NOT_FOUND_ERROR) - throw_exception (ex); + throw; } } @@ -235,7 +237,7 @@ print_it_exception_catchpoint (bpstat bs) bp_temp = b->disposition == disp_del; uiout->text (bp_temp ? "Temporary catchpoint " : "Catchpoint "); - uiout->field_int ("bkptno", b->number); + uiout->field_signed ("bkptno", b->number); uiout->text ((kind == EX_EVENT_THROW ? " (exception thrown), " : (kind == EX_EVENT_CATCH ? " (exception caught), " : " (exception rethrown), "))); @@ -257,18 +259,10 @@ print_one_exception_catchpoint (struct breakpoint *b, enum exception_event_kind kind = classify_exception_breakpoint (b); get_user_print_options (&opts); + if (opts.addressprint) - { - annotate_field (4); - if (b->loc == NULL || b->loc->shlib_disabled) - uiout->field_string ("addr", ""); - else - uiout->field_core_addr ("addr", - b->loc->gdbarch, b->loc->address); - } + uiout->field_skip ("addr"); annotate_field (5); - if (b->loc) - *last_loc = b->loc; switch (kind) { @@ -317,12 +311,12 @@ print_mention_exception_catchpoint (struct breakpoint *b) enum exception_event_kind kind = classify_exception_breakpoint (b); bp_temp = b->disposition == disp_del; - uiout->text (bp_temp ? _("Temporary catchpoint ") - : _("Catchpoint ")); - uiout->field_int ("bkptno", b->number); - uiout->text ((kind == EX_EVENT_THROW ? _(" (throw)") - : (kind == EX_EVENT_CATCH ? _(" (catch)") - : _(" (rethrow)")))); + uiout->message ("%s %d %s", + (bp_temp ? _("Temporary catchpoint ") : _("Catchpoint")), + b->number, + (kind == EX_EVENT_THROW + ? _("(throw)") : (kind == EX_EVENT_CATCH + ? _("(catch)") : _("(rethrow)")))); } /* Implement the "print_recreate" breakpoint_ops method for throw and @@ -352,6 +346,15 @@ print_recreate_exception_catchpoint (struct breakpoint *b, print_recreate_thread (b, fp); } +/* Implement the "allocate_location" breakpoint_ops method for throw + and catch catchpoints. */ + +static bp_location * +allocate_location_exception_catchpoint (breakpoint *self) +{ + return new bp_location (self, bp_loc_software_breakpoint); +} + static void handle_gnu_v3_exceptions (int tempflag, std::string &&except_rx, const char *cond_string, @@ -369,9 +372,6 @@ handle_gnu_v3_exceptions (int tempflag, std::string &&except_rx, init_catchpoint (cp.get (), get_current_arch (), tempflag, cond_string, &gnu_v3_exception_catchpoint_ops); - /* We need to reset 'type' in order for code in breakpoint.c to do - the right thing. */ - cp->type = bp_breakpoint; cp->kind = ex_event; cp->exception_rx = std::move (except_rx); cp->pattern = std::move (pattern); @@ -420,13 +420,11 @@ extract_exception_regexp (const char **string) return std::string (); } -/* Deal with "catch catch", "catch throw", and "catch rethrow" - commands. */ +/* See breakpoint.h. */ -static void -catch_exception_command_1 (enum exception_event_kind ex_event, - const char *arg, - int tempflag, int from_tty) +void +catch_exception_event (enum exception_event_kind ex_event, + const char *arg, bool tempflag, int from_tty) { const char *cond_string = NULL; @@ -456,9 +454,9 @@ static void catch_catch_command (const char *arg, int from_tty, struct cmd_list_element *command) { - int tempflag = get_cmd_context (command) == CATCH_TEMPORARY; + bool tempflag = get_cmd_context (command) == CATCH_TEMPORARY; - catch_exception_command_1 (EX_EVENT_CATCH, arg, tempflag, from_tty); + catch_exception_event (EX_EVENT_CATCH, arg, tempflag, from_tty); } /* Implementation of "catch throw" command. */ @@ -467,9 +465,9 @@ static void catch_throw_command (const char *arg, int from_tty, struct cmd_list_element *command) { - int tempflag = get_cmd_context (command) == CATCH_TEMPORARY; + bool tempflag = get_cmd_context (command) == CATCH_TEMPORARY; - catch_exception_command_1 (EX_EVENT_THROW, arg, tempflag, from_tty); + catch_exception_event (EX_EVENT_THROW, arg, tempflag, from_tty); } /* Implementation of "catch rethrow" command. */ @@ -478,9 +476,9 @@ static void catch_rethrow_command (const char *arg, int from_tty, struct cmd_list_element *command) { - int tempflag = get_cmd_context (command) == CATCH_TEMPORARY; + bool tempflag = get_cmd_context (command) == CATCH_TEMPORARY; - catch_exception_command_1 (EX_EVENT_RETHROW, arg, tempflag, from_tty); + catch_exception_event (EX_EVENT_RETHROW, arg, tempflag, from_tty); } @@ -531,6 +529,7 @@ initialize_throw_catchpoint_ops (void) ops->print_recreate = print_recreate_exception_catchpoint; ops->print_one_detail = print_one_detail_exception_catchpoint; ops->check_status = check_status_exception_catchpoint; + ops->allocate_location = allocate_location_exception_catchpoint; } void