From patchwork Fri Dec 20 16:20:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36988 Received: (qmail 62385 invoked by alias); 20 Dec 2019 16:20:32 -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 61764 invoked by uid 89); 20 Dec 2019 16:20:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=Answer, scroll X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 20 Dec 2019 16:20:25 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 5A72920562; Fri, 20 Dec 2019 11:20:22 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [IPv6:2620:52:3:1:5054:ff:fe06:16ca]) by mx1.osci.io (Postfix) with ESMTP id A979120A42; Fri, 20 Dec 2019 11:20:10 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 947D3281DA; Fri, 20 Dec 2019 11:20:10 -0500 (EST) X-Gerrit-PatchSet: 3 Date: Fri, 20 Dec 2019 11:20:10 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Tom Tromey , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: merged Subject: [pushed] Remove tui_source_window::show_symtab_source X-Gerrit-Change-Id: I41781df2126e8bafad46d058532d52602a288e06 X-Gerrit-Change-Number: 637 X-Gerrit-ChangeURL: X-Gerrit-Commit: 469b073133fa35b54ab4f1bc3dee42ccede84689 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191220162010.947D3281DA@gnutoolchain-gerrit.osci.io> Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/637 ...................................................................... Remove tui_source_window::show_symtab_source tui_source_window::show_symtab_source is identical to update_source_window, so remove the former. gdb/ChangeLog 2019-12-20 Tom Tromey * tui/tui-winsource.c (tui_update_source_windows_with_addr) (tui_update_source_windows_with_line): Call update_source_window. * tui/tui-source.h (struct tui_source_window) : Don't declare. * tui/tui-source.c (tui_source_window::show_symtab_source): Remove. Change-Id: I41781df2126e8bafad46d058532d52602a288e06 --- M gdb/ChangeLog M gdb/tui/tui-source.c M gdb/tui/tui-source.h M gdb/tui/tui-winsource.c 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 15e8894..5125089 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2019-12-20 Tom Tromey + * tui/tui-winsource.c (tui_update_source_windows_with_addr) + (tui_update_source_windows_with_line): Call update_source_window. + * tui/tui-source.h (struct tui_source_window) + : Don't declare. + * tui/tui-source.c (tui_source_window::show_symtab_source): + Remove. + +2019-12-20 Tom Tromey + * tui/tui-winsource.c (tui_update_source_windows_with_addr): Call update_source_window directly. * tui/tui-disasm.h (tui_show_disassem): Don't declare. diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index a4d808f..062f26f 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -125,18 +125,6 @@ } -/* Function to display source in the source window. This function - initializes the horizontal scroll to 0. */ -void -tui_source_window::show_symtab_source (struct gdbarch *gdbarch, - struct symtab *s, - struct tui_line_or_address line) -{ - horizontal_offset = 0; - update_source_window_as_is (gdbarch, s, line); -} - - /* Answer whether the source is currently displayed in the source window. */ bool diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h index 15d1429..a573ce4 100644 --- a/gdb/tui/tui-source.h +++ b/gdb/tui/tui-source.h @@ -56,9 +56,6 @@ do_erase_source_content (_("[ No Source Available ]")); } - void show_symtab_source (struct gdbarch *, struct symtab *, - struct tui_line_or_address); - protected: void do_scroll_vertical (int num_to_scroll) override; diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index b149936..9274678 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -227,7 +227,7 @@ { l.loa = LOA_LINE; l.u.line_no = sal.line; - TUI_SRC_WIN->show_symtab_source (gdbarch, sal.symtab, l); + TUI_SRC_WIN->update_source_window (gdbarch, sal.symtab, l); } } else @@ -261,7 +261,7 @@ default: l.loa = LOA_LINE; l.u.line_no = line; - TUI_SRC_WIN->show_symtab_source (gdbarch, s, l); + TUI_SRC_WIN->update_source_window (gdbarch, s, l); if (tui_current_layout () == SRC_DISASSEM_COMMAND) { find_line_pc (s, line, &pc);