From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 9A97F3898C70 for ; Thu, 31 Mar 2022 21:04:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9A97F3898C70 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-146-vHxPmZ-KOLKchfZLGAXMSA-1; Thu, 31 Mar 2022 17:04:37 -0400 X-MC-Unique: vHxPmZ-KOLKchfZLGAXMSA-1 Received: by mail-wr1-f72.google.com with SMTP id e10-20020adf9bca000000b002059b6ffa18so203371wrc.14 for ; Thu, 31 Mar 2022 14:04:36 -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=LF85yPjc0/KxPXMp+XSebBhtFVd4VU0r+LHerJnuZYx6oDOxocleOgdDPIo2eRVqN7 YJ5FcXg8vBSyFVljHQjHvu7d6ccfxK7rZj8Cd8MXcXOAL9fwzVN3xfreuFTqp4yAOZa2 tGAM587mEe86jZa4akWMx9kBnT1ARs2cs1x3odB8x1UJKTRnPYiy0fKvtm1cHLiT2xQU Bjeobuj6F0nl38B0kUsHBf60paZu23WEW5hooPmhBXDbxqz3xMQl+HrY2YEHUDTmAgPt qd0FIxf2OhcDYH5G838A3KIS4rVwToCdCnG1E5ZdxIEOA7g5J4iqboVu6cC6sjOokaEk 3dOg== X-Gm-Message-State: AOAM533qSvYhoDlU1XCSclzHcz5xV1I7xprSiTDyyasJObBut4rBuQ1P d1ufTVtVyy0MeuuvWQR5oTT3U8PJGby+qWNpDJCyBcrYRLZ24dqainXGjqzZsZqcg86tt+r7JOR N4TJMttLURhdScZEYTfvOlHDsDHC/4vAMlS0mbQkbFspQDDPAenGJXRppOC6Vo4Ah6s0T+kO/RQ == X-Received: by 2002:a7b:c397:0:b0:38e:4a0f:c5e0 with SMTP id s23-20020a7bc397000000b0038e4a0fc5e0mr3568648wmj.132.1648760675437; Thu, 31 Mar 2022 14:04:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFqENRymWKnq6dpy9H4KoNYNJuWrvUmy5BnM9vMdJDbNb3v/ZH9zxdAsYVOzoKsvAYGBxZHA== X-Received: by 2002:a7b:c397:0:b0:38e:4a0f:c5e0 with SMTP id s23-20020a7bc397000000b0038e4a0fc5e0mr3568637wmj.132.1648760675165; Thu, 31 Mar 2022 14:04:35 -0700 (PDT) Received: from localhost (host86-169-131-113.range86-169.btcentralplus.com. [86.169.131.113]) by smtp.gmail.com with ESMTPSA id k5-20020a05600c1c8500b0038ce140fec1sm274000wms.16.2022.03.31.14.04.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 14:04:34 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 04/16] gdb: switch to using 'const reggroup *' in tui-regs.{c, h} Date: Thu, 31 Mar 2022 22:04:10 +0100 Message-Id: <602a33867531cafed1e83f8182699f6bfcd34b43.1648760270.git.aburgess@redhat.com> 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-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: Thu, 31 Mar 2022 21:04:40 -0000 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