From patchwork Fri Dec 20 16:20:09 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: 37022 Received: (qmail 5992 invoked by alias); 20 Dec 2019 16:38:53 -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 5885 invoked by uid 89); 20 Dec 2019 16:38:52 -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; Fri, 20 Dec 2019 16:38:51 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 14A1E20A7E; Fri, 20 Dec 2019 11:20:17 -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 4821420307; Fri, 20 Dec 2019 11:20:09 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 29240281DA; Fri, 20 Dec 2019 11:20:09 -0500 (EST) X-Gerrit-PatchSet: 3 Date: Fri, 20 Dec 2019 11:20:09 -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_show_disassem_and_update_source X-Gerrit-Change-Id: I7554eca8e259f3539ea7710f2ff369b4a630dd9d X-Gerrit-Change-Number: 632 X-Gerrit-ChangeURL: X-Gerrit-Commit: 8acfefcc8fc7a346d0ecf3d37ca47c5c43761223 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: <20191220162009.29240281DA@gnutoolchain-gerrit.osci.io> Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/632 ...................................................................... Remove tui_show_disassem_and_update_source tui_show_disassem_and_update_source only has a single caller. This patch simplifies that caller, by having it call tui_show_disassem, and then removes tui_show_disassem_and_update_source. gdb/ChangeLog 2019-12-20 Tom Tromey * tui/tui-winsource.c (tui_update_source_windows_with_addr): Call tui_show_disassem. * tui/tui-disasm.h (tui_show_disassem_and_update_source): Don't declare. * tui/tui-disasm.c (tui_show_disassem_and_update_source): Remove. Change-Id: I7554eca8e259f3539ea7710f2ff369b4a630dd9d --- M gdb/ChangeLog M gdb/tui/tui-disasm.c M gdb/tui/tui-disasm.h M gdb/tui/tui-winsource.c 4 files changed, 12 insertions(+), 37 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3815b59..7c518ca 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2019-12-20 Tom Tromey + * tui/tui-winsource.c (tui_update_source_windows_with_addr): Call + tui_show_disassem. + * tui/tui-disasm.h (tui_show_disassem_and_update_source): Don't + declare. + * tui/tui-disasm.c (tui_show_disassem_and_update_source): Remove. + +2019-12-20 Tom Tromey + * tui/tui.h (tui_show_source): Remove parameters. * tui/tui.c (tui_show_source): Remove parameters. * tui/tui-out.c (tui_ui_out::do_field_string): Update. diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 18e281e..94780a5 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -276,32 +276,6 @@ tui_set_win_focus_to (TUI_DISASM_WIN); } - -/* Function to display the disassembly window. */ -void -tui_show_disassem_and_update_source (struct gdbarch *gdbarch, - CORE_ADDR start_addr) -{ - struct symtab_and_line sal; - - tui_show_disassem (gdbarch, start_addr); - if (tui_current_layout () == SRC_DISASSEM_COMMAND) - { - struct tui_line_or_address val; - - /* Update what is in the source window if it is displayed too, - note that it follows what is in the disassembly window and - visa-versa. */ - sal = find_pc_line (start_addr, 0); - val.loa = LOA_LINE; - val.u.line_no = sal.line; - TUI_SRC_WIN->update_source_window (gdbarch, sal.symtab, val); - if (sal.symtab) - set_current_source_symtab_and_line (sal); - tui_update_locator_fullname (sal.symtab); - } -} - void tui_get_begin_asm_address (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p) { diff --git a/gdb/tui/tui-disasm.h b/gdb/tui/tui-disasm.h index bfddfa0..a4b04e4 100644 --- a/gdb/tui/tui-disasm.h +++ b/gdb/tui/tui-disasm.h @@ -69,7 +69,6 @@ }; extern void tui_show_disassem (struct gdbarch *, CORE_ADDR); -extern void tui_show_disassem_and_update_source (struct gdbarch *, CORE_ADDR); extern void tui_get_begin_asm_address (struct gdbarch **, CORE_ADDR *); #endif /* TUI_TUI_DISASM_H */ diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 938a0af..06c00fa 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -221,21 +221,15 @@ struct symtab_and_line sal; struct tui_line_or_address l; - switch (tui_current_layout ()) + if (TUI_DISASM_WIN != nullptr) + tui_show_disassem (gdbarch, addr); + + if (TUI_SRC_WIN != nullptr) { - case DISASSEM_COMMAND: - case DISASSEM_DATA_COMMAND: - tui_show_disassem (gdbarch, addr); - break; - case SRC_DISASSEM_COMMAND: - tui_show_disassem_and_update_source (gdbarch, addr); - break; - default: sal = find_pc_line (addr, 0); l.loa = LOA_LINE; l.u.line_no = sal.line; TUI_SRC_WIN->show_symtab_source (gdbarch, sal.symtab, l); - break; } } else