From patchwork Sat Aug 3 13:29: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: 33939 Received: (qmail 95698 invoked by alias); 3 Aug 2019 13:29:38 -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 95467 invoked by uid 89); 3 Aug 2019 13:29:36 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.2 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:34 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 3D4B25AC8A for ; Sat, 3 Aug 2019 08:29:33 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id tu6HhsgAEiQertu6HhGrbC; Sat, 03 Aug 2019 08:29:33 -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=/6Rrq+DIMP0U9wttG7FRbYkwtZuHzV42Q7VtkFate0Q=; b=q+9i9pZOCpnbjkhKtS3Qjqh8b3 5tsoL7hFoXvFXgQJTccUCi2I5qOPhWvmOSSXmGkbOjd4mINhJm9Gtp0QMIcmY3vHYnJWrk+7RpTNz d/o9uSWwZiK24jdl5YMqhRMv/; 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 1htu6H-003nqS-08; Sat, 03 Aug 2019 08:29:33 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 13/19] Change tui_update_exec_info to be a method Date: Sat, 3 Aug 2019 07:29:19 -0600 Message-Id: <20190803132925.25074-14-tom@tromey.com> In-Reply-To: <20190803132925.25074-1-tom@tromey.com> References: <20190803132925.25074-1-tom@tromey.com> This changes tui_update_exec_info to be a method on tui_source_window_base. gdb/ChangeLog 2019-08-03 Tom Tromey * tui/tui-winsource.h (struct tui_source_window_base) : Declare. (tui_update_exec_info): Don't declare. * tui/tui-winsource.c (tui_update_source_window_as_is) (tui_source_window_base::refresh_all) (tui_update_all_breakpoint_info): Update. (tui_source_window_base::update_exec_info): Rename from tui_update_exec_info. * tui/tui-stack.c (tui_show_frame_info): Update. --- gdb/ChangeLog | 12 ++++++++++++ gdb/tui/tui-stack.c | 4 ++-- gdb/tui/tui-winsource.c | 12 ++++++------ gdb/tui/tui-winsource.h | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c index 6acc2277c04..0a712231fa5 100644 --- a/gdb/tui/tui-stack.c +++ b/gdb/tui/tui-stack.c @@ -428,7 +428,7 @@ tui_show_frame_info (struct frame_info *fi) } } - tui_update_exec_info (win_info); + win_info->update_exec_info (); } return 1; @@ -445,7 +445,7 @@ tui_show_frame_info (struct frame_info *fi) for (struct tui_source_window_base *win_info : tui_source_windows ()) { tui_clear_source_content (win_info); - tui_update_exec_info (win_info); + win_info->update_exec_info (); } return 1; diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index c47da04e2a3..53113bd785c 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -106,7 +106,7 @@ tui_update_source_window_as_is (struct tui_source_window_base *win_info, { tui_update_breakpoint_info (win_info, nullptr, false); win_info->show_source_content (); - tui_update_exec_info (win_info); + win_info->update_exec_info (); if (win_info->type == SRC_WIN) { symtab_and_line sal; @@ -335,7 +335,7 @@ tui_source_window_base::refresh_all () show_source_content (); check_and_display_highlight_if_needed (); tui_erase_exec_info_content (this); - tui_update_exec_info (this); + update_exec_info (); } /* See tui-data.h. */ @@ -517,7 +517,7 @@ tui_update_all_breakpoint_info (struct breakpoint *being_deleted) { if (tui_update_breakpoint_info (win, being_deleted, false)) { - tui_update_exec_info (win); + win->update_exec_info (); } } } @@ -673,10 +673,10 @@ tui_clear_exec_info_content (struct tui_source_window_base *win_info) /* Function to update the execution info window. */ void -tui_update_exec_info (struct tui_source_window_base *win_info) +tui_source_window_base::update_exec_info () { - win_info->set_exec_info_content (); - tui_show_exec_info_content (win_info); + set_exec_info_content (); + tui_show_exec_info_content (this); } void diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index 645cd6717d6..bce889d5abe 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -92,6 +92,7 @@ public: void show_source_content (); void set_exec_info_content (); + void update_exec_info (); /* Does the locator belong to this window? */ bool m_has_locator = false; @@ -146,7 +147,6 @@ extern void tui_erase_source_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_source_window_base *); extern int tui_line_is_displayed (int,