From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1551) id 334B73856DEA; Fri, 20 May 2022 19:43:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 334B73856DEA 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] Refactor set_internal_breakpoint / internal_breakpoint ctor X-Act-Checkin: binutils-gdb X-Git-Author: Pedro Alves X-Git-Refname: refs/heads/master X-Git-Oldrev: bd21b6c9cf3e4a3fc78158ef288787dc572ce244 X-Git-Newrev: 752a2291b120ef2923615123f8a5ada334745f08 Message-Id: <20220520194324.334B73856DEA@sourceware.org> Date: Fri, 20 May 2022 19:43:24 +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:43:24 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D752a2291b120= ef2923615123f8a5ada334745f08 commit 752a2291b120ef2923615123f8a5ada334745f08 Author: Pedro Alves Date: Sat May 7 00:50:24 2022 +0100 Refactor set_internal_breakpoint / internal_breakpoint ctor =20 This moves initialization of internal_breakpoint's breakpoint fields to internal_breakpoint's ctor, and stops using new_breakpoint_from_type for internal_breakpoint breakpoints. =20 Change-Id: I898ed0565f47cb00e4429f1c6446e6f9a385a78d Diff: --- gdb/breakpoint.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index ec7a8ea2322..1695889db99 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -119,6 +119,8 @@ static struct breakpoint *set_raw_breakpoint (struct gd= barch *gdbarch, struct symtab_and_line, enum bptype); =20 +static breakpoint *add_to_breakpoint_chain (std::unique_ptr &&= b); + static struct breakpoint * momentary_breakpoint_from_master (struct breakpoint *orig, enum bptype type, @@ -276,7 +278,19 @@ struct ordinary_breakpoint : public base_breakpoint /* Internal breakpoints. */ struct internal_breakpoint : public base_breakpoint { - using base_breakpoint::base_breakpoint; + internal_breakpoint (struct gdbarch *gdbarch, + enum bptype type, CORE_ADDR address) + : base_breakpoint (gdbarch, type) + { + symtab_and_line sal; + sal.pc =3D address; + sal.section =3D find_pc_overlay (sal.pc); + sal.pspace =3D current_program_space; + add_location (sal); + + pspace =3D current_program_space; + disposition =3D disp_donttouch; + } =20 void re_set () override; void check_status (struct bpstat *bs) override; @@ -1285,17 +1299,6 @@ new_breakpoint_from_type (struct gdbarch *gdbarch, b= ptype type, std::forward (args)...); break; =20 - case bp_overlay_event: - case bp_longjmp_master: - case bp_std_terminate_master: - case bp_exception_master: - case bp_thread_event: - case bp_jit_event: - case bp_shlib_event: - b =3D new internal_breakpoint (gdbarch, type, - std::forward (args)...); - break; - case bp_longjmp: case bp_exception: b =3D new longjmp_breakpoint (gdbarch, type, @@ -3294,16 +3297,12 @@ static struct breakpoint * create_internal_breakpoint (struct gdbarch *gdbarch, CORE_ADDR address, enum bptype type) { - symtab_and_line sal; - sal.pc =3D address; - sal.section =3D find_pc_overlay (sal.pc); - sal.pspace =3D current_program_space; + std::unique_ptr b + (new internal_breakpoint (gdbarch, type, address)); =20 - breakpoint *b =3D set_raw_breakpoint (gdbarch, sal, type); b->number =3D internal_breakpoint_number--; - b->disposition =3D disp_donttouch; =20 - return b; + return add_to_breakpoint_chain (std::move (b)); } =20 static const char *const longjmp_names[] =3D