From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 30/36] Remove breakpoint_ops from init_catchpoint
Date: Tue, 18 Jan 2022 12:40:01 -0700 [thread overview]
Message-ID: <20220118194007.2853108-31-tom@tromey.com> (raw)
In-Reply-To: <20220118194007.2853108-1-tom@tromey.com>
init_catchpoint is only ever passed a single breakpoint_ops pointer,
so remove the parameter.
---
gdb/break-catch-exec.c | 3 +--
gdb/break-catch-fork.c | 3 +--
gdb/break-catch-load.c | 2 +-
gdb/break-catch-sig.c | 2 +-
gdb/break-catch-syscall.c | 3 +--
gdb/break-catch-throw.c | 3 +--
gdb/breakpoint.c | 6 +++---
gdb/breakpoint.h | 6 ++----
8 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/gdb/break-catch-exec.c b/gdb/break-catch-exec.c
index 3cabe72a35f..47765a6c01f 100644
--- a/gdb/break-catch-exec.c
+++ b/gdb/break-catch-exec.c
@@ -204,8 +204,7 @@ catch_exec_command_1 (const char *arg, int from_tty,
error (_("Junk at end of arguments."));
std::unique_ptr<exec_catchpoint> c (new exec_catchpoint ());
- init_catchpoint (c.get (), gdbarch, temp, cond_string,
- &vtable_breakpoint_ops);
+ init_catchpoint (c.get (), gdbarch, temp, cond_string);
c->exec_pathname.reset ();
install_breakpoint (0, std::move (c), 1);
diff --git a/gdb/break-catch-fork.c b/gdb/break-catch-fork.c
index 9b3721a605e..bff61c165ba 100644
--- a/gdb/break-catch-fork.c
+++ b/gdb/break-catch-fork.c
@@ -182,8 +182,7 @@ create_fork_vfork_event_catchpoint (struct gdbarch *gdbarch,
{
std::unique_ptr<fork_catchpoint> c (new fork_catchpoint ());
- init_catchpoint (c.get (), gdbarch, temp, cond_string,
- &vtable_breakpoint_ops);
+ init_catchpoint (c.get (), gdbarch, temp, cond_string);
c->is_vfork = is_vfork;
c->forked_inferior_pid = null_ptid;
diff --git a/gdb/break-catch-load.c b/gdb/break-catch-load.c
index 63edf8959ff..0e76ad288e8 100644
--- a/gdb/break-catch-load.c
+++ b/gdb/break-catch-load.c
@@ -279,7 +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, &vtable_breakpoint_ops);
+ init_catchpoint (c.get (), gdbarch, is_temp, NULL);
c->enable_state = enabled ? bp_enabled : bp_disabled;
diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c
index 940f8cc4aa6..2723f36b55c 100644
--- a/gdb/break-catch-sig.c
+++ b/gdb/break-catch-sig.c
@@ -317,7 +317,7 @@ create_signal_catchpoint (int tempflag, std::vector<gdb_signal> &&filter,
struct gdbarch *gdbarch = get_current_arch ();
std::unique_ptr<signal_catchpoint> c (new signal_catchpoint ());
- init_catchpoint (c.get (), gdbarch, tempflag, NULL, &vtable_breakpoint_ops);
+ init_catchpoint (c.get (), gdbarch, tempflag, nullptr);
c->signals_to_be_caught = std::move (filter);
c->catch_all = catch_all;
diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c
index 1af4f6d074b..36bfe125d03 100644
--- a/gdb/break-catch-syscall.c
+++ b/gdb/break-catch-syscall.c
@@ -349,8 +349,7 @@ create_syscall_event_catchpoint (int tempflag, std::vector<int> &&filter)
struct gdbarch *gdbarch = get_current_arch ();
std::unique_ptr<syscall_catchpoint> c (new syscall_catchpoint ());
- init_catchpoint (c.get (), gdbarch, tempflag, nullptr,
- &vtable_breakpoint_ops);
+ init_catchpoint (c.get (), gdbarch, tempflag, nullptr);
c->syscalls_to_be_caught = std::move (filter);
install_breakpoint (0, std::move (c), 1);
diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index f41a8090e0c..14c1d19d2a3 100644
--- a/gdb/break-catch-throw.c
+++ b/gdb/break-catch-throw.c
@@ -365,8 +365,7 @@ handle_gnu_v3_exceptions (int tempflag, std::string &&except_rx,
std::unique_ptr<exception_catchpoint> cp (new exception_catchpoint ());
- init_catchpoint (cp.get (), get_current_arch (), tempflag, cond_string,
- &vtable_breakpoint_ops);
+ init_catchpoint (cp.get (), get_current_arch (), tempflag, cond_string);
cp->kind = ex_event;
cp->exception_rx = std::move (except_rx);
cp->pattern = std::move (pattern);
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 4885c72d8c0..e0008e1b4ca 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -7774,13 +7774,13 @@ disable_breakpoints_in_freed_objfile (struct objfile *objfile)
void
init_catchpoint (struct breakpoint *b,
struct gdbarch *gdbarch, bool temp,
- const char *cond_string,
- const struct breakpoint_ops *ops)
+ const char *cond_string)
{
symtab_and_line sal;
sal.pspace = current_program_space;
- init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint, ops);
+ init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint,
+ &vtable_breakpoint_ops);
if (cond_string == nullptr)
b->cond_string.reset ();
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index a17d0080603..7caa3d9392d 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -1506,13 +1506,11 @@ extern void
/* Initialize a new breakpoint of the bp_catchpoint kind. If TEMP
is true, then make the breakpoint temporary. If COND_STRING is
- not NULL, then store it in the breakpoint. OPS, if not NULL, is
- the breakpoint_ops structure associated to the catchpoint. */
+ not NULL, then store it in the breakpoint. */
extern void init_catchpoint (struct breakpoint *b,
struct gdbarch *gdbarch, bool temp,
- const char *cond_string,
- const struct breakpoint_ops *ops);
+ const char *cond_string);
/* Add breakpoint B on the breakpoint list, and notify the user, the
target and breakpoint_created observers of its existence. If
--
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 ` [PATCH 11/36] Convert break-catch-load " Tom Tromey
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 ` Tom Tromey [this message]
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-31-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).