From patchwork Sat Aug 3 13:29:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33940 Received: (qmail 95926 invoked by alias); 3 Aug 2019 13:29:39 -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 95339 invoked by uid 89); 3 Aug 2019 13:29:35 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SEMBLACK, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=bea X-HELO: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.144.95) 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 gateway31.websitewelcome.com (Postfix) with ESMTP id D4505D5130 for ; Sat, 3 Aug 2019 08:29:32 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id tu6GhsgA3iQertu6GhGrb3; Sat, 03 Aug 2019 08:29:32 -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=tMW11VAbXQuyOO9GJ4rFp3PalMwx1xUnxEWGURSLE8E=; b=uhWsE8oT4zX0GiVfqgZqmRvw9i oPq7zUMyScilsJjlqLHaJuJtR73KAFB0baf41s40XDENjYp2rYvdPT4njHqPKlE5B8ffH36QEjS4w yqHK9CgXVzLvRXQtOFGBaWHCH; 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 1htu6G-003nqS-Jb; Sat, 03 Aug 2019 08:29:32 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 12/19] Change tui_set_exec_info_content to be a method Date: Sat, 3 Aug 2019 07:29:18 -0600 Message-Id: <20190803132925.25074-13-tom@tromey.com> In-Reply-To: <20190803132925.25074-1-tom@tromey.com> References: <20190803132925.25074-1-tom@tromey.com> This changes tui_set_exec_info_content to bea method on tui_source_window_base. gdb/ChangeLog 2019-08-03 Tom Tromey * tui/tui-winsource.h (struct tui_source_window_base) : Declare. (tui_set_exec_info_content): Don't declare. * tui/tui-winsource.c (tui_source_window_base::set_exec_info_content): Rename from tui_set_exec_info_content. (tui_update_exec_info): Update. --- gdb/ChangeLog | 10 ++++++++++ gdb/tui/tui-winsource.c | 16 ++++++++-------- gdb/tui/tui-winsource.h | 3 ++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index bccc345fed9..c47da04e2a3 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -604,19 +604,19 @@ tui_exec_info_window::maybe_allocate_content (int n_elements) based upon the input window which is either the source or disassembly window. */ void -tui_set_exec_info_content (struct tui_source_window_base *win_info) +tui_source_window_base::set_exec_info_content () { - tui_exec_info_content *content - = win_info->execution_info->maybe_allocate_content (win_info->height); + tui_exec_info_content *exec_content + = execution_info->maybe_allocate_content (height); - tui_update_breakpoint_info (win_info, nullptr, true); - for (int i = 0; i < win_info->content.size (); i++) + tui_update_breakpoint_info (this, nullptr, true); + for (int i = 0; i < content.size (); i++) { - tui_exec_info_content &element = content[i]; + tui_exec_info_content &element = exec_content[i]; struct tui_source_element *src_element; tui_bp_flags mode; - src_element = &win_info->content[i]; + src_element = &content[i]; memset (element, ' ', sizeof (tui_exec_info_content)); element[TUI_EXECINFO_SIZE - 1] = 0; @@ -675,7 +675,7 @@ tui_clear_exec_info_content (struct tui_source_window_base *win_info) void tui_update_exec_info (struct tui_source_window_base *win_info) { - tui_set_exec_info_content (win_info); + win_info->set_exec_info_content (); tui_show_exec_info_content (win_info); } diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index 8c76322d069..645cd6717d6 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -91,6 +91,8 @@ public: void show_source_content (); + void set_exec_info_content (); + /* Does the locator belong to this window? */ bool m_has_locator = false; /* Execution information window. */ @@ -141,7 +143,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_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 *);