From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from outbound-ss-820.bluehost.com (outbound-ss-820.bluehost.com [69.89.24.241]) by sourceware.org (Postfix) with ESMTPS id 8DF0D3857C6A for ; Tue, 18 Jan 2022 19:40:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8DF0D3857C6A 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 cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway2.mail.pro1.eigbox.com (Postfix) with ESMTP id 0977D10041518 for ; Tue, 18 Jan 2022 19:40:20 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 9uL5nus5Vwm8i9uL5ntQdh; Tue, 18 Jan 2022 19:40:19 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=DpSTREz+ c=1 sm=1 tr=0 ts=61e717a3 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=J2Mzo-JjS6iol83SQwUA: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=iIjR0LRHiuPmu696gAgQu2itRRi7newXoFVCU5nv/WE=; b=ZN+W2+y3TXWotZrLpSIN6fFCFR XqCNKvtccByttWo7KWTOLl8U06SMjXnhM6DJgJOqt9zfxVAvBHRvYHFRaka3INpjYLcCh9hiJCKur vwIUHfNUrg5h7nwohU8b8uaZO; Received: from 75-166-134-30.hlrn.qwest.net ([75.166.134.30]:40586 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 1n9uL5-0015YU-5L; Tue, 18 Jan 2022 12:40:19 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 27/36] Merge probe and ordinary breakpoints Date: Tue, 18 Jan 2022 12:39:58 -0700 Message-Id: <20220118194007.2853108-28-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: 1n9uL5-0015YU-5L X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-134-30.hlrn.qwest.net (prentzel.Home) [75.166.134.30]:40586 X-Source-Auth: tom+tromey.com X-Email-Count: 28 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:22 -0000 Right now, probe breakpoints are handled by a separate ops object. However, they differ only in a small way from ordinary breakpoints, and furthermore can be distinguished by their "probe" object. This patch merges the two cases. This avoids having to introduce a new bp_ constant (which can be quite subtle to do correctly) and a new subclass. --- gdb/breakpoint.c | 58 ++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index d71ef98b217..d0bdf63f851 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -177,6 +177,11 @@ static void decref_bp_location (struct bp_location **loc); static struct bp_location *allocate_bp_location (struct breakpoint *bpt); +static std::vector bkpt_probe_decode_location + (struct breakpoint *b, + struct event_location *location, + struct program_space *search_pspace); + /* update_global_location_list's modes of operation wrt to whether to insert locations now. */ enum ugll_insert_mode @@ -11856,16 +11861,32 @@ base_breakpoint::insert_location (struct bp_location *bl) bl->target_info.kind = breakpoint_kind (bl, &addr); bl->target_info.placed_address = addr; + int result; if (bl->loc_type == bp_loc_hardware_breakpoint) - return target_insert_hw_breakpoint (bl->gdbarch, &bl->target_info); + result = target_insert_hw_breakpoint (bl->gdbarch, &bl->target_info); else - return target_insert_breakpoint (bl->gdbarch, &bl->target_info); + result = target_insert_breakpoint (bl->gdbarch, &bl->target_info); + + if (result == 0 && bl->probe.prob != nullptr) + { + /* The insertion was successful, now let's set the probe's semaphore + if needed. */ + bl->probe.prob->set_semaphore (bl->probe.objfile, bl->gdbarch); + } + + return result; } int base_breakpoint::remove_location (struct bp_location *bl, enum remove_bp_reason reason) { + if (bl->probe.prob != nullptr) + { + /* Let's clear the semaphore before removing the location. */ + bl->probe.prob->clear_semaphore (bl->probe.objfile, bl->gdbarch); + } + if (bl->loc_type == bp_loc_hardware_breakpoint) return target_remove_hw_breakpoint (bl->gdbarch, &bl->target_info); else @@ -12013,6 +12034,9 @@ std::vector base_breakpoint::decode_location (struct event_location *location, struct program_space *search_pspace) { + if (event_location_type (location) == PROBE_LOCATION) + return bkpt_probe_decode_location (this, location, search_pspace); + return decode_location_default (this, location, search_pspace); } @@ -12151,33 +12175,6 @@ longjmp_breakpoint::~longjmp_breakpoint () tp->initiating_frame = null_frame_id; } -/* Specific methods for probe breakpoints. */ - -static int -bkpt_probe_insert_location (struct bp_location *bl) -{ - int v = bl->owner->insert_location (bl); - - if (v == 0) - { - /* The insertion was successful, now let's set the probe's semaphore - if needed. */ - bl->probe.prob->set_semaphore (bl->probe.objfile, bl->gdbarch); - } - - return v; -} - -static int -bkpt_probe_remove_location (struct bp_location *bl, - enum remove_bp_reason reason) -{ - /* Let's clear the semaphore before removing the location. */ - bl->probe.prob->clear_semaphore (bl->probe.objfile, bl->gdbarch); - - return bl->owner->remove_location (bl, reason); -} - static void bkpt_probe_create_sals_from_location (struct event_location *location, struct linespec_result *canonical, @@ -14591,10 +14588,7 @@ initialize_breakpoint_ops (void) /* Probe breakpoints. */ ops = &bkpt_probe_breakpoint_ops; *ops = vtable_breakpoint_ops; - ops->insert_location = bkpt_probe_insert_location; - ops->remove_location = bkpt_probe_remove_location; ops->create_sals_from_location = bkpt_probe_create_sals_from_location; - ops->decode_location = bkpt_probe_decode_location; /* Probe tracepoints. */ ops = &tracepoint_probe_breakpoint_ops; -- 2.31.1