From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 11/36] Convert break-catch-load to vtable ops
Date: Tue, 18 Jan 2022 12:39:42 -0700 [thread overview]
Message-ID: <20220118194007.2853108-12-tom@tromey.com> (raw)
In-Reply-To: <20220118194007.2853108-1-tom@tromey.com>
This converts break-catch-load.c to use vtable_breakpoint_ops.
---
gdb/break-catch-load.c | 126 +++++++++++++++++------------------------
1 file changed, 52 insertions(+), 74 deletions(-)
diff --git a/gdb/break-catch-load.c b/gdb/break-catch-load.c
index bfd318fe474..63edf8959ff 100644
--- a/gdb/break-catch-load.c
+++ b/gdb/break-catch-load.c
@@ -87,6 +87,19 @@ print_solib_event (bool is_catchpoint)
struct solib_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;
+ void check_status (struct bpstat *bs) 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;
+
/* True for "catch load", false for "catch unload". */
bool is_load;
@@ -96,26 +109,25 @@ struct solib_catchpoint : public breakpoint
std::unique_ptr<compiled_regex> compiled;
};
-static int
-insert_catch_solib (struct bp_location *ignore)
+int
+solib_catchpoint::insert_location (struct bp_location *ignore)
{
return 0;
}
-static int
-remove_catch_solib (struct bp_location *ignore, enum remove_bp_reason reason)
+int
+solib_catchpoint::remove_location (struct bp_location *ignore,
+ enum remove_bp_reason reason)
{
return 0;
}
-static int
-breakpoint_hit_catch_solib (const struct bp_location *bl,
- const address_space *aspace,
- CORE_ADDR bp_addr,
- const target_waitstatus &ws)
+int
+solib_catchpoint::breakpoint_hit (const struct bp_location *bl,
+ const address_space *aspace,
+ CORE_ADDR bp_addr,
+ const target_waitstatus &ws)
{
- struct solib_catchpoint *self = (struct solib_catchpoint *) bl->owner;
-
if (ws.kind () == TARGET_WAITKIND_LOADED)
return 1;
@@ -127,7 +139,7 @@ breakpoint_hit_catch_solib (const struct bp_location *bl,
if (other->type != bp_shlib_event)
continue;
- if (self->pspace != NULL && other->pspace != self->pspace)
+ if (pspace != NULL && other->pspace != pspace)
continue;
for (bp_location *other_bl : other->locations ())
@@ -140,18 +152,15 @@ breakpoint_hit_catch_solib (const struct bp_location *bl,
return 0;
}
-static void
-check_status_catch_solib (struct bpstat *bs)
+void
+solib_catchpoint::check_status (struct bpstat *bs)
{
- struct solib_catchpoint *self
- = (struct solib_catchpoint *) bs->breakpoint_at;
-
- if (self->is_load)
+ if (is_load)
{
for (so_list *iter : current_program_space->added_solibs)
{
- if (!self->regex
- || self->compiled->exec (iter->so_name, 0, NULL, 0) == 0)
+ if (!regex
+ || compiled->exec (iter->so_name, 0, NULL, 0) == 0)
return;
}
}
@@ -159,8 +168,8 @@ check_status_catch_solib (struct bpstat *bs)
{
for (const std::string &iter : current_program_space->deleted_solibs)
{
- if (!self->regex
- || self->compiled->exec (iter.c_str (), 0, NULL, 0) == 0)
+ if (!regex
+ || compiled->exec (iter.c_str (), 0, NULL, 0) == 0)
return;
}
}
@@ -169,8 +178,8 @@ check_status_catch_solib (struct bpstat *bs)
bs->print_it = print_it_noop;
}
-static enum print_stop_action
-print_it_catch_solib (bpstat *bs)
+enum print_stop_action
+solib_catchpoint::print_it (bpstat *bs)
{
struct breakpoint *b = bs->breakpoint_at;
struct ui_out *uiout = current_uiout;
@@ -189,10 +198,9 @@ print_it_catch_solib (bpstat *bs)
return PRINT_SRC_AND_LOC;
}
-static bool
-print_one_catch_solib (struct breakpoint *b, struct bp_location **locs)
+bool
+solib_catchpoint::print_one (struct bp_location **locs)
{
- struct solib_catchpoint *self = (struct solib_catchpoint *) b;
struct value_print_options opts;
struct ui_out *uiout = current_uiout;
@@ -208,54 +216,48 @@ print_one_catch_solib (struct breakpoint *b, struct bp_location **locs)
std::string msg;
annotate_field (5);
- if (self->is_load)
+ if (is_load)
{
- if (self->regex)
+ if (regex)
msg = string_printf (_("load of library matching %s"),
- self->regex.get ());
+ regex.get ());
else
msg = _("load of library");
}
else
{
- if (self->regex)
+ if (regex)
msg = string_printf (_("unload of library matching %s"),
- self->regex.get ());
+ regex.get ());
else
msg = _("unload of library");
}
uiout->field_string ("what", msg);
if (uiout->is_mi_like_p ())
- uiout->field_string ("catch-type", self->is_load ? "load" : "unload");
+ uiout->field_string ("catch-type", is_load ? "load" : "unload");
return true;
}
-static void
-print_mention_catch_solib (struct breakpoint *b)
+void
+solib_catchpoint::print_mention ()
{
- struct solib_catchpoint *self = (struct solib_catchpoint *) b;
-
- printf_filtered (_("Catchpoint %d (%s)"), b->number,
- self->is_load ? "load" : "unload");
+ printf_filtered (_("Catchpoint %d (%s)"), number,
+ is_load ? "load" : "unload");
}
-static void
-print_recreate_catch_solib (struct breakpoint *b, struct ui_file *fp)
+void
+solib_catchpoint::print_recreate (struct ui_file *fp)
{
- struct solib_catchpoint *self = (struct solib_catchpoint *) b;
-
fprintf_unfiltered (fp, "%s %s",
- b->disposition == disp_del ? "tcatch" : "catch",
- self->is_load ? "load" : "unload");
- if (self->regex)
- fprintf_unfiltered (fp, " %s", self->regex.get ());
+ disposition == disp_del ? "tcatch" : "catch",
+ is_load ? "load" : "unload");
+ if (regex)
+ fprintf_unfiltered (fp, " %s", regex.get ());
fprintf_unfiltered (fp, "\n");
}
-static struct breakpoint_ops catch_solib_breakpoint_ops;
-
/* See breakpoint.h. */
void
@@ -277,8 +279,7 @@ add_solib_catchpoint (const char *arg, bool is_load, bool is_temp, bool enabled)
}
c->is_load = is_load;
- init_catchpoint (c.get (), gdbarch, is_temp, NULL,
- &catch_solib_breakpoint_ops);
+ init_catchpoint (c.get (), gdbarch, is_temp, NULL, &vtable_breakpoint_ops);
c->enable_state = enabled ? bp_enabled : bp_disabled;
@@ -312,33 +313,10 @@ catch_unload_command_1 (const char *arg, int from_tty,
catch_load_or_unload (arg, from_tty, 0, command);
}
-static void
-initialize_ops ()
-{
- struct breakpoint_ops *ops;
-
- initialize_breakpoint_ops ();
-
- /* Solib-related catchpoints. */
- ops = &catch_solib_breakpoint_ops;
- *ops = base_breakpoint_ops;
- ops->insert_location = insert_catch_solib;
- ops->remove_location = remove_catch_solib;
- ops->breakpoint_hit = breakpoint_hit_catch_solib;
- ops->check_status = check_status_catch_solib;
- ops->print_it = print_it_catch_solib;
- ops->print_one = print_one_catch_solib;
- ops->print_mention = print_mention_catch_solib;
- ops->print_recreate = print_recreate_catch_solib;
-
-}
-
void _initialize_break_catch_load ();
void
_initialize_break_catch_load ()
{
- initialize_ops ();
-
add_catch_command ("load", _("Catch loads of shared libraries.\n\
Usage: catch load [REGEX]\n\
If REGEX is given, only stop for libraries matching the regular expression."),
--
2.31.1
next prev parent reply other threads:[~2022-01-18 19:40 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-18 19:39 [PATCH 00/36] C++-ify breakpoints Tom Tromey
2022-01-18 19:39 ` [PATCH 01/36] Move "catch load" to a new file Tom Tromey
2022-04-23 2:34 ` Simon Marchi
2022-04-24 19:35 ` Tom Tromey
2022-01-18 19:39 ` [PATCH 02/36] Boolify print_solib_event Tom Tromey
2022-01-18 19:39 ` [PATCH 03/36] Add an assertion to clone_momentary_breakpoint Tom Tromey
2022-04-25 13:25 ` Thiago Jung Bauermann
2022-04-25 19:03 ` Tom Tromey
2022-01-18 19:39 ` [PATCH 04/36] Delete some unnecessary wrapper functions Tom Tromey
2022-04-25 14:08 ` Thiago Jung Bauermann
2022-04-25 19:06 ` Tom Tromey
2022-04-25 20:06 ` Thiago Jung Bauermann
2022-01-18 19:39 ` [PATCH 05/36] Return bool from breakpoint_ops::print_one Tom Tromey
2022-01-18 19:39 ` [PATCH 06/36] Add a vtable-based breakpoint ops Tom Tromey
2022-01-18 19:39 ` [PATCH 07/36] Convert break-catch-sig to use vtable ops Tom Tromey
2022-01-18 19:39 ` [PATCH 08/36] Convert break-catch-syscall to " Tom Tromey
2022-01-18 19:39 ` [PATCH 09/36] Convert break-catch-exec " Tom Tromey
2022-01-18 19:39 ` [PATCH 10/36] Convert break-catch-fork " Tom Tromey
2022-01-18 19:39 ` Tom Tromey [this message]
2022-01-18 19:39 ` [PATCH 12/36] Convert watchpoints " Tom Tromey
2022-01-18 19:39 ` [PATCH 13/36] Convert tracepoints " Tom Tromey
2022-01-18 19:39 ` [PATCH 14/36] Add some new subclasses of breakpoint Tom Tromey
2022-01-18 19:39 ` [PATCH 15/36] Convert base breakpoints to vtable ops Tom Tromey
2022-05-02 10:27 ` Tom de Vries
2022-05-02 16:40 ` Tom Tromey
2022-01-18 19:39 ` [PATCH 16/36] Convert break-catch-throw " Tom Tromey
2022-01-18 19:39 ` [PATCH 17/36] Convert internal breakpoints " Tom Tromey
2022-01-18 19:39 ` [PATCH 18/36] Convert momentary " Tom Tromey
2022-01-18 19:39 ` [PATCH 19/36] Change inheritance of dprintf Tom Tromey
2022-01-18 19:39 ` [PATCH 20/36] Convert ordinary breakpoints to vtable ops Tom Tromey
2022-01-18 19:39 ` [PATCH 21/36] Convert Ada catchpoints " Tom Tromey
2022-01-18 19:39 ` [PATCH 22/36] Convert dprintf " Tom Tromey
2022-01-18 19:39 ` [PATCH 23/36] Convert ranged breakpoints " Tom Tromey
2022-01-18 19:39 ` [PATCH 24/36] Add bp_static_marker_tracepoint Tom Tromey
2022-01-18 19:39 ` [PATCH 25/36] Convert static marker tracepoints to vtable ops Tom Tromey
2022-01-18 19:39 ` [PATCH 26/36] Remove bkpt_base_breakpoint_ops Tom Tromey
2022-01-18 19:39 ` [PATCH 27/36] Merge probe and ordinary breakpoints Tom Tromey
2022-01-18 19:39 ` [PATCH 28/36] Merge probe and ordinary tracepoints Tom Tromey
2022-01-18 19:40 ` [PATCH 29/36] Remove breakpoint_ops from init_ada_exception_breakpoint Tom Tromey
2022-01-18 19:40 ` [PATCH 30/36] Remove breakpoint_ops from init_catchpoint Tom Tromey
2022-01-18 19:40 ` [PATCH 31/36] Remove most fields from breakpoint_ops Tom Tromey
2022-01-18 19:40 ` [PATCH 32/36] Remove vtable_breakpoint_ops Tom Tromey
2022-01-18 19:40 ` [PATCH 33/36] Remove breakpoint ops initialization Tom Tromey
2022-01-18 19:40 ` [PATCH 34/36] Constify breakpoint_ops Tom Tromey
2022-01-18 19:40 ` [PATCH 35/36] Remove allocate_bp_location Tom Tromey
2022-01-18 19:40 ` [PATCH 36/36] Remove create_breakpoints_sal_default Tom Tromey
2022-04-22 20:21 ` [PATCH 00/36] C++-ify breakpoints Tom Tromey
2022-04-23 2:59 ` Simon Marchi
2022-04-29 22:15 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220118194007.2853108-12-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).