From patchwork Thu Dec 12 02:35:02 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: 36768 Received: (qmail 17155 invoked by alias); 12 Dec 2019 02:41:55 -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 17131 invoked by uid 89); 12 Dec 2019 02:41:54 -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= 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; Thu, 12 Dec 2019 02:41:52 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 1BBC820468; Wed, 11 Dec 2019 21:35:12 -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 A8322206E6 for ; Wed, 11 Dec 2019 21:35:05 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 92AF725BB4 for ; Wed, 11 Dec 2019 21:35:05 -0500 (EST) X-Gerrit-PatchSet: 2 Date: Wed, 11 Dec 2019 21:35:02 -0500 From: "Tom Tromey (Code Review)" To: gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [review v2] Simplify tui_update_source_windows_with_line X-Gerrit-Change-Id: I8803a0a6fd2938ceee859aea53a57ce582f3e80d X-Gerrit-Change-Number: 642 X-Gerrit-ChangeURL: X-Gerrit-Commit: 6b93aac96b32f7dad3776851a161886865e6ee8d In-Reply-To: References: Reply-To: tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191212023505.92AF725BB4@gnutoolchain-gerrit.osci.io> Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/642 ...................................................................... Simplify tui_update_source_windows_with_line This changes tui_update_source_windows_with_line to take a symtab_and_line, rather than separate parameters, and then updates the caller. gdb/ChangeLog 2019-12-11 Tom Tromey * tui/tui.c (tui_show_source): Update. * tui/tui-winsource.h (tui_update_source_windows_with_line): Update. * tui/tui-winsource.c (tui_update_source_windows_with_line): Take a symtab_symbol_info, not a separate symtab and line. Simplify. Change-Id: I8803a0a6fd2938ceee859aea53a57ce582f3e80d --- M gdb/ChangeLog M gdb/tui/tui-winsource.c M gdb/tui/tui-winsource.h M gdb/tui/tui.c 4 files changed, 17 insertions(+), 31 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 56a53ef..1954ad0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2019-12-11 Tom Tromey + * tui/tui.c (tui_show_source): Update. + * tui/tui-winsource.h (tui_update_source_windows_with_line): Update. + * tui/tui-winsource.c (tui_update_source_windows_with_line): Take + a symtab_symbol_info, not a separate symtab and line. Simplify. + +2019-12-11 Tom Tromey + * tui/tui-winsource.c (tui_update_source_windows_with_addr): Simplify. diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 8f98904..3305c8c 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -214,39 +214,19 @@ win_info->update_source_window (gdbarch, sal); } -/* Function to ensure that the source and/or disassemly windows - reflect the input address. */ +/* Function to ensure that the source and/or disassembly windows + reflect the symtab and line. */ void -tui_update_source_windows_with_line (struct symtab *s, int line) +tui_update_source_windows_with_line (struct symtab_and_line sal) { - struct gdbarch *gdbarch; - CORE_ADDR pc; - struct symtab_and_line sal; - - if (!s) + if (!sal.symtab) return; - sal.pspace = current_program_space; - sal.symtab = s; - sal.line = line; + find_line_pc (sal.symtab, sal.line, &sal.pc); + struct gdbarch *gdbarch = get_objfile_arch (SYMTAB_OBJFILE (sal.symtab)); - gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s)); - - switch (tui_current_layout ()) - { - case DISASSEM_COMMAND: - case DISASSEM_DATA_COMMAND: - find_line_pc (s, line, &pc); - tui_update_source_windows_with_addr (gdbarch, pc); - break; - default: - find_line_pc (s, line, &pc); - sal.pc = pc; - TUI_SRC_WIN->update_source_window (gdbarch, sal); - if (tui_current_layout () == SRC_DISASSEM_COMMAND) - TUI_DISASM_WIN->update_source_window (gdbarch, sal); - break; - } + for (struct tui_source_window_base *win_info : tui_source_windows ()) + win_info->update_source_window (gdbarch, sal); } void diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index dde56a7..435203d 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -227,8 +227,7 @@ /* Function to display the "main" routine. */ extern void tui_display_main (void); extern void tui_update_source_windows_with_addr (struct gdbarch *, CORE_ADDR); -extern void tui_update_source_windows_with_line (struct symtab *, - int); +extern void tui_update_source_windows_with_line (struct symtab_and_line sal); /* Extract some source text from PTR. LINE_NO is the line number. If it is positive, it is printed at the start of the line. FIRST_COL diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index deb6bb2..a0d2e4c 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -634,7 +634,7 @@ /* Make sure that the source window is displayed. */ tui_add_win_to_layout (SRC_WIN); - tui_update_source_windows_with_line (cursal.symtab, cursal.line); + tui_update_source_windows_with_line (cursal); tui_update_locator_fullname (cursal.symtab); }