X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fbreak-catch-throw.c;h=d34e5f9ee53747e6eb3d69a53106b9466d48a0e6;hb=e008305278cb42a576107cd8aa9f0b182eea1af2;hp=bad882f50fdb26bcb9dd13f35bc971bee40fc03d;hpb=d55e5aa6b29906346c51ad00e6a9b112590aa294;p=binutils-gdb.git
diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index bad882f50fd..d34e5f9ee53 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-2022 Free Software Foundation, Inc.
This file is part of GDB.
@@ -18,36 +18,25 @@
along with this program. If not, see . */
#include "defs.h"
-
-/* Standard C includes. */
-#include
-
-/* Local non-gdb includes. */
-#include "annotate.h"
#include "arch-utils.h"
+#include
#include "breakpoint.h"
+#include "gdbcmd.h"
+#include "inferior.h"
+#include "annotate.h"
+#include "valprint.h"
#include "cli/cli-utils.h"
#include "completer.h"
+#include "gdbsupport/gdb_obstack.h"
+#include "mi/mi-common.h"
+#include "linespec.h"
+#include "probe.h"
+#include "objfiles.h"
#include "cp-abi.h"
+#include "gdbsupport/gdb_regex.h"
#include "cp-support.h"
-#include "gdb_obstack.h"
-#include "gdb_regex.h"
-#include "gdbcmd.h"
-#include "inferior.h"
-#include "linespec.h"
#include "location.h"
-#include "mi/mi-common.h"
-#include "objfiles.h"
-#include "probe.h"
-#include "valprint.h"
-
-/* Enums for exception-handling support. */
-enum exception_event_kind
-{
- EX_EVENT_THROW,
- EX_EVENT_RETHROW,
- EX_EVENT_CATCH
-};
+#include "cli/cli-decode.h"
/* Each spot where we may place an exception-related catchpoint has
two names: the SDT probe point and the function name. This
@@ -95,6 +84,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
@@ -110,14 +107,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"));
@@ -145,7 +144,7 @@ classify_exception_breakpoint (struct breakpoint *b)
/* Implement the 'check_status' method. */
static void
-check_status_exception_catchpoint (struct bpstats *bs)
+check_status_exception_catchpoint (struct bpstat *bs)
{
struct exception_catchpoint *self
= (struct exception_catchpoint *) bs->breakpoint_at;
@@ -158,27 +157,28 @@ check_status_exception_catchpoint (struct bpstats *bs)
if (self->pattern == NULL)
return;
- TRY
+ const char *name = nullptr;
+ gdb::unique_xmalloc_ptr canon;
+ try
{
struct value *typeinfo_arg;
- std::string canon;
fetch_probe_arguments (NULL, &typeinfo_arg);
type_name = cplus_typename_from_type_info (typeinfo_arg);
canon = cp_canonicalize_string (type_name.c_str ());
- if (!canon.empty ())
- std::swap (type_name, canon);
+ name = (canon != nullptr
+ ? canon.get ()
+ : type_name.c_str ());
}
- CATCH (e, RETURN_MASK_ERROR)
+ catch (const gdb_exception_error &e)
{
exception_print (gdb_stderr, e);
}
- END_CATCH
- if (!type_name.empty ())
+ if (name != nullptr)
{
- if (self->pattern->exec (type_name.c_str (), 0, NULL, 0) != 0)
+ if (self->pattern->exec (name, 0, NULL, 0) != 0)
bs->stop = 0;
}
}
@@ -193,17 +193,17 @@ re_set_exception_catchpoint (struct breakpoint *self)
struct program_space *filter_pspace = current_program_space;
/* We first try to use the probe interface. */
- TRY
+ try
{
event_location_up location
= new_probe_location (exception_functions[kind].probe);
sals = parse_probes (location.get (), filter_pspace, NULL);
}
- CATCH (e, RETURN_MASK_ERROR)
+ catch (const gdb_exception_error &e)
{
/* Using the probe interface failed. Let's fallback to the normal
catchpoint mode. */
- TRY
+ try
{
struct explicit_location explicit_loc;
@@ -214,22 +214,20 @@ re_set_exception_catchpoint (struct breakpoint *self)
sals = self->ops->decode_location (self, location.get (),
filter_pspace);
}
- CATCH (ex, RETURN_MASK_ERROR)
+ 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;
}
- END_CATCH
}
- END_CATCH
update_breakpoint_locations (self, filter_pspace, sals, {});
}
static enum print_stop_action
-print_it_exception_catchpoint (bpstat bs)
+print_it_exception_catchpoint (bpstat *bs)
{
struct ui_out *uiout = current_uiout;
struct breakpoint *b = bs->breakpoint_at;
@@ -242,7 +240,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), ")));
@@ -264,18 +262,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)
{
@@ -311,7 +301,7 @@ print_one_detail_exception_catchpoint (const struct breakpoint *b,
if (!cp->exception_rx.empty ())
{
uiout->text (_("\tmatching: "));
- uiout->field_string ("regexp", cp->exception_rx.c_str ());
+ uiout->field_string ("regexp", cp->exception_rx);
uiout->text ("\n");
}
}
@@ -324,12 +314,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
@@ -359,6 +349,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,
@@ -376,9 +375,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);
@@ -427,13 +423,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;
@@ -463,9 +457,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 = command->context () == 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. */
@@ -474,9 +468,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 = command->context () == 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. */
@@ -485,9 +479,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 = command->context () == CATCH_TEMPORARY;
- catch_exception_command_1 (EX_EVENT_RETHROW, arg, tempflag, from_tty);
+ catch_exception_event (EX_EVENT_RETHROW, arg, tempflag, from_tty);
}
@@ -538,10 +532,12 @@ 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 _initialize_break_catch_throw ();
void
-_initialize_break_catch_throw (void)
+_initialize_break_catch_throw ()
{
initialize_throw_catchpoint_ops ();
@@ -549,19 +545,19 @@ _initialize_break_catch_throw (void)
add_catch_command ("catch", _("\
Catch an exception, when caught."),
catch_catch_command,
- NULL,
+ NULL,
CATCH_PERMANENT,
CATCH_TEMPORARY);
add_catch_command ("throw", _("\
Catch an exception, when thrown."),
catch_throw_command,
- NULL,
+ NULL,
CATCH_PERMANENT,
CATCH_TEMPORARY);
add_catch_command ("rethrow", _("\
Catch an exception, when rethrown."),
catch_rethrow_command,
- NULL,
+ NULL,
CATCH_PERMANENT,
CATCH_TEMPORARY);