From patchwork Thu Jul 4 17:02:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33547 Received: (qmail 105374 invoked by alias); 4 Jul 2019 17:03:26 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 104981 invoked by uid 89); 4 Jul 2019 17:03:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway24.websitewelcome.com Received: from gateway24.websitewelcome.com (HELO gateway24.websitewelcome.com) (192.185.51.251) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 Jul 2019 17:03:19 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 44CA825928 for ; Thu, 4 Jul 2019 12:03:17 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id j58fhxLoW4FKpj58fhBuPD; Thu, 04 Jul 2019 12:03:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=3fqqayxzMuSU2qKrRlca+kCGK+HgSs/E0q5O4TQgK3c=; b=MPXX1QuBISqKPnTL1FwwbMjoJY PqmLig2+VXrHw8LFa6gvwS11C6Xc+G/2YpNBctXgZKkWT3IQT1CgoCZMIuDNVQ72zrfIHVkH6n3+3 EfbhLlUNed4Qofugyok/pl8Rp; Received: from 174-29-58-150.hlrn.qwest.net ([174.29.58.150]:34690 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hj58f-002sAP-67; Thu, 04 Jul 2019 12:03:17 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 09/61] Remove tui_display_data_from_line Date: Thu, 4 Jul 2019 11:02:19 -0600 Message-Id: <20190704170311.15982-10-tom@tromey.com> In-Reply-To: <20190704170311.15982-1-tom@tromey.com> References: <20190704170311.15982-1-tom@tromey.com> tui_display_data_from_line is just a wrapper for tui_display_registers_from_line, so remove it. Also, nothing passed 0 as the "force_display" parameter to tui_display_registers_from_line, so remove that parameter as well. 2019-07-04 Tom Tromey * tui/tui-windata.h (tui_display_data_from_line): Don't declare. * tui/tui-windata.c (tui_display_data_from_line): Remove. (tui_display_data_from, tui_data_window::do_scroll_vertical): Call tui_display_registers_from_line. * tui/tui-regs.h (tui_display_registers_from_line): Update. * tui/tui-regs.c (tui_display_registers_from_line): Remove "force_display" parameter. --- gdb/ChangeLog | 10 ++++++++++ gdb/tui/tui-regs.c | 30 +++++++++++++----------------- gdb/tui/tui-regs.h | 2 +- gdb/tui/tui-windata.c | 20 ++------------------ gdb/tui/tui-windata.h | 1 - 5 files changed, 26 insertions(+), 37 deletions(-) diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index d005fe36c23..ae38d343822 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -372,38 +372,34 @@ tui_display_reg_element_at_line (int start_element_no, data window. Answers the line number that the display actually started from. If nothing is displayed (-1) is returned. */ int -tui_display_registers_from_line (int line_no, - int force_display) +tui_display_registers_from_line (int line_no) { + tui_check_and_display_highlight_if_needed (TUI_DATA_WIN); if (!TUI_DATA_WIN->regs_content.empty ()) { - int line, element_no; + int element_no; if (line_no < 0) - line = 0; - else if (force_display) - { /* If we must display regs (force_display is true), then - make sure that we don't display off the end of the + line_no = 0; + else + { + /* Make sure that we don't display off the end of the registers. */ if (line_no >= TUI_DATA_WIN->last_regs_line_no ()) { - if ((line = TUI_DATA_WIN->line_from_reg_element_no ( + if ((line_no = TUI_DATA_WIN->line_from_reg_element_no ( TUI_DATA_WIN->regs_content.size () - 1)) < 0) - line = 0; + line_no = 0; } - else - line = line_no; } - else - line = line_no; - element_no = TUI_DATA_WIN->first_reg_element_no_inline (line); + element_no = TUI_DATA_WIN->first_reg_element_no_inline (line_no); if (element_no < TUI_DATA_WIN->regs_content.size ()) - tui_display_reg_element_at_line (element_no, line); + tui_display_reg_element_at_line (element_no, line_no); else - line = (-1); + line_no = (-1); - return line; + return line_no; } return (-1); /* Nothing was displayed. */ diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index 866af458e10..c1054696493 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -27,7 +27,7 @@ extern void tui_check_register_values (struct frame_info *); extern void tui_show_registers (struct reggroup *group); extern void tui_display_registers_from (int); -extern int tui_display_registers_from_line (int, int); +extern int tui_display_registers_from_line (int); extern int tui_first_reg_element_inline (int); #endif /* TUI_TUI_REGS_H */ diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c index ac3e6d6e097..4f18d73aec2 100644 --- a/gdb/tui/tui-windata.c +++ b/gdb/tui/tui-windata.c @@ -111,22 +111,6 @@ tui_display_all_data (void) } -/* Function to display the data starting at line, line_no, in the data - window. */ -void -tui_display_data_from_line (int line_no) -{ - int _line_no = line_no; - - if (line_no < 0) - _line_no = 0; - - tui_check_and_display_highlight_if_needed (TUI_DATA_WIN); - - tui_display_registers_from_line (_line_no, TRUE); -} - - /* Display data starting at element element_no. */ void tui_display_data_from (int element_no, int reuse_windows) @@ -144,7 +128,7 @@ tui_display_data_from (int element_no, int reuse_windows) tui_erase_data_content (NULL); if (!reuse_windows) tui_delete_data_content_windows (); - tui_display_data_from_line (first_line); + tui_display_registers_from_line (first_line); } } @@ -184,7 +168,7 @@ tui_data_window::do_scroll_vertical (int num_to_scroll) first_line += num_to_scroll; tui_erase_data_content (NULL); tui_delete_data_content_windows (); - tui_display_data_from_line (first_line); + tui_display_registers_from_line (first_line); } } diff --git a/gdb/tui/tui-windata.h b/gdb/tui/tui-windata.h index 1aba67520ec..fd8e6257da7 100644 --- a/gdb/tui/tui-windata.h +++ b/gdb/tui/tui-windata.h @@ -26,7 +26,6 @@ extern void tui_erase_data_content (const char *); extern void tui_display_all_data (void); -extern void tui_display_data_from_line (int); extern void tui_delete_data_content_windows (void); extern void tui_refresh_data_win (void); extern void tui_display_data_from (int, int);