From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 15/36] Convert base breakpoints to vtable ops
Date: Tue, 18 Jan 2022 12:39:46 -0700 [thread overview]
Message-ID: <20220118194007.2853108-16-tom@tromey.com> (raw)
In-Reply-To: <20220118194007.2853108-1-tom@tromey.com>
This converts base breakpoints to use vtable_breakpoint_ops.
---
gdb/break-catch-throw.c | 2 +-
gdb/breakpoint.c | 55 ++++++++++++++++++-----------------------
gdb/breakpoint.h | 11 +++++++++
3 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index a49736cfd5f..86a8fe4ffc6 100644
--- a/gdb/break-catch-throw.c
+++ b/gdb/break-catch-throw.c
@@ -67,7 +67,7 @@ static struct breakpoint_ops gnu_v3_exception_catchpoint_ops;
/* The type of an exception catchpoint. */
-struct exception_catchpoint : public breakpoint
+struct exception_catchpoint : public base_breakpoint
{
/* The kind of exception catchpoint. */
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index a4ea44995b7..e9b6a801646 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -7873,7 +7873,7 @@ enable_breakpoints_after_startup (void)
static struct breakpoint *
new_single_step_breakpoint (int thread, struct gdbarch *gdbarch)
{
- std::unique_ptr<breakpoint> b (new breakpoint ());
+ std::unique_ptr<breakpoint> b (new momentary_breakpoint ());
init_raw_breakpoint_without_location (b.get (), gdbarch, bp_single_step,
&momentary_breakpoint_ops);
@@ -11809,22 +11809,22 @@ struct breakpoint_ops vtable_breakpoint_ops =
/* Default breakpoint_ops methods. */
-static void
-bkpt_re_set (struct breakpoint *b)
+void
+base_breakpoint::re_set ()
{
/* FIXME: is this still reachable? */
- if (breakpoint_event_location_empty_p (b))
+ if (breakpoint_event_location_empty_p (this))
{
/* Anything without a location can't be re-set. */
- delete_breakpoint (b);
+ delete_breakpoint (this);
return;
}
- breakpoint_re_set_default (b);
+ breakpoint_re_set_default (this);
}
-static int
-bkpt_insert_location (struct bp_location *bl)
+int
+base_breakpoint::insert_location (struct bp_location *bl)
{
CORE_ADDR addr = bl->target_info.reqstd_address;
@@ -11837,8 +11837,9 @@ bkpt_insert_location (struct bp_location *bl)
return target_insert_breakpoint (bl->gdbarch, &bl->target_info);
}
-static int
-bkpt_remove_location (struct bp_location *bl, enum remove_bp_reason reason)
+int
+base_breakpoint::remove_location (struct bp_location *bl,
+ enum remove_bp_reason reason)
{
if (bl->loc_type == bp_loc_hardware_breakpoint)
return target_remove_hw_breakpoint (bl->gdbarch, &bl->target_info);
@@ -11846,10 +11847,11 @@ bkpt_remove_location (struct bp_location *bl, enum remove_bp_reason reason)
return target_remove_breakpoint (bl->gdbarch, &bl->target_info, reason);
}
-static int
-bkpt_breakpoint_hit (const struct bp_location *bl,
- const address_space *aspace, CORE_ADDR bp_addr,
- const target_waitstatus &ws)
+int
+base_breakpoint::breakpoint_hit (const struct bp_location *bl,
+ const address_space *aspace,
+ CORE_ADDR bp_addr,
+ const target_waitstatus &ws)
{
if (ws.kind () != TARGET_WAITKIND_STOPPED
|| ws.sig () != GDB_SIGNAL_TRAP)
@@ -11881,7 +11883,7 @@ dprintf_breakpoint_hit (const struct bp_location *bl,
return 0;
}
- return bkpt_breakpoint_hit (bl, aspace, bp_addr, ws);
+ return bl->owner->breakpoint_hit (bl, aspace, bp_addr, ws);
}
static int
@@ -11985,12 +11987,11 @@ bkpt_print_recreate (struct breakpoint *tp, struct ui_file *fp)
print_recreate_thread (tp, fp);
}
-static std::vector<symtab_and_line>
-bkpt_decode_location (struct breakpoint *b,
- struct event_location *location,
- struct program_space *search_pspace)
+std::vector<symtab_and_line>
+base_breakpoint::decode_location (struct event_location *location,
+ struct program_space *search_pspace)
{
- return decode_location_default (b, location, search_pspace);
+ return decode_location_default (this, location, search_pspace);
}
/* Virtual table for internal breakpoints. */
@@ -12137,7 +12138,7 @@ longjmp_breakpoint::~longjmp_breakpoint ()
static int
bkpt_probe_insert_location (struct bp_location *bl)
{
- int v = bkpt_insert_location (bl);
+ int v = bl->owner->insert_location (bl);
if (v == 0)
{
@@ -12156,7 +12157,7 @@ bkpt_probe_remove_location (struct bp_location *bl,
/* Let's clear the semaphore before removing the location. */
bl->probe.prob->clear_semaphore (bl->probe.objfile, bl->gdbarch);
- return bkpt_remove_location (bl, reason);
+ return bl->owner->remove_location (bl, reason);
}
static void
@@ -14572,19 +14573,11 @@ initialize_breakpoint_ops (void)
breakpoints (real breakpoints, i.e., user "break" breakpoints,
internal and momentary breakpoints, etc.). */
ops = &bkpt_base_breakpoint_ops;
- *ops = base_breakpoint_ops;
- ops->re_set = bkpt_re_set;
- ops->insert_location = bkpt_insert_location;
- ops->remove_location = bkpt_remove_location;
- ops->breakpoint_hit = bkpt_breakpoint_hit;
- ops->create_sals_from_location = create_sals_from_location_default;
- ops->create_breakpoints_sal = create_breakpoints_sal_default;
- ops->decode_location = bkpt_decode_location;
+ *ops = vtable_breakpoint_ops;
/* The breakpoint_ops structure to be used in regular breakpoints. */
ops = &bkpt_breakpoint_ops;
*ops = bkpt_base_breakpoint_ops;
- ops->re_set = bkpt_re_set;
ops->resources_needed = bkpt_resources_needed;
ops->print_it = bkpt_print_it;
ops->print_mention = bkpt_print_mention;
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index a5365bf1808..11b65ab8318 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -945,6 +945,17 @@ struct breakpoint
breakpoints, etc.). */
struct base_breakpoint : public breakpoint
{
+ void re_set () override;
+ 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;
+ std::vector<symtab_and_line> decode_location
+ (struct event_location *location,
+ struct program_space *search_pspace) override;
};
/* An instance of this type is used to represent a watchpoint. */
--
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 ` Tom Tromey [this message]
2022-05-02 10:27 ` [PATCH 15/36] Convert base breakpoints to vtable ops 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-16-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).