From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id 6131B3857803 for ; Tue, 18 Jan 2022 19:40:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6131B3857803 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id D163310047C26 for ; Tue, 18 Jan 2022 19:40:15 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 9uL1nA7eOnAlU9uL1n1WPr; Tue, 18 Jan 2022 19:40:15 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=QIOt+iHL c=1 sm=1 tr=0 ts=61e7179f a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=DghFqjY3_ZEA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=rotqUrpJq9nQskr2yHUA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=2yswFxACg2W5w/7rCFynmD0ZXHJ7yhQXeAkPcolFjmo=; b=P24RWe7IjeI708cU7z9oV9aDzL a3dcOUEALHVdDtDQHeC5dVW8fmNgR2tI2cYsdfXIRpuuwPsaNuniFcFkGdxaGAWw4X4gNEaa+dlii Tv/DYFQh+E0ISi/Bvk/LBPz8V; Received: from 75-166-134-30.hlrn.qwest.net ([75.166.134.30]:40584 helo=prentzel.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n9uL1-0015TE-0T; Tue, 18 Jan 2022 12:40:15 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 15/36] Convert base breakpoints to vtable ops Date: Tue, 18 Jan 2022 12:39:46 -0700 Message-Id: <20220118194007.2853108-16-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220118194007.2853108-1-tom@tromey.com> References: <20220118194007.2853108-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.134.30 X-Source-L: No X-Exim-ID: 1n9uL1-0015TE-0T X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-134-30.hlrn.qwest.net (prentzel.Home) [75.166.134.30]:40584 X-Source-Auth: tom+tromey.com X-Email-Count: 16 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2022 19:40:18 -0000 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 b (new breakpoint ()); + std::unique_ptr 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 -bkpt_decode_location (struct breakpoint *b, - struct event_location *location, - struct program_space *search_pspace) +std::vector +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 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