/* Everything about signal catchpoints, for GDB.
- Copyright (C) 2011-2017 Free Software Foundation, Inc.
+ Copyright (C) 2011-2022 Free Software Foundation, Inc.
This file is part of GDB.
#include "valprint.h"
#include "cli/cli-utils.h"
#include "completer.h"
+#include "cli/cli-style.h"
+#include "cli/cli-decode.h"
#include <string>
#define INTERNAL_SIGNAL(x) ((x) == GDB_SIGNAL_TRAP || (x) == GDB_SIGNAL_INT)
-/* An instance of this type is used to represent a signal catchpoint.
- A breakpoint is really of this type iff its ops pointer points to
- SIGNAL_CATCHPOINT_OPS. */
+/* An instance of this type is used to represent a signal
+ catchpoint. */
struct signal_catchpoint : public breakpoint
{
+ int insert_location (struct bp_location *) override;
+ int remove_location (struct bp_location *,
+ enum remove_bp_reason reason) override;
+ int breakpoint_hit (const struct bp_location *bl,
+ const address_space *aspace,
+ CORE_ADDR bp_addr,
+ const target_waitstatus &ws) override;
+ enum print_stop_action print_it (struct bpstat *bs) override;
+ bool print_one (struct bp_location **) override;
+ void print_mention () override;
+ void print_recreate (struct ui_file *fp) override;
+ int explains_signal (enum gdb_signal) override;
+
/* Signal numbers used for the 'catch signal' feature. If no signal
has been specified for filtering, it is empty. Otherwise,
it holds a list of all signals to be caught. */
bool catch_all;
};
-/* The breakpoint_ops structure to be used in signal catchpoints. */
-
-static struct breakpoint_ops signal_catchpoint_ops;
-
/* Count of each signal. */
-static unsigned int *signal_catch_counts;
+static unsigned int signal_catch_counts[GDB_SIGNAL_LAST];
\f
\f
-/* Implement the "insert_location" breakpoint_ops method for signal
- catchpoints. */
+/* Implement the "insert_location" method for signal catchpoints. */
-static int
-signal_catchpoint_insert_location (struct bp_location *bl)
+int
+signal_catchpoint::insert_location (struct bp_location *bl)
{
struct signal_catchpoint *c = (struct signal_catchpoint *) bl->owner;
return 0;
}
-/* Implement the "remove_location" breakpoint_ops method for signal
- catchpoints. */
+/* Implement the "remove_location" method for signal catchpoints. */
-static int
-signal_catchpoint_remove_location (struct bp_location *bl,
- enum remove_bp_reason reason)
+int
+signal_catchpoint::remove_location (struct bp_location *bl,
+ enum remove_bp_reason reason)
{
struct signal_catchpoint *c = (struct signal_catchpoint *) bl->owner;
return 0;
}
-/* Implement the "breakpoint_hit" breakpoint_ops method for signal
- catchpoints. */
+/* Implement the "breakpoint_hit" method for signal catchpoints. */
-static int
-signal_catchpoint_breakpoint_hit (const struct bp_location *bl,
- struct address_space *aspace,
- CORE_ADDR bp_addr,
- const struct target_waitstatus *ws)
+int
+signal_catchpoint::breakpoint_hit (const struct bp_location *bl,
+ const address_space *aspace,
+ CORE_ADDR bp_addr,
+ const target_waitstatus &ws)
{
const struct signal_catchpoint *c
= (const struct signal_catchpoint *) bl->owner;
gdb_signal signal_number;
- if (ws->kind != TARGET_WAITKIND_STOPPED)
+ if (ws.kind () != TARGET_WAITKIND_STOPPED)
return 0;
- signal_number = ws->value.sig;
+ signal_number = ws.sig ();
/* If we are catching specific signals in this breakpoint, then we
must guarantee that the called signal is the same signal we are
return c->catch_all || !INTERNAL_SIGNAL (signal_number);
}
-/* Implement the "print_it" breakpoint_ops method for signal
- catchpoints. */
+/* Implement the "print_it" method for signal catchpoints. */
-static enum print_stop_action
-signal_catchpoint_print_it (bpstat bs)
+enum print_stop_action
+signal_catchpoint::print_it (bpstat *bs)
{
- struct breakpoint *b = bs->breakpoint_at;
- ptid_t ptid;
struct target_waitstatus last;
const char *signal_name;
struct ui_out *uiout = current_uiout;
- get_last_target_status (&ptid, &last);
+ get_last_target_status (nullptr, nullptr, &last);
- signal_name = signal_to_name_or_int (last.value.sig);
+ signal_name = signal_to_name_or_int (last.sig ());
- annotate_catchpoint (b->number);
+ annotate_catchpoint (number);
maybe_print_thread_hit_breakpoint (uiout);
- printf_filtered (_("Catchpoint %d (signal %s), "), b->number, signal_name);
+ gdb_printf (_("Catchpoint %d (signal %s), "), number, signal_name);
return PRINT_SRC_AND_LOC;
}
-/* Implement the "print_one" breakpoint_ops method for signal
- catchpoints. */
+/* Implement the "print_one" method for signal catchpoints. */
-static void
-signal_catchpoint_print_one (struct breakpoint *b,
- struct bp_location **last_loc)
+bool
+signal_catchpoint::print_one (struct bp_location **last_loc)
{
- struct signal_catchpoint *c = (struct signal_catchpoint *) b;
struct value_print_options opts;
struct ui_out *uiout = current_uiout;
uiout->field_skip ("addr");
annotate_field (5);
- if (c->signals_to_be_caught.size () > 1)
+ if (signals_to_be_caught.size () > 1)
uiout->text ("signals \"");
else
uiout->text ("signal \"");
- if (!c->signals_to_be_caught.empty ())
+ if (!signals_to_be_caught.empty ())
{
std::string text;
bool first = true;
- for (gdb_signal iter : c->signals_to_be_caught)
- {
+ for (gdb_signal iter : signals_to_be_caught)
+ {
const char *name = signal_to_name_or_int (iter);
if (!first)
first = false;
text += name;
- }
- uiout->field_string ("what", text.c_str ());
+ }
+ uiout->field_string ("what", text);
}
else
uiout->field_string ("what",
- c->catch_all ? "<any signal>" : "<standard signals>");
+ catch_all ? "<any signal>" : "<standard signals>",
+ metadata_style.style ());
uiout->text ("\" ");
if (uiout->is_mi_like_p ())
uiout->field_string ("catch-type", "signal");
+
+ return true;
}
-/* Implement the "print_mention" breakpoint_ops method for signal
- catchpoints. */
+/* Implement the "print_mention" method for signal catchpoints. */
-static void
-signal_catchpoint_print_mention (struct breakpoint *b)
+void
+signal_catchpoint::print_mention ()
{
- struct signal_catchpoint *c = (struct signal_catchpoint *) b;
-
- if (!c->signals_to_be_caught.empty ())
+ if (!signals_to_be_caught.empty ())
{
- if (c->signals_to_be_caught.size () > 1)
- printf_filtered (_("Catchpoint %d (signals"), b->number);
+ if (signals_to_be_caught.size () > 1)
+ gdb_printf (_("Catchpoint %d (signals"), number);
else
- printf_filtered (_("Catchpoint %d (signal"), b->number);
+ gdb_printf (_("Catchpoint %d (signal"), number);
- for (gdb_signal iter : c->signals_to_be_caught)
- {
+ for (gdb_signal iter : signals_to_be_caught)
+ {
const char *name = signal_to_name_or_int (iter);
- printf_filtered (" %s", name);
- }
- printf_filtered (")");
+ gdb_printf (" %s", name);
+ }
+ gdb_printf (")");
}
- else if (c->catch_all)
- printf_filtered (_("Catchpoint %d (any signal)"), b->number);
+ else if (catch_all)
+ gdb_printf (_("Catchpoint %d (any signal)"), number);
else
- printf_filtered (_("Catchpoint %d (standard signals)"), b->number);
+ gdb_printf (_("Catchpoint %d (standard signals)"), number);
}
-/* Implement the "print_recreate" breakpoint_ops method for signal
- catchpoints. */
+/* Implement the "print_recreate" method for signal catchpoints. */
-static void
-signal_catchpoint_print_recreate (struct breakpoint *b, struct ui_file *fp)
+void
+signal_catchpoint::print_recreate (struct ui_file *fp)
{
- struct signal_catchpoint *c = (struct signal_catchpoint *) b;
+ gdb_printf (fp, "catch signal");
- fprintf_unfiltered (fp, "catch signal");
-
- if (!c->signals_to_be_caught.empty ())
+ if (!signals_to_be_caught.empty ())
{
- for (gdb_signal iter : c->signals_to_be_caught)
- fprintf_unfiltered (fp, " %s", signal_to_name_or_int (iter));
+ for (gdb_signal iter : signals_to_be_caught)
+ gdb_printf (fp, " %s", signal_to_name_or_int (iter));
}
- else if (c->catch_all)
- fprintf_unfiltered (fp, " all");
- fputc_unfiltered ('\n', fp);
+ else if (catch_all)
+ gdb_printf (fp, " all");
+ gdb_putc ('\n', fp);
}
-/* Implement the "explains_signal" breakpoint_ops method for signal
- catchpoints. */
+/* Implement the "explains_signal" method for signal catchpoints. */
-static int
-signal_catchpoint_explains_signal (struct breakpoint *b, enum gdb_signal sig)
+int
+signal_catchpoint::explains_signal (enum gdb_signal sig)
{
return 1;
}
struct gdbarch *gdbarch = get_current_arch ();
std::unique_ptr<signal_catchpoint> c (new signal_catchpoint ());
- init_catchpoint (c.get (), gdbarch, tempflag, NULL, &signal_catchpoint_ops);
+ init_catchpoint (c.get (), gdbarch, tempflag, nullptr);
c->signals_to_be_caught = std::move (filter);
c->catch_all = catch_all;
list, which is empty if no filtering is required. */
static std::vector<gdb_signal>
-catch_signal_split_args (char *arg, bool *catch_all)
+catch_signal_split_args (const char *arg, bool *catch_all)
{
std::vector<gdb_signal> result;
bool first = true;
gdb_signal signal_number;
char *endptr;
- gdb::unique_xmalloc_ptr<char> one_arg (extract_arg (&arg));
- if (one_arg == NULL)
+ std::string one_arg = extract_arg (&arg);
+ if (one_arg.empty ())
break;
/* Check for the special flag "all". */
- if (strcmp (one_arg.get (), "all") == 0)
+ if (one_arg == "all")
{
arg = skip_spaces (arg);
if (*arg != '\0' || !first)
first = false;
/* Check if the user provided a signal name or a number. */
- num = (int) strtol (one_arg.get (), &endptr, 0);
+ num = (int) strtol (one_arg.c_str (), &endptr, 0);
if (*endptr == '\0')
signal_number = gdb_signal_from_command (num);
else
{
- signal_number = gdb_signal_from_name (one_arg.get ());
+ signal_number = gdb_signal_from_name (one_arg.c_str ());
if (signal_number == GDB_SIGNAL_UNKNOWN)
- error (_("Unknown signal name '%s'."), one_arg.get ());
+ error (_("Unknown signal name '%s'."), one_arg.c_str ());
}
result.push_back (signal_number);
/* Implement the "catch signal" command. */
static void
-catch_signal_command (char *arg, int from_tty,
+catch_signal_command (const char *arg, int from_tty,
struct cmd_list_element *command)
{
int tempflag;
bool catch_all = false;
std::vector<gdb_signal> filter;
- tempflag = get_cmd_context (command) == CATCH_TEMPORARY;
+ tempflag = command->context () == CATCH_TEMPORARY;
arg = skip_spaces (arg);
create_signal_catchpoint (tempflag, std::move (filter), catch_all);
}
-static void
-initialize_signal_catchpoint_ops (void)
-{
- struct breakpoint_ops *ops;
-
- initialize_breakpoint_ops ();
-
- ops = &signal_catchpoint_ops;
- *ops = base_breakpoint_ops;
- ops->insert_location = signal_catchpoint_insert_location;
- ops->remove_location = signal_catchpoint_remove_location;
- ops->breakpoint_hit = signal_catchpoint_breakpoint_hit;
- ops->print_it = signal_catchpoint_print_it;
- ops->print_one = signal_catchpoint_print_one;
- ops->print_mention = signal_catchpoint_print_mention;
- ops->print_recreate = signal_catchpoint_print_recreate;
- ops->explains_signal = signal_catchpoint_explains_signal;
-}
-
-initialize_file_ftype _initialize_break_catch_sig;
-
+void _initialize_break_catch_sig ();
void
-_initialize_break_catch_sig (void)
+_initialize_break_catch_sig ()
{
- initialize_signal_catchpoint_ops ();
-
- signal_catch_counts = XCNEWVEC (unsigned int, GDB_SIGNAL_LAST);
-
add_catch_command ("signal", _("\
Catch signals by their names and/or numbers.\n\
Usage: catch signal [[NAME|NUMBER] [NAME|NUMBER]...|all]\n\
projects / binutils-gdb.git / blobdiff