From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by sourceware.org (Postfix) with ESMTPS id 5D8C13856DD7 for ; Mon, 16 May 2022 18:41:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5D8C13856DD7 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f53.google.com with SMTP id k126so9242681wme.2 for ; Mon, 16 May 2022 11:41:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L8o6DWGTvvONAkWcfp6wVUxkj/iqxlSyLGSkFYDc+1g=; b=ZCEvocH9VUDYsCcHgedvZyZoV7uEMi5SmVppAsOfMRhxiXAGynGxV/pMCEs3xUwU3U Bj5/tVueWLjNRTlvg5qy9V1pePIOuHMVeiMa5U2dyYA5ig2f9HW6+RWNwuvcWPDipg8e iOAyZlk8SWxhz+0LQG+fTtTM60zVmw8lWxmP9Rg9HXCUMJOW2Oqlaa5qmUwNlzP9qbGd JSIJJQw+FzVFj1s4iIWOif1kh1Mf3VWRLGDa45EdXIunUk7ygvnDgxnOEvH/VIRgh4Ij Ro+wawZJ7Cx+anm0m6VqsOKzx8nbM7msMoWMYwx0it/Y69IcHV7Yn6AExfjMMWetYiTs vb0g== X-Gm-Message-State: AOAM532Ya1kTYgTzcPrr0SdYWgTJ9TaapjsbFsEOOpHvStjbS/9J2gBY SsA+Zq64MrkxOBASSw3hyn6SU88ehoU= X-Google-Smtp-Source: ABdhPJw9EnmwQqMLLAcAi2QNWudPjTEs6ClNGVLj7G7yjoCnh1cRJc771mN8SabJr3OkicYYVog3XA== X-Received: by 2002:a05:600c:4e91:b0:394:8d30:d6dd with SMTP id f17-20020a05600c4e9100b003948d30d6ddmr17883621wmq.21.1652726466646; Mon, 16 May 2022 11:41:06 -0700 (PDT) Received: from localhost ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id g40-20020a05600c4ca800b003942a244f3bsm34220wmp.20.2022.05.16.11.41.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 May 2022 11:41:05 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 16/23] Make catchpoint inherit breakpoint, eliminate init_raw_breakpoint Date: Mon, 16 May 2022 19:40:23 +0100 Message-Id: <20220516184030.665489-17-pedro@palves.net> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516184030.665489-1-pedro@palves.net> References: <20220516184030.665489-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Mon, 16 May 2022 18:41:09 -0000 struct catchpoint's ctor currently calls init_raw_breakpoint, which is a bit weird, as that ctor-like function takes a sal argument, but catchpoints don't have code locations. Instead, make struct catchpoint's ctor add the catchpoint's dummy location using add_dummy_location. init_raw_breakpoint uses add_location under the hood, and with a dummy sal it would ultimately use the breakpoint's gdbarch for the location's gdbarch, so replace the references to loc->gdbarch (which is now NULL) in syscall_catchpoint to references to the catchpoint's gdbarch. struct catchpoint's ctor was the last user of init_raw_breakpoint, so this commit eliminates the latter. Since catchpoint locations aren't code locations, make struct catchpoint inherit struct breakpoint instead of base_breakpoint. This let's us delete the tracepoint::re_set override too. Change-Id: Ib428bf71efb09fdaf399c56e4372b0f41d9c5869 --- gdb/break-catch-syscall.c | 6 +++--- gdb/breakpoint.c | 31 +++---------------------------- gdb/breakpoint.h | 7 +------ 3 files changed, 7 insertions(+), 37 deletions(-) diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c index af55ecb1b5c..06d48466de7 100644 --- a/gdb/break-catch-syscall.c +++ b/gdb/break-catch-syscall.c @@ -197,7 +197,7 @@ syscall_catchpoint::print_it (const bpstat *bs) const must print "called syscall" or "returned from syscall". */ struct target_waitstatus last; struct syscall s; - struct gdbarch *gdbarch = bs->bp_location_at->gdbarch; + struct gdbarch *gdbarch = b->gdbarch; get_last_target_status (nullptr, nullptr, &last); @@ -242,7 +242,7 @@ syscall_catchpoint::print_one (bp_location **last_loc) const { struct value_print_options opts; struct ui_out *uiout = current_uiout; - struct gdbarch *gdbarch = loc->gdbarch; + struct gdbarch *gdbarch = loc->owner->gdbarch; get_user_print_options (&opts); /* Field 4, the address, is omitted (which makes the columns not @@ -293,7 +293,7 @@ syscall_catchpoint::print_one (bp_location **last_loc) const void syscall_catchpoint::print_mention () const { - struct gdbarch *gdbarch = loc->gdbarch; + struct gdbarch *gdbarch = loc->owner->gdbarch; if (!syscalls_to_be_caught.empty ()) { diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 6dfb89f51bc..bb433463c55 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -7266,30 +7266,6 @@ get_sal_arch (struct symtab_and_line sal) return NULL; } -/* Low level routine for partially initializing a breakpoint of type - BPTYPE. The newly created breakpoint's address, section, source - file name, and line number are provided by SAL. - - It is expected that the caller will complete the initialization of - the newly created breakpoint struct as well as output any status - information regarding the creation of a new breakpoint. */ - -static void -init_raw_breakpoint (struct breakpoint *b, struct symtab_and_line sal, - enum bptype bptype) -{ - b->add_location (sal); - - if (bptype != bp_catchpoint) - gdb_assert (sal.pspace != NULL); - - /* Store the program space that was used to set the breakpoint, - except for ordinary breakpoints, which are independent of the - program space. */ - if (bptype != bp_breakpoint && bptype != bp_hardware_breakpoint) - b->pspace = sal.pspace; -} - /* Call this routine when stepping and nexting to enable a breakpoint if we do a longjmp() or 'throw' in TP. FRAME is the frame which initiated the operation. */ @@ -7751,12 +7727,11 @@ disable_breakpoints_in_freed_objfile (struct objfile *objfile) catchpoint::catchpoint (struct gdbarch *gdbarch, bool temp, const char *cond_string_) - : base_breakpoint (gdbarch, bp_catchpoint) + : breakpoint (gdbarch, bp_catchpoint) { - symtab_and_line sal; - sal.pspace = current_program_space; + add_dummy_location (this, current_program_space); - init_raw_breakpoint (this, sal, bp_catchpoint); + pspace = current_program_space; if (cond_string_ != nullptr) cond_string = make_unique_xstrdup (cond_string_); diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 7375e976dc6..21dd8d53b2d 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1030,18 +1030,13 @@ struct tracepoint : public base_breakpoint /* The base class for catchpoints. */ -struct catchpoint : public base_breakpoint +struct catchpoint : public breakpoint { /* If TEMP is true, then make the breakpoint temporary. If COND_STRING is not NULL, then store it in the breakpoint. */ catchpoint (struct gdbarch *gdbarch, bool temp, const char *cond_string); ~catchpoint () override = 0; - - void re_set () override - { - /* For catchpoints, the default is to do nothing. */ - } }; -- 2.36.0