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: 36756 Received: (qmail 334 invoked by alias); 12 Dec 2019 02:35:13 -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 131017 invoked by uid 89); 12 Dec 2019 02:35:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, 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:35:11 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 7DEA42048E; Wed, 11 Dec 2019 21:35:09 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id EDDB8204A6 for ; Wed, 11 Dec 2019 21:35:04 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id D768225BB4 for ; Wed, 11 Dec 2019 21:35:04 -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] Remove tui_show_disassem X-Gerrit-Change-Id: I7ae7a3309f64a4a949c07a80c46e1664c7f12913 X-Gerrit-Change-Number: 636 X-Gerrit-ChangeURL: X-Gerrit-Commit: 2d5bbf70dee83c0b9a47244dacc0761600d0e548 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: <20191212023504.D768225BB4@gnutoolchain-gerrit.osci.io> Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/636 ...................................................................... Remove tui_show_disassem tui_show_disassem is just a wrapper for the update_source_window method, and it only has a single caller. This removes the function and inlines the logic into that caller. gdb/ChangeLog 2019-12-11 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. * tui/tui-disasm.c (tui_show_disassem): Remove. Change-Id: I7ae7a3309f64a4a949c07a80c46e1664c7f12913 --- M gdb/ChangeLog M gdb/tui/tui-disasm.c M gdb/tui/tui-disasm.h M gdb/tui/tui-winsource.c 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 03b314b..1858b1a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2019-12-11 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. + * tui/tui-disasm.c (tui_show_disassem): Remove. + +2019-12-11 Tom Tromey + * tui/tui-winsource.c (tui_source_window_base::update_source_window_as_is): Don't switch focus. * tui/tui-disasm.c (tui_show_disassem): Don't switch focus. diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 11c8b30..c49369a 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -255,20 +255,6 @@ } -/* Function to display the disassembly window with disassembled code. */ -void -tui_show_disassem (struct gdbarch *gdbarch, CORE_ADDR start_addr) -{ - struct symtab *s = find_pc_line_symtab (start_addr); - struct tui_line_or_address val; - - gdb_assert (TUI_DISASM_WIN != nullptr && TUI_DISASM_WIN->is_visible ()); - - val.loa = LOA_ADDRESS; - val.u.addr = start_addr; - TUI_DISASM_WIN->update_source_window (gdbarch, s, val); -} - 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 28f87c6..f5cc373 100644 --- a/gdb/tui/tui-disasm.h +++ b/gdb/tui/tui-disasm.h @@ -66,7 +66,6 @@ bool addr_is_displayed (CORE_ADDR addr) const; }; -extern void tui_show_disassem (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 72fbd46..b149936 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -213,15 +213,18 @@ { if (addr != 0) { - struct symtab_and_line sal; + struct symtab_and_line sal = find_pc_line (addr, 0); struct tui_line_or_address l; if (TUI_DISASM_WIN != nullptr) - tui_show_disassem (gdbarch, addr); + { + l.loa = LOA_ADDRESS; + l.u.addr = addr; + TUI_DISASM_WIN->update_source_window (gdbarch, sal.symtab, l); + } if (TUI_SRC_WIN != nullptr) { - 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); @@ -262,7 +265,9 @@ if (tui_current_layout () == SRC_DISASSEM_COMMAND) { find_line_pc (s, line, &pc); - tui_show_disassem (gdbarch, pc); + l.loa = LOA_ADDRESS; + l.u.addr = pc; + TUI_DISASM_WIN->update_source_window (gdbarch, s, l); } break; }