From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id qIgHHXCCTWLSMAAAWB0awg (envelope-from ) for ; Wed, 06 Apr 2022 08:07:12 -0400 Received: by simark.ca (Postfix, from userid 112) id 7443E1F344; Wed, 6 Apr 2022 08:07:12 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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 ESMTPS id CB5031E787 for ; Wed, 6 Apr 2022 08:07:11 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7FCC53858427 for ; Wed, 6 Apr 2022 12:07:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7FCC53858427 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1649246831; bh=VNVbani0XIddDlDA0p9uqffUWIR+6+iLbXZyQlfF6nc=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=K7swi0LDM1vrikkm1gfOfbNugyvjSqk66KPPWAOu9rUKVnrAPPyioBIMHvwjaEk8B aTL6+aW0dv/jGwt0dGEJEgCI2QF0KGjRGZmd4x6WFF2o6WtIEctNKlTo5lTE/nGAYh XfmQxZadntPwdUKZLMrZWVez3MCMY/aoedRqEkvk= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 43F063857413 for ; Wed, 6 Apr 2022 12:05:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 43F063857413 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-500-gjnc8BQgPh-cI42upX8IFA-1; Wed, 06 Apr 2022 08:05:02 -0400 X-MC-Unique: gjnc8BQgPh-cI42upX8IFA-1 Received: by mail-wr1-f71.google.com with SMTP id k20-20020adfc714000000b001e305cd1597so424165wrg.19 for ; Wed, 06 Apr 2022 05:05:01 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VNVbani0XIddDlDA0p9uqffUWIR+6+iLbXZyQlfF6nc=; b=8KTI145LWW1L4/6SZjT1v9Mz4A9p14SnAixgcpt5L9dRAElGUcSA8rqePAiWxqhLF4 Yxu65qqAtI7uyD75RpY5MFTkCZW3zJxMTp5N6P6b+FGQx229+yfolq1nnCFK6Zr1Cy3B SB+aEojevHIemj0PLnKbqCDlasi68hzKowrTkvDah5KmhV2md+wTeT1nNjCQlWs8FpHg 3n1hOOStewNGZ2Vfk8DIyrr+6waHkYrWqc+wjLfr8CAZ/2RiP8elXGv3beEqNDqIIo5w V6w3bZh9YG4zMfznt8WnFY6V6EnBSGtuLUIBzNDXNuHmxKOLH1R8nT/3CM7rNoYmKPhy Degg== X-Gm-Message-State: AOAM530bcwmubV1uSjrjQYA1mw8XtMJCc74Gwup3nj2tBx/JZWb2a1eu d6dr3YXOSPQMT6SjxYizmgS25ifNBzxP1Zto4jUrNIOv5r570W5KwXysFf6/RWvqEyLYCYcpIil dcDiOssPfbFj2L/15l6BH4kl7nU1nCGE6z7ThCkC3yvS5oLi1DirGF7oM1YlmN6UILWiPUivqYg == X-Received: by 2002:adf:e7c4:0:b0:206:634:4cd6 with SMTP id e4-20020adfe7c4000000b0020606344cd6mr6355964wrn.118.1649246700684; Wed, 06 Apr 2022 05:05:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFkU3znCuMekO7RNmITfi3wYAxfetVTbeNv/S+qHIdXBmzGKoc9gcGO7fXNn2TgP/QjeIR1Q== X-Received: by 2002:adf:e7c4:0:b0:206:634:4cd6 with SMTP id e4-20020adfe7c4000000b0020606344cd6mr6355933wrn.118.1649246700301; Wed, 06 Apr 2022 05:05:00 -0700 (PDT) Received: from localhost (host86-169-131-113.range86-169.btcentralplus.com. [86.169.131.113]) by smtp.gmail.com with ESMTPSA id j17-20020a05600c1c1100b0038e389ab62esm8344971wms.9.2022.04.06.05.04.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 05:04:59 -0700 (PDT) To: gdb-patches@sourceware.org Subject: [PATCHv2 04/16] gdb: switch to using 'const reggroup *' in tui-regs.{c, h} Date: Wed, 6 Apr 2022 13:04:37 +0100 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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: , From: Andrew Burgess via Gdb-patches Reply-To: Andrew Burgess Cc: Andrew Burgess Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Make uses of 'reggroup *' const throughout tui-regs.{c,h}. There should be no user visible changes after this commit. --- gdb/tui/tui-regs.c | 22 +++++++++++----------- gdb/tui/tui-regs.h | 9 +++++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 190985321eb..5c6189a59b1 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -177,7 +177,7 @@ tui_data_window::first_reg_element_no_inline (int line_no) const /* Show the registers of the given group in the data window and refresh the window. */ void -tui_data_window::show_registers (struct reggroup *group) +tui_data_window::show_registers (const reggroup *group) { if (group == 0) group = general_reggroup; @@ -207,7 +207,7 @@ tui_data_window::show_registers (struct reggroup *group) refresh_values_only is true. */ void -tui_data_window::show_register_group (struct reggroup *group, +tui_data_window::show_register_group (const reggroup *group, struct frame_info *frame, bool refresh_values_only) { @@ -518,10 +518,10 @@ tui_data_item_window::rerender (WINDOW *handle, int field_width) around behaviour. Returns the next register group, or NULL if the register window is not currently being displayed. */ -static struct reggroup * -tui_reg_next (struct reggroup *current_group, struct gdbarch *gdbarch) +static const reggroup * +tui_reg_next (const reggroup *current_group, struct gdbarch *gdbarch) { - struct reggroup *group = NULL; + const reggroup *group = NULL; if (current_group != NULL) { @@ -536,10 +536,10 @@ tui_reg_next (struct reggroup *current_group, struct gdbarch *gdbarch) around behaviour. Returns the previous register group, or NULL if the register window is not currently being displayed. */ -static struct reggroup * -tui_reg_prev (struct reggroup *current_group, struct gdbarch *gdbarch) +static const reggroup * +tui_reg_prev (const reggroup *current_group, struct gdbarch *gdbarch) { - struct reggroup *group = NULL; + const reggroup *group = NULL; if (current_group != NULL) { @@ -561,7 +561,7 @@ tui_reg_command (const char *args, int from_tty) if (args != NULL) { - struct reggroup *group, *match = NULL; + const reggroup *group, *match = NULL; size_t len = strlen (args); /* Make sure the curses mode is enabled. */ @@ -575,7 +575,7 @@ tui_reg_command (const char *args, int from_tty) if (TUI_DATA_WIN == NULL || !TUI_DATA_WIN->is_visible ()) tui_regs_layout (); - struct reggroup *current_group = TUI_DATA_WIN->get_current_group (); + const reggroup *current_group = TUI_DATA_WIN->get_current_group (); if (strncmp (args, "next", len) == 0) match = tui_reg_next (current_group, gdbarch); else if (strncmp (args, "prev", len) == 0) @@ -603,7 +603,7 @@ tui_reg_command (const char *args, int from_tty) } else { - struct reggroup *group; + const reggroup *group; int first; gdb_printf (_("\"tui reg\" must be followed by the name of " diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index 9192a73b177..5289d3a892d 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -23,6 +23,7 @@ #define TUI_TUI_REGS_H #include "tui/tui-data.h" +#include "reggroups.h" /* A data item window. */ @@ -60,9 +61,9 @@ struct tui_data_window : public tui_win_info void check_register_values (struct frame_info *frame); - void show_registers (struct reggroup *group); + void show_registers (const reggroup *group); - struct reggroup *get_current_group () const + const reggroup *get_current_group () const { return m_current_group; } @@ -99,7 +100,7 @@ struct tui_data_window : public tui_win_info display off the end of the register display. */ void display_reg_element_at_line (int start_element_no, int start_line_no); - void show_register_group (struct reggroup *group, + void show_register_group (const reggroup *group, struct frame_info *frame, bool refresh_values_only); @@ -125,7 +126,7 @@ struct tui_data_window : public tui_win_info /* Windows that are used to display registers. */ std::vector m_regs_content; int m_regs_column_count = 0; - struct reggroup *m_current_group = nullptr; + const reggroup *m_current_group = nullptr; /* Width of each register's display area. */ int m_item_width = 0; -- 2.25.4