From patchwork Thu May 11 14:48:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 69154 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8DD1D385609B for ; Thu, 11 May 2023 14:49:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8DD1D385609B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683816555; bh=JYIr/zhzw4H/WhVa8i4D1xKvcFtaQ/mTSteENqRUE+o=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=LvzsbfrOQydl3myJ4DaD5JlQp8F+JDSHs+7Br2CyoMXFUFfTlUi7lyfORLibkNApI p6dApw0iyXKos7mgSTE+E9CVdBFIYMT5LEEcPfiG9XoLrCQz/Ix8EqD3s0UnC6E93H xdXtZzuASACEWrlTSScHPF/mKRY5C3Wc6QhMkmF8= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 8AC393858431 for ; Thu, 11 May 2023 14:48:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8AC393858431 Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 3AE531E11E; Thu, 11 May 2023 10:48:34 -0400 (EDT) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 03/12] gdb: constify breakpoint::print_it parameter Date: Thu, 11 May 2023 10:48:23 -0400 Message-Id: <20230511144832.17974-4-simon.marchi@efficios.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230511144832.17974-1-simon.marchi@efficios.com> References: <20230511144832.17974-1-simon.marchi@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3497.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, 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-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" The print_it method itself is const. In a subsequent patch, the locations that come out of a const breakpoint will be const as well. It will therefore be needed to make the last_loc output parameter const as well. Make that change now to reduce the size of the following patches. Change-Id: I7ed962950bc9582646e31e2e42beca2a1c9c5105 --- gdb/ada-lang.c | 4 ++-- gdb/break-catch-exec.c | 4 ++-- gdb/break-catch-fork.c | 4 ++-- gdb/break-catch-load.c | 4 ++-- gdb/break-catch-sig.c | 4 ++-- gdb/break-catch-syscall.c | 4 ++-- gdb/break-catch-throw.c | 4 ++-- gdb/breakpoint.c | 14 ++++++-------- gdb/breakpoint.h | 2 +- 9 files changed, 21 insertions(+), 23 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 50d5c6f96971..d7316c845d6d 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -12165,7 +12165,7 @@ struct ada_catchpoint : public code_breakpoint void re_set () override; void check_status (struct bpstat *bs) override; enum print_stop_action print_it (const bpstat *bs) const override; - bool print_one (bp_location **) const override; + bool print_one (const bp_location **) const override; void print_mention () const override; void print_recreate (struct ui_file *fp) const override; @@ -12430,7 +12430,7 @@ ada_catchpoint::print_it (const bpstat *bs) const catchpoint kinds. */ bool -ada_catchpoint::print_one (bp_location **last_loc) const +ada_catchpoint::print_one (const bp_location **last_loc) const { struct ui_out *uiout = current_uiout; struct value_print_options opts; diff --git a/gdb/break-catch-exec.c b/gdb/break-catch-exec.c index 6cd498517aff..2e4ce59f49c5 100644 --- a/gdb/break-catch-exec.c +++ b/gdb/break-catch-exec.c @@ -49,7 +49,7 @@ struct exec_catchpoint : public catchpoint CORE_ADDR bp_addr, const target_waitstatus &ws) override; enum print_stop_action print_it (const bpstat *bs) const override; - bool print_one (bp_location **) const override; + bool print_one (const bp_location **) const override; void print_mention () const override; void print_recreate (struct ui_file *fp) const override; @@ -110,7 +110,7 @@ exec_catchpoint::print_it (const bpstat *bs) const } bool -exec_catchpoint::print_one (bp_location **last_loc) const +exec_catchpoint::print_one (const bp_location **last_loc) const { struct value_print_options opts; struct ui_out *uiout = current_uiout; diff --git a/gdb/break-catch-fork.c b/gdb/break-catch-fork.c index 1b1dace99d1d..fc761bcaa2b8 100644 --- a/gdb/break-catch-fork.c +++ b/gdb/break-catch-fork.c @@ -49,7 +49,7 @@ struct fork_catchpoint : public catchpoint CORE_ADDR bp_addr, const target_waitstatus &ws) override; enum print_stop_action print_it (const bpstat *bs) const override; - bool print_one (bp_location **) const override; + bool print_one (const bp_location **) const override; void print_mention () const override; void print_recreate (struct ui_file *fp) const override; @@ -136,7 +136,7 @@ fork_catchpoint::print_it (const bpstat *bs) const /* Implement the "print_one" method for fork catchpoints. */ bool -fork_catchpoint::print_one (bp_location **last_loc) const +fork_catchpoint::print_one (const bp_location **last_loc) const { struct value_print_options opts; struct ui_out *uiout = current_uiout; diff --git a/gdb/break-catch-load.c b/gdb/break-catch-load.c index e01f6450fd76..d33313a1d989 100644 --- a/gdb/break-catch-load.c +++ b/gdb/break-catch-load.c @@ -56,7 +56,7 @@ struct solib_catchpoint : public catchpoint const target_waitstatus &ws) override; void check_status (struct bpstat *bs) override; enum print_stop_action print_it (const bpstat *bs) const override; - bool print_one (bp_location **) const override; + bool print_one (const bp_location **) const override; void print_mention () const override; void print_recreate (struct ui_file *fp) const override; @@ -158,7 +158,7 @@ solib_catchpoint::print_it (const bpstat *bs) const } bool -solib_catchpoint::print_one (bp_location **locs) const +solib_catchpoint::print_one (const bp_location **locs) const { struct value_print_options opts; struct ui_out *uiout = current_uiout; diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c index 8c1fcbd69eef..10c8b81f8e83 100644 --- a/gdb/break-catch-sig.c +++ b/gdb/break-catch-sig.c @@ -57,7 +57,7 @@ struct signal_catchpoint : public catchpoint CORE_ADDR bp_addr, const target_waitstatus &ws) override; enum print_stop_action print_it (const bpstat *bs) const override; - bool print_one (bp_location **) const override; + bool print_one (const bp_location **) const override; void print_mention () const override; void print_recreate (struct ui_file *fp) const override; bool explains_signal (enum gdb_signal) override; @@ -213,7 +213,7 @@ signal_catchpoint::print_it (const bpstat *bs) const /* Implement the "print_one" method for signal catchpoints. */ bool -signal_catchpoint::print_one (bp_location **last_loc) const +signal_catchpoint::print_one (const bp_location **last_loc) const { struct value_print_options opts; struct ui_out *uiout = current_uiout; diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c index 6475f4aa172a..18e2b20c1385 100644 --- a/gdb/break-catch-syscall.c +++ b/gdb/break-catch-syscall.c @@ -52,7 +52,7 @@ struct syscall_catchpoint : public catchpoint CORE_ADDR bp_addr, const target_waitstatus &ws) override; enum print_stop_action print_it (const bpstat *bs) const override; - bool print_one (bp_location **) const override; + bool print_one (const bp_location **) const override; void print_mention () const override; void print_recreate (struct ui_file *fp) const override; @@ -236,7 +236,7 @@ syscall_catchpoint::print_it (const bpstat *bs) const /* Implement the "print_one" method for syscall catchpoints. */ bool -syscall_catchpoint::print_one (bp_location **last_loc) const +syscall_catchpoint::print_one (const bp_location **last_loc) const { struct value_print_options opts; struct ui_out *uiout = current_uiout; diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c index 604c1855c0de..47d534c5ee88 100644 --- a/gdb/break-catch-throw.c +++ b/gdb/break-catch-throw.c @@ -87,7 +87,7 @@ struct exception_catchpoint : public code_breakpoint void re_set () override; enum print_stop_action print_it (const bpstat *bs) const override; - bool print_one (bp_location **) const override; + bool print_one (const bp_location **) const override; void print_mention () const override; void print_recreate (struct ui_file *fp) const override; void print_one_detail (struct ui_out *) const override; @@ -259,7 +259,7 @@ exception_catchpoint::print_it (const bpstat *bs) const } bool -exception_catchpoint::print_one (bp_location **last_loc) const +exception_catchpoint::print_one (const bp_location **last_loc) const { struct value_print_options opts; struct ui_out *uiout = current_uiout; diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 1fdd5c3767f9..0ca4528faef2 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -369,7 +369,7 @@ struct ranged_breakpoint : public ordinary_breakpoint const target_waitstatus &ws) override; int resources_needed (const struct bp_location *) override; enum print_stop_action print_it (const bpstat *bs) const override; - bool print_one (bp_location **) const override; + bool print_one (const bp_location **) const override; void print_one_detail (struct ui_out *) const override; void print_mention () const override; void print_recreate (struct ui_file *fp) const override; @@ -6340,7 +6340,7 @@ static bool print_one_breakpoint_location (struct breakpoint *b, struct bp_location *loc, int loc_number, - struct bp_location **last_loc, + const bp_location **last_loc, int allflag, bool raw_loc) { struct command_line *l; @@ -6703,9 +6703,7 @@ print_one_breakpoint_location (struct breakpoint *b, bool fix_multi_location_breakpoint_output_globally = false; static void -print_one_breakpoint (struct breakpoint *b, - struct bp_location **last_loc, - int allflag) +print_one_breakpoint (breakpoint *b, const bp_location **last_loc, int allflag) { struct ui_out *uiout = current_uiout; bool use_fixed_output @@ -6789,7 +6787,7 @@ breakpoint_address_bits (struct breakpoint *b) void print_breakpoint (breakpoint *b) { - struct bp_location *dummy_loc = NULL; + const bp_location *dummy_loc = nullptr; print_one_breakpoint (b, &dummy_loc, 0); } @@ -6827,7 +6825,7 @@ static int breakpoint_1 (const char *bp_num_list, bool show_internal, bool (*filter) (const struct breakpoint *)) { - struct bp_location *last_loc = NULL; + const bp_location *last_loc = nullptr; int nr_printable_breakpoints; struct value_print_options opts; int print_address_bits = 0; @@ -9407,7 +9405,7 @@ ranged_breakpoint::print_it (const bpstat *bs) const /* Implement the "print_one" method for ranged breakpoints. */ bool -ranged_breakpoint::print_one (bp_location **last_loc) const +ranged_breakpoint::print_one (const bp_location **last_loc) const { struct bp_location *bl = loc; struct value_print_options opts; diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 7c5cf3f2bef4..80cb91b1a911 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -684,7 +684,7 @@ struct breakpoint /* Display information about this breakpoint, for "info breakpoints". Returns false if this method should use the default behavior. */ - virtual bool print_one (bp_location **) const + virtual bool print_one (const bp_location **) const { return false; }