From patchwork Sat Aug 3 13:29:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33942 Received: (qmail 96263 invoked by alias); 3 Aug 2019 13:29:40 -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 95768 invoked by uid 89); 3 Aug 2019 13:29:38 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.3 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: gateway33.websitewelcome.com Received: from gateway33.websitewelcome.com (HELO gateway33.websitewelcome.com) (192.185.145.190) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 03 Aug 2019 13:29:36 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway33.websitewelcome.com (Postfix) with ESMTP id BCA685AC8E for ; Sat, 3 Aug 2019 08:29:34 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id tu6Ih5F6a4FKptu6IhE9nY; Sat, 03 Aug 2019 08:29:34 -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=x7Ue8CQ5WwHOgLaM2z0VDQK3J8lucbkBMhZuEPAZzqk=; b=m70n//VIxM/wnrxJ4sJwapBfL6 NeYum+WlXA/6xeNAZODtcUEXrganJ6IXjMdbhdJCXvGtW7BYcVqMlKz6ru+CMfxLjEzy/YIQIvQ4x f6XKIH0VC7/1eURN9reW8s823; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:36980 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1htu6I-003nqS-HN; Sat, 03 Aug 2019 08:29:34 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 17/19] Remove tui_clear_exec_info_content Date: Sat, 3 Aug 2019 07:29:23 -0600 Message-Id: <20190803132925.25074-18-tom@tromey.com> In-Reply-To: <20190803132925.25074-1-tom@tromey.com> References: <20190803132925.25074-1-tom@tromey.com> After the previous patch, all calls to tui_clear_exec_info_content come just after a call to tui_clear_source_content. Because these two windows are linked, I think it makes sense to have tui_clear_source_content simply do the work. So, this patch removes tui_clear_exec_info_content. gdb/ChangeLog 2019-08-03 Tom Tromey * tui/tui-winsource.h (tui_clear_exec_info_content): Don't declare. * tui/tui-winsource.c (tui_update_source_window_as_is) (tui_update_source_windows_with_addr, tui_erase_source_content): Update. (tui_clear_exec_info_content): Remove. --- gdb/ChangeLog | 9 +++++++++ gdb/tui/tui-winsource.c | 24 +++++++----------------- gdb/tui/tui-winsource.h | 1 - 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index ed2af064c47..2f02c6a0120 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -98,10 +98,7 @@ tui_update_source_window_as_is (struct tui_source_window_base *win_info, ret = tui_set_disassem_content (win_info, gdbarch, line_or_addr.u.addr); if (ret == TUI_FAILURE) - { - tui_clear_source_content (win_info); - tui_clear_exec_info_content (win_info); - } + tui_clear_source_content (win_info); else { tui_update_breakpoint_info (win_info, nullptr, false); @@ -156,10 +153,7 @@ tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr) else { for (struct tui_source_window_base *win_info : tui_source_windows ()) - { - tui_clear_source_content (win_info); - tui_clear_exec_info_content (win_info); - } + tui_clear_source_content (win_info); } } @@ -244,6 +238,11 @@ tui_erase_source_content (struct tui_source_window_base *win_info) win_info->content.clear (); win_info->refresh_window (); + + struct tui_gen_win_info *exec_info = win_info->execution_info; + + werase (exec_info->handle); + exec_info->refresh_window (); } } @@ -655,15 +654,6 @@ tui_source_window_base::show_exec_info_content () } -void -tui_clear_exec_info_content (struct tui_source_window_base *win_info) -{ - struct tui_gen_win_info *exec_info = win_info->execution_info; - - werase (exec_info->handle); - exec_info->refresh_window (); -} - /* Function to update the execution info window. */ void tui_source_window_base::update_exec_info () diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index d8a84b01846..e0a96c14dcc 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -188,7 +188,6 @@ extern void tui_update_source_windows_with_line (struct symtab *, int); extern void tui_clear_source_content (struct tui_source_window_base *); extern void tui_erase_source_content (struct tui_source_window_base *); -extern void tui_clear_exec_info_content (struct tui_source_window_base *); extern void tui_alloc_source_buffer (struct tui_source_window_base *); extern int tui_line_is_displayed (int,