From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 9114A3858405; Fri, 29 Apr 2022 22:21:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9114A3858405 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Move "catch load" to a new file X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 835e063d3a0d08a85862e3cdf217773f524cd006 X-Git-Newrev: 2f9ee862bca8e9c8548a6b17927b64c249fb25d4 Message-Id: <20220429222154.9114A3858405@sourceware.org> Date: Fri, 29 Apr 2022 22:21:54 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2022 22:21:54 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D2f9ee862bca8= e9c8548a6b17927b64c249fb25d4 commit 2f9ee862bca8e9c8548a6b17927b64c249fb25d4 Author: Tom Tromey Date: Thu Jan 13 16:25:16 2022 -0700 Move "catch load" to a new file =20 The "catch load" code is reasonably self-contained, and so this patch moves it out of breakpoint.c and into a new file, break-catch-load.c. One function from breakpoint.c, print_solib_event, now has to be exposed, but this seems pretty reasonable. Diff: --- gdb/Makefile.in | 1 + gdb/break-catch-load.c | 302 +++++++++++++++++++++++++++++++++++++++++++++= ++++ gdb/breakpoint.c | 260 +----------------------------------------- gdb/breakpoint.h | 6 + 4 files changed, 311 insertions(+), 258 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index ec0e55dd803..418094775a5 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1006,6 +1006,7 @@ COMMON_SFILES =3D \ blockframe.c \ break-catch-exec.c \ break-catch-fork.c \ + break-catch-load.c \ break-catch-sig.c \ break-catch-syscall.c \ break-catch-throw.c \ diff --git a/gdb/break-catch-load.c b/gdb/break-catch-load.c new file mode 100644 index 00000000000..93e371c00ca --- /dev/null +++ b/gdb/break-catch-load.c @@ -0,0 +1,302 @@ +/* Everything about load/unload catchpoints, for GDB. + + Copyright (C) 1986-2022 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . = */ + +#include "defs.h" + +#include "annotate.h" +#include "arch-utils.h" +#include "breakpoint.h" +#include "cli/cli-decode.h" +#include "mi/mi-common.h" +#include "progspace.h" +#include "solist.h" +#include "target.h" +#include "valprint.h" + +/* An instance of this type is used to represent an solib catchpoint. + A breakpoint is really of this type iff its ops pointer points to + CATCH_SOLIB_BREAKPOINT_OPS. */ + +struct solib_catchpoint : public breakpoint +{ + /* True for "catch load", false for "catch unload". */ + bool is_load; + + /* Regular expression to match, if any. COMPILED is only valid when + REGEX is non-NULL. */ + gdb::unique_xmalloc_ptr regex; + std::unique_ptr compiled; +}; + +static int +insert_catch_solib (struct bp_location *ignore) +{ + return 0; +} + +static int +remove_catch_solib (struct bp_location *ignore, enum remove_bp_reason reas= on) +{ + 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) +{ + struct solib_catchpoint *self =3D (struct solib_catchpoint *) bl->owner; + + if (ws.kind () =3D=3D TARGET_WAITKIND_LOADED) + return 1; + + for (breakpoint *other : all_breakpoints ()) + { + if (other =3D=3D bl->owner) + continue; + + if (other->type !=3D bp_shlib_event) + continue; + + if (self->pspace !=3D NULL && other->pspace !=3D self->pspace) + continue; + + for (bp_location *other_bl : other->locations ()) + { + if (other->ops->breakpoint_hit (other_bl, aspace, bp_addr, ws)) + return 1; + } + } + + return 0; +} + +static void +check_status_catch_solib (struct bpstat *bs) +{ + struct solib_catchpoint *self + =3D (struct solib_catchpoint *) bs->breakpoint_at; + + if (self->is_load) + { + for (so_list *iter : current_program_space->added_solibs) + { + if (!self->regex + || self->compiled->exec (iter->so_name, 0, NULL, 0) =3D=3D 0) + return; + } + } + else + { + for (const std::string &iter : current_program_space->deleted_solibs) + { + if (!self->regex + || self->compiled->exec (iter.c_str (), 0, NULL, 0) =3D=3D 0) + return; + } + } + + bs->stop =3D 0; + bs->print_it =3D print_it_noop; +} + +static enum print_stop_action +print_it_catch_solib (bpstat *bs) +{ + struct breakpoint *b =3D bs->breakpoint_at; + struct ui_out *uiout =3D current_uiout; + + annotate_catchpoint (b->number); + maybe_print_thread_hit_breakpoint (uiout); + if (b->disposition =3D=3D disp_del) + uiout->text ("Temporary catchpoint "); + else + uiout->text ("Catchpoint "); + uiout->field_signed ("bkptno", b->number); + uiout->text ("\n"); + if (uiout->is_mi_like_p ()) + uiout->field_string ("disp", bpdisp_text (b->disposition)); + print_solib_event (1); + return PRINT_SRC_AND_LOC; +} + +static void +print_one_catch_solib (struct breakpoint *b, struct bp_location **locs) +{ + struct solib_catchpoint *self =3D (struct solib_catchpoint *) b; + struct value_print_options opts; + struct ui_out *uiout =3D current_uiout; + + get_user_print_options (&opts); + /* Field 4, the address, is omitted (which makes the columns not + line up too nicely with the headers, but the effect is relatively + readable). */ + if (opts.addressprint) + { + annotate_field (4); + uiout->field_skip ("addr"); + } + + std::string msg; + annotate_field (5); + if (self->is_load) + { + if (self->regex) + msg =3D string_printf (_("load of library matching %s"), + self->regex.get ()); + else + msg =3D _("load of library"); + } + else + { + if (self->regex) + msg =3D string_printf (_("unload of library matching %s"), + self->regex.get ()); + else + msg =3D _("unload of library"); + } + uiout->field_string ("what", msg); + + if (uiout->is_mi_like_p ()) + uiout->field_string ("catch-type", self->is_load ? "load" : "unload"); +} + +static void +print_mention_catch_solib (struct breakpoint *b) +{ + struct solib_catchpoint *self =3D (struct solib_catchpoint *) b; + + gdb_printf (_("Catchpoint %d (%s)"), b->number, + self->is_load ? "load" : "unload"); +} + +static void +print_recreate_catch_solib (struct breakpoint *b, struct ui_file *fp) +{ + struct solib_catchpoint *self =3D (struct solib_catchpoint *) b; + + gdb_printf (fp, "%s %s", + b->disposition =3D=3D disp_del ? "tcatch" : "catch", + self->is_load ? "load" : "unload"); + if (self->regex) + gdb_printf (fp, " %s", self->regex.get ()); + gdb_printf (fp, "\n"); +} + +static struct breakpoint_ops catch_solib_breakpoint_ops; + +/* See breakpoint.h. */ + +void +add_solib_catchpoint (const char *arg, bool is_load, bool is_temp, bool en= abled) +{ + struct gdbarch *gdbarch =3D get_current_arch (); + + if (!arg) + arg =3D ""; + arg =3D skip_spaces (arg); + + std::unique_ptr c (new solib_catchpoint ()); + + if (*arg !=3D '\0') + { + c->compiled.reset (new compiled_regex (arg, REG_NOSUB, + _("Invalid regexp"))); + c->regex =3D make_unique_xstrdup (arg); + } + + c->is_load =3D is_load; + init_catchpoint (c.get (), gdbarch, is_temp, NULL, + &catch_solib_breakpoint_ops); + + c->enable_state =3D enabled ? bp_enabled : bp_disabled; + + install_breakpoint (0, std::move (c), 1); +} + +/* A helper function that does all the work for "catch load" and + "catch unload". */ + +static void +catch_load_or_unload (const char *arg, int from_tty, int is_load, + struct cmd_list_element *command) +{ + const int enabled =3D 1; + bool temp =3D command->context () =3D=3D CATCH_TEMPORARY; + + add_solib_catchpoint (arg, is_load, temp, enabled); +} + +static void +catch_load_command_1 (const char *arg, int from_tty, + struct cmd_list_element *command) +{ + catch_load_or_unload (arg, from_tty, 1, command); +} + +static void +catch_unload_command_1 (const char *arg, int from_tty, + struct cmd_list_element *command) +{ + catch_load_or_unload (arg, from_tty, 0, command); +} + +static void +initialize_ops () +{ + struct breakpoint_ops *ops; + + initialize_breakpoint_ops (); + + /* Solib-related catchpoints. */ + ops =3D &catch_solib_breakpoint_ops; + *ops =3D base_breakpoint_ops; + ops->insert_location =3D insert_catch_solib; + ops->remove_location =3D remove_catch_solib; + ops->breakpoint_hit =3D breakpoint_hit_catch_solib; + ops->check_status =3D check_status_catch_solib; + ops->print_it =3D print_it_catch_solib; + ops->print_one =3D print_one_catch_solib; + ops->print_mention =3D print_mention_catch_solib; + ops->print_recreate =3D 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= ."), + catch_load_command_1, + NULL, + CATCH_PERMANENT, + CATCH_TEMPORARY); + add_catch_command ("unload", _("Catch unloads of shared libraries.\n\ +Usage: catch unload [REGEX]\n\ +If REGEX is given, only stop for libraries matching the regular expression= ."), + catch_unload_command_1, + NULL, + CATCH_PERMANENT, + CATCH_TEMPORARY); +} diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index ff27174b91f..0710f7251dd 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -4625,9 +4625,9 @@ print_bp_stop_message (bpstat *bs) } } =20 -/* A helper function that prints a shared library stopped event. */ +/* See breakpoint.h. */ =20 -static void +void print_solib_event (int is_catchpoint) { bool any_deleted =3D !current_program_space->deleted_solibs.empty (); @@ -7729,235 +7729,6 @@ disable_breakpoints_in_freed_objfile (struct objfil= e *objfile) } } =20 -/* An instance of this type is used to represent an solib catchpoint. - A breakpoint is really of this type iff its ops pointer points to - CATCH_SOLIB_BREAKPOINT_OPS. */ - -struct solib_catchpoint : public breakpoint -{ - /* True for "catch load", false for "catch unload". */ - bool is_load; - - /* Regular expression to match, if any. COMPILED is only valid when - REGEX is non-NULL. */ - gdb::unique_xmalloc_ptr regex; - std::unique_ptr compiled; -}; - -static int -insert_catch_solib (struct bp_location *ignore) -{ - return 0; -} - -static int -remove_catch_solib (struct bp_location *ignore, enum remove_bp_reason reas= on) -{ - 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) -{ - struct solib_catchpoint *self =3D (struct solib_catchpoint *) bl->owner; - - if (ws.kind () =3D=3D TARGET_WAITKIND_LOADED) - return 1; - - for (breakpoint *other : all_breakpoints ()) - { - if (other =3D=3D bl->owner) - continue; - - if (other->type !=3D bp_shlib_event) - continue; - - if (self->pspace !=3D NULL && other->pspace !=3D self->pspace) - continue; - - for (bp_location *other_bl : other->locations ()) - { - if (other->ops->breakpoint_hit (other_bl, aspace, bp_addr, ws)) - return 1; - } - } - - return 0; -} - -static void -check_status_catch_solib (struct bpstat *bs) -{ - struct solib_catchpoint *self - =3D (struct solib_catchpoint *) bs->breakpoint_at; - - if (self->is_load) - { - for (so_list *iter : current_program_space->added_solibs) - { - if (!self->regex - || self->compiled->exec (iter->so_name, 0, NULL, 0) =3D=3D 0) - return; - } - } - else - { - for (const std::string &iter : current_program_space->deleted_solibs) - { - if (!self->regex - || self->compiled->exec (iter.c_str (), 0, NULL, 0) =3D=3D 0) - return; - } - } - - bs->stop =3D 0; - bs->print_it =3D print_it_noop; -} - -static enum print_stop_action -print_it_catch_solib (bpstat *bs) -{ - struct breakpoint *b =3D bs->breakpoint_at; - struct ui_out *uiout =3D current_uiout; - - annotate_catchpoint (b->number); - maybe_print_thread_hit_breakpoint (uiout); - if (b->disposition =3D=3D disp_del) - uiout->text ("Temporary catchpoint "); - else - uiout->text ("Catchpoint "); - uiout->field_signed ("bkptno", b->number); - uiout->text ("\n"); - if (uiout->is_mi_like_p ()) - uiout->field_string ("disp", bpdisp_text (b->disposition)); - print_solib_event (1); - return PRINT_SRC_AND_LOC; -} - -static void -print_one_catch_solib (struct breakpoint *b, struct bp_location **locs) -{ - struct solib_catchpoint *self =3D (struct solib_catchpoint *) b; - struct value_print_options opts; - struct ui_out *uiout =3D current_uiout; - - get_user_print_options (&opts); - /* Field 4, the address, is omitted (which makes the columns not - line up too nicely with the headers, but the effect is relatively - readable). */ - if (opts.addressprint) - { - annotate_field (4); - uiout->field_skip ("addr"); - } - - std::string msg; - annotate_field (5); - if (self->is_load) - { - if (self->regex) - msg =3D string_printf (_("load of library matching %s"), - self->regex.get ()); - else - msg =3D _("load of library"); - } - else - { - if (self->regex) - msg =3D string_printf (_("unload of library matching %s"), - self->regex.get ()); - else - msg =3D _("unload of library"); - } - uiout->field_string ("what", msg); - - if (uiout->is_mi_like_p ()) - uiout->field_string ("catch-type", self->is_load ? "load" : "unload"); -} - -static void -print_mention_catch_solib (struct breakpoint *b) -{ - struct solib_catchpoint *self =3D (struct solib_catchpoint *) b; - - gdb_printf (_("Catchpoint %d (%s)"), b->number, - self->is_load ? "load" : "unload"); -} - -static void -print_recreate_catch_solib (struct breakpoint *b, struct ui_file *fp) -{ - struct solib_catchpoint *self =3D (struct solib_catchpoint *) b; - - gdb_printf (fp, "%s %s", - b->disposition =3D=3D disp_del ? "tcatch" : "catch", - self->is_load ? "load" : "unload"); - if (self->regex) - gdb_printf (fp, " %s", self->regex.get ()); - gdb_printf (fp, "\n"); -} - -static struct breakpoint_ops catch_solib_breakpoint_ops; - -/* See breakpoint.h. */ - -void -add_solib_catchpoint (const char *arg, bool is_load, bool is_temp, bool en= abled) -{ - struct gdbarch *gdbarch =3D get_current_arch (); - - if (!arg) - arg =3D ""; - arg =3D skip_spaces (arg); - - std::unique_ptr c (new solib_catchpoint ()); - - if (*arg !=3D '\0') - { - c->compiled.reset (new compiled_regex (arg, REG_NOSUB, - _("Invalid regexp"))); - c->regex =3D make_unique_xstrdup (arg); - } - - c->is_load =3D is_load; - init_catchpoint (c.get (), gdbarch, is_temp, NULL, - &catch_solib_breakpoint_ops); - - c->enable_state =3D enabled ? bp_enabled : bp_disabled; - - install_breakpoint (0, std::move (c), 1); -} - -/* A helper function that does all the work for "catch load" and - "catch unload". */ - -static void -catch_load_or_unload (const char *arg, int from_tty, int is_load, - struct cmd_list_element *command) -{ - const int enabled =3D 1; - bool temp =3D command->context () =3D=3D CATCH_TEMPORARY; - - add_solib_catchpoint (arg, is_load, temp, enabled); -} - -static void -catch_load_command_1 (const char *arg, int from_tty, - struct cmd_list_element *command) -{ - catch_load_or_unload (arg, from_tty, 1, command); -} - -static void -catch_unload_command_1 (const char *arg, int from_tty, - struct cmd_list_element *command) -{ - catch_load_or_unload (arg, from_tty, 0, command); -} - /* See breakpoint.h. */ =20 void @@ -14805,18 +14576,6 @@ initialize_breakpoint_ops (void) ops->create_breakpoints_sal =3D strace_marker_create_breakpoints_sal; ops->decode_location =3D strace_marker_decode_location; =20 - /* Solib-related catchpoints. */ - ops =3D &catch_solib_breakpoint_ops; - *ops =3D base_breakpoint_ops; - ops->insert_location =3D insert_catch_solib; - ops->remove_location =3D remove_catch_solib; - ops->breakpoint_hit =3D breakpoint_hit_catch_solib; - ops->check_status =3D check_status_catch_solib; - ops->print_it =3D print_it_catch_solib; - ops->print_one =3D print_one_catch_solib; - ops->print_mention =3D print_mention_catch_solib; - ops->print_recreate =3D print_recreate_catch_solib; - ops =3D &dprintf_breakpoint_ops; *ops =3D bkpt_base_breakpoint_ops; ops->re_set =3D dprintf_re_set; @@ -15083,21 +14842,6 @@ Set temporary catchpoints to catch events."), &tcatch_cmdlist, 0/*allow-unknown*/, &cmdlist); =20 - 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= ."), - catch_load_command_1, - NULL, - CATCH_PERMANENT, - CATCH_TEMPORARY); - add_catch_command ("unload", _("Catch unloads of shared libraries.\n\ -Usage: catch unload [REGEX]\n\ -If REGEX is given, only stop for libraries matching the regular expression= ."), - catch_unload_command_1, - NULL, - CATCH_PERMANENT, - CATCH_TEMPORARY); - const auto opts =3D make_watch_options_def_group (nullptr); =20 static const std::string watch_help =3D gdb::option::build_help (_("\ diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index e412c4d4113..e71f93bb5cd 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1803,4 +1803,10 @@ extern void catch_exception_event (enum exception_ev= ent_kind ex_event, const char *regex, bool tempflag, int from_tty); =20 +/* A helper function that prints a shared library stopped event. + IS_CATCHPOINT is true if the event is due to a "catch load" + catchpoint, false otherwise. */ + +extern void print_solib_event (int is_catchpoint); + #endif /* !defined (BREAKPOINT_H) */