From patchwork Sun Jun 23 22:43:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33321 Received: (qmail 59085 invoked by alias); 23 Jun 2019 23:26:08 -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 59014 invoked by uid 89); 23 Jun 2019 23:26:07 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.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: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.149.105) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Jun 2019 23:26:06 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway34.websitewelcome.com (Postfix) with ESMTP id BF9891D6AC for ; Sun, 23 Jun 2019 18:26:04 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fBs4hMCU94FKpfBs4hcnSo; Sun, 23 Jun 2019 18:26:04 -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=62oYgrOlkF7IYshmqUYZ25ozWaEeTQEA5sviwI1FC+8=; b=NjuiGgaua7/Y//yC5fXNJL/tlS SH4Z1TSHyU0+1L3D4jkvMzx3KXwVqNN4POCXG2p2o970yZpZ08Croj5y3+k4GxmN+cumCgnG+eON9 OO/Jc/PHnpIT81TacuCaLKv6b; Received: from 75-166-12-78.hlrn.qwest.net ([75.166.12.78]:54396 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hfBDA-000vDQ-QF; Sun, 23 Jun 2019 17:43:48 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 39/66] Change more TUI functions to take a tui_source_window_base Date: Sun, 23 Jun 2019 16:43:02 -0600 Message-Id: <20190623224329.16060-40-tom@tromey.com> In-Reply-To: <20190623224329.16060-1-tom@tromey.com> References: <20190623224329.16060-1-tom@tromey.com> Several more TUI functions should only be called with a source or disassembly window. This patch changes these functions so that this can be caught at compile time. 2019-06-23 Tom Tromey * tui/tui-winsource.h (tui_set_exec_info_content) (tui_show_exec_info_content, tui_erase_exec_info_content) (tui_clear_exec_info_content, tui_update_exec_info): Change argument to tui_source_window_base. * tui/tui-winsource.c (tui_set_exec_info_content) (tui_show_exec_info_content, tui_erase_exec_info_content) (tui_clear_exec_info_content, tui_update_exec_info): Change argument to tui_source_window_base. --- gdb/ChangeLog | 11 +++++++++++ gdb/tui/tui-winsource.c | 26 ++++++++++---------------- gdb/tui/tui-winsource.h | 10 +++++----- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 2de5c53214e..e55ce40a206 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -483,12 +483,11 @@ tui_update_breakpoint_info (struct tui_win_info *win, based upon the input window which is either the source or disassembly window. */ void -tui_set_exec_info_content (struct tui_win_info *win_info) +tui_set_exec_info_content (struct tui_source_window_base *win_info) { - tui_source_window_base *base = (tui_source_window_base *) win_info; - if (base->execution_info != NULL) + if (win_info->execution_info != NULL) { - struct tui_gen_win_info *exec_info_ptr = base->execution_info; + struct tui_gen_win_info *exec_info_ptr = win_info->execution_info; if (exec_info_ptr->content == NULL) exec_info_ptr->content = @@ -532,10 +531,9 @@ tui_set_exec_info_content (struct tui_win_info *win_info) void -tui_show_exec_info_content (struct tui_win_info *win_info) +tui_show_exec_info_content (struct tui_source_window_base *win_info) { - tui_source_window_base *base = (tui_source_window_base *) win_info; - struct tui_gen_win_info *exec_info = base->execution_info; + struct tui_gen_win_info *exec_info = win_info->execution_info; int cur_line; werase (exec_info->handle); @@ -552,28 +550,24 @@ tui_show_exec_info_content (struct tui_win_info *win_info) void -tui_erase_exec_info_content (struct tui_win_info *win_info) +tui_erase_exec_info_content (struct tui_source_window_base *win_info) { - tui_source_window_base *base = (tui_source_window_base *) win_info; - struct tui_gen_win_info *exec_info = base->execution_info; + struct tui_gen_win_info *exec_info = win_info->execution_info; werase (exec_info->handle); exec_info->refresh_window (); } void -tui_clear_exec_info_content (struct tui_win_info *win_info) +tui_clear_exec_info_content (struct tui_source_window_base *win_info) { - tui_source_window_base *base = (tui_source_window_base *) win_info; - base->execution_info->content_in_use = FALSE; + win_info->execution_info->content_in_use = FALSE; tui_erase_exec_info_content (win_info); - - return; } /* Function to update the execution info window. */ void -tui_update_exec_info (struct tui_win_info *win_info) +tui_update_exec_info (struct tui_source_window_base *win_info) { tui_set_exec_info_content (win_info); tui_show_exec_info_content (win_info); diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index 3ed461a3157..09a9d5abf4a 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -53,11 +53,11 @@ extern void tui_update_source_windows_with_line (struct symtab *, extern void tui_clear_source_content (struct tui_win_info *, int); extern void tui_erase_source_content (struct tui_win_info *, int); extern void tui_show_source_content (struct tui_win_info *); -extern void tui_set_exec_info_content (struct tui_win_info *); -extern void tui_show_exec_info_content (struct tui_win_info *); -extern void tui_erase_exec_info_content (struct tui_win_info *); -extern void tui_clear_exec_info_content (struct tui_win_info *); -extern void tui_update_exec_info (struct tui_win_info *); +extern void tui_set_exec_info_content (struct tui_source_window_base *); +extern void tui_show_exec_info_content (struct tui_source_window_base *); +extern void tui_erase_exec_info_content (struct tui_source_window_base *); +extern void tui_clear_exec_info_content (struct tui_source_window_base *); +extern void tui_update_exec_info (struct tui_source_window_base *); extern void tui_alloc_source_buffer (struct tui_win_info *); extern int tui_line_is_displayed (int,