From patchwork Fri Aug 16 16:15:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 34148 Received: (qmail 74467 invoked by alias); 16 Aug 2019 16:15:56 -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 73974 invoked by uid 89); 16 Aug 2019 16:15:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.4 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=HX-Languages-Length:4944 X-HELO: gateway20.websitewelcome.com Received: from gateway20.websitewelcome.com (HELO gateway20.websitewelcome.com) (192.185.54.2) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 16 Aug 2019 16:15:25 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway20.websitewelcome.com (Postfix) with ESMTP id D91DD400D4CFA for ; Fri, 16 Aug 2019 10:10:51 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id yeslhXlCR4FKpyeslheC2Z; Fri, 16 Aug 2019 11:15:15 -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=oauqDucZnQO4RGmYlzzk5MAYtNwxabBYJ5koxQ4mvZg=; b=K6PJhSFZ70pTyapsfodMT+XEEC t6CEk4WoH4ej1F/0GkUy1WDqe6FsR4siNq04CqhaiRNhQNOnUMwo9+lRhxbBoExqjmd7eqjtFrdIa 3QtVuEkFJv+RpyJlAR8cL6mQ1; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:40466 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hyesl-002SJK-61; Fri, 16 Aug 2019 11:15:15 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 5/9] Change tui_update_source_window to be a method Date: Fri, 16 Aug 2019 10:15:07 -0600 Message-Id: <20190816161511.16162-6-tom@tromey.com> In-Reply-To: <20190816161511.16162-1-tom@tromey.com> References: <20190816161511.16162-1-tom@tromey.com> This changes tui_update_source_window to be a method on tui_source_window_base. gdb/ChangeLog 2019-08-16 Tom Tromey * tui/tui-winsource.h (struct tui_source_window_base) : Declare. (tui_update_source_window): Don't declare. * tui/tui-winsource.c (tui_source_window_base::update_source_window): Rename from tui_update_source_window. (tui_source_window_base::rerender): Update. * tui/tui-source.c (tui_source_window::maybe_update): Update. * tui/tui-disasm.c (tui_show_disassem) (tui_show_disassem_and_update_source) (tui_disasm_window::maybe_update): Update. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/tui/tui-disasm.c | 7 +++---- gdb/tui/tui-source.c | 3 +-- gdb/tui/tui-winsource.c | 17 ++++++++--------- gdb/tui/tui-winsource.h | 6 +++--- 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index d47639c4c77..221e48e661a 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -257,7 +257,7 @@ tui_show_disassem (struct gdbarch *gdbarch, CORE_ADDR start_addr) val.loa = LOA_ADDRESS; val.u.addr = start_addr; - tui_update_source_window (TUI_DISASM_WIN, gdbarch, s, val); + TUI_DISASM_WIN->update_source_window (gdbarch, s, val); /* If the focus was in the src win, put it in the asm win, if the source view isn't split. */ @@ -285,7 +285,7 @@ tui_show_disassem_and_update_source (struct gdbarch *gdbarch, sal = find_pc_line (start_addr, 0); val.loa = LOA_LINE; val.u.line_no = sal.line; - tui_update_source_window (TUI_SRC_WIN, gdbarch, sal.symtab, val); + TUI_SRC_WIN->update_source_window (gdbarch, sal.symtab, val); if (sal.symtab) { set_current_source_symtab_and_line (sal); @@ -418,8 +418,7 @@ tui_disasm_window::maybe_update (struct frame_info *fi, symtab_and_line sal, a.loa = LOA_ADDRESS; a.u.addr = low; if (!addr_is_displayed (addr)) - tui_update_source_window (this, get_frame_arch (fi), - sal.symtab, a); + update_source_window (get_frame_arch (fi), sal.symtab, a); else { a.u.addr = addr; diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index e62d999fe3e..f08bd88aeff 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -317,8 +317,7 @@ tui_source_window::maybe_update (struct frame_info *fi, symtab_and_line sal, l.u.line_no = start_line; if (!(source_already_displayed && line_is_displayed (line_no))) - tui_update_source_window (this, get_frame_arch (fi), - sal.symtab, l); + update_source_window (get_frame_arch (fi), sal.symtab, l); else { l.u.line_no = line_no; diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 2c747eb42a9..3d1d6c4a97e 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -70,13 +70,13 @@ tui_display_main () /* Function to display source in the source window. This function initializes the horizontal scroll to 0. */ void -tui_update_source_window (struct tui_source_window_base *win_info, - struct gdbarch *gdbarch, - struct symtab *s, - struct tui_line_or_address line_or_addr) +tui_source_window_base::update_source_window + (struct gdbarch *gdbarch, + struct symtab *s, + struct tui_line_or_address line_or_addr) { - win_info->horizontal_offset = 0; - win_info->update_source_window_as_is (gdbarch, s, line_or_addr); + horizontal_offset = 0; + update_source_window_as_is (gdbarch, s, line_or_addr); } @@ -325,8 +325,7 @@ tui_source_window_base::rerender () = get_current_source_symtab_and_line (); line_or_addr = start_line_or_addr; - tui_update_source_window (this, gdbarch, - cursal.symtab, line_or_addr); + update_source_window (gdbarch, cursal.symtab, line_or_addr); } else if (deprecated_safe_get_selected_frame () != NULL) { @@ -347,7 +346,7 @@ tui_source_window_base::rerender () line.loa = LOA_ADDRESS; find_line_pc (s, cursal.line, &line.u.addr); } - tui_update_source_window (this, gdbarch, s, line); + update_source_window (gdbarch, s, line); } else erase_source_content (); diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index ebc50e71e03..80608b5d733 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -138,6 +138,9 @@ public: void update_source_window_as_is (struct gdbarch *gdbarch, struct symtab *s, struct tui_line_or_address line_or_addr); + void update_source_window (struct gdbarch *gdbarch, + struct symtab *s, + struct tui_line_or_address line_or_addr); /* Erase the source content. */ virtual void erase_source_content () = 0; @@ -247,9 +250,6 @@ extern bool tui_update_breakpoint_info (struct tui_source_window_base *win, /* Function to display the "main" routine. */ extern void tui_display_main (void); -extern void tui_update_source_window (struct tui_source_window_base *, - struct gdbarch *, struct symtab *, - struct tui_line_or_address); extern void tui_update_source_windows_with_addr (struct gdbarch *, CORE_ADDR); extern void tui_update_source_windows_with_line (struct symtab *, int);