From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1551) id C1C353856DEA; Fri, 20 May 2022 19:42:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C1C353856DEA Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Pedro Alves To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Make a few functions work with base_breakpoint instead of breakpoint X-Act-Checkin: binutils-gdb X-Git-Author: Pedro Alves X-Git-Refname: refs/heads/master X-Git-Oldrev: b925bf21e073f0d9531385e8cfc3a825887c0778 X-Git-Newrev: ff733ec228e3f4f1c1607fe50aeb944505105fde Message-Id: <20220520194253.C1C353856DEA@sourceware.org> Date: Fri, 20 May 2022 19:42:53 +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, 20 May 2022 19:42:53 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dff733ec228e3= f4f1c1607fe50aeb944505105fde commit ff733ec228e3f4f1c1607fe50aeb944505105fde Author: Pedro Alves Date: Fri May 6 23:11:34 2022 +0100 Make a few functions work with base_breakpoint instead of breakpoint =20 This makes tracepoints inherit from base_breakpoint, since their locations are code locations. If we do that, then we can eliminate tracepoint::re_set and tracepoint::decode_location, as they are doing the same as the base_breakpoint implementations. =20 With this, all breakpoint types created by new_breakpoint_from_type are code breakpoints, i.e., base_breakpoint subclasses, and thus we can make it return a base_breakpoint pointer. =20 Finally, init_breakpoint_sal can take a base_breakpoint pointer as "self" pointer too. This will let us convert this function to a base_breakpoint ctor in a following patch. =20 Change-Id: I3a4073ff1a4c865f525588095c18dc42b744cb54 Diff: --- gdb/breakpoint.c | 30 ++++++------------------------ gdb/breakpoint.h | 9 ++------- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 1c1dbfb3ad7..d13e803dee5 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1258,10 +1258,10 @@ is_tracepoint (const struct breakpoint *b) /* Factory function to create an appropriate instance of breakpoint given TYPE. */ =20 -static std::unique_ptr +static std::unique_ptr new_breakpoint_from_type (struct gdbarch *gdbarch, bptype type) { - breakpoint *b; + base_breakpoint *b; =20 switch (type) { @@ -1317,7 +1317,7 @@ new_breakpoint_from_type (struct gdbarch *gdbarch, bp= type type) gdb_assert_not_reached ("invalid type"); } =20 - return std::unique_ptr (b); + return std::unique_ptr (b); } =20 /* A helper function that validates that COMMANDS are valid for a @@ -8297,7 +8297,7 @@ update_dprintf_commands (const char *args, int from_t= ty, "address location" from the address in the SAL. */ =20 static void -init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch, +init_breakpoint_sal (base_breakpoint *b, struct gdbarch *gdbarch, gdb::array_view sals, event_location_up &&location, gdb::unique_xmalloc_ptr filter, @@ -8359,7 +8359,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdb= arch *gdbarch, if (type =3D=3D bp_static_tracepoint || type =3D=3D bp_static_marker_tracepoint) { - struct tracepoint *t =3D (struct tracepoint *) b; + auto *t =3D static_cast (b); struct static_tracepoint_marker marker; =20 if (strace_marker_p (b)) @@ -8453,7 +8453,7 @@ create_breakpoint_sal (struct gdbarch *gdbarch, int enabled, int internal, unsigned flags, int display_canonical) { - std::unique_ptr b =3D new_breakpoint_from_type (gdbarch, typ= e); + std::unique_ptr b =3D new_breakpoint_from_type (gdbarch= , type); =20 init_breakpoint_sal (b.get (), gdbarch, sals, std::move (location), @@ -11952,14 +11952,6 @@ bkpt_probe_decode_location (struct breakpoint *b, return sals; } =20 -/* The breakpoint_ops structure to be used in tracepoints. */ - -void -tracepoint::re_set () -{ - breakpoint_re_set_default (this); -} - int tracepoint::breakpoint_hit (const struct bp_location *bl, const address_space *aspace, CORE_ADDR bp_addr, @@ -12034,16 +12026,6 @@ tracepoint::print_recreate (struct ui_file *fp) co= nst gdb_printf (fp, " passcount %d\n", pass_count); } =20 -std::vector -tracepoint::decode_location (struct event_location *location, - struct program_space *search_pspace) -{ - if (event_location_type (location) =3D=3D PROBE_LOCATION) - return bkpt_probe_decode_location (this, location, search_pspace); - - return decode_location_default (this, location, search_pspace); -} - /* Virtual table for tracepoints on static probes. */ =20 static void diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index b7e3b4dc6a1..48ceceabb3d 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -974,21 +974,16 @@ extern bool is_exception_catchpoint (breakpoint *bp); /* An instance of this type is used to represent all kinds of tracepoints. */ =20 -struct tracepoint : public breakpoint +struct tracepoint : public base_breakpoint { - using breakpoint::breakpoint; + using base_breakpoint::base_breakpoint; =20 - void re_set () override; int breakpoint_hit (const struct bp_location *bl, const address_space *aspace, CORE_ADDR bp_addr, const target_waitstatus &ws) override; void print_one_detail (struct ui_out *uiout) const override; void print_mention () const override; void print_recreate (struct ui_file *fp) const override; - std::vector decode_location - (struct event_location *location, - struct program_space *search_pspace) override; - =20 /* Number of times this tracepoint should single-step and collect additional data. */