From patchwork Fri Dec 20 16:20:11 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: 36998 Received: (qmail 64858 invoked by alias); 20 Dec 2019 16:20:50 -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 62884 invoked by uid 89); 20 Dec 2019 16:20:35 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.8 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; Fri, 20 Dec 2019 16:20:33 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 79283204BF; Fri, 20 Dec 2019 11:20:27 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id DE796204BF; Fri, 20 Dec 2019 11:20:11 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id CF6C1281DA; Fri, 20 Dec 2019 11:20:11 -0500 (EST) X-Gerrit-PatchSet: 3 Date: Fri, 20 Dec 2019 11:20:11 -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] Simplify tui_update_source_windows_with_addr X-Gerrit-Change-Id: Id2ba6b3145ec005dbed1b1115118bd1ef4efb842 X-Gerrit-Change-Number: 641 X-Gerrit-ChangeURL: X-Gerrit-Commit: 88180c082424fd90e8a5967f8c84533f7cc6380f 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: <20191220162011.CF6C1281DA@gnutoolchain-gerrit.osci.io> Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/641 ...................................................................... Simplify tui_update_source_windows_with_addr After the previous changes, tui_update_source_windows_with_addr simply updates each source-like window separately, passing the same data to each. So, it can be simplified by using a loop instead. gdb/ChangeLog 2019-12-20 Tom Tromey * tui/tui-winsource.c (tui_update_source_windows_with_addr): Simplify. Change-Id: Id2ba6b3145ec005dbed1b1115118bd1ef4efb842 --- M gdb/ChangeLog M gdb/tui/tui-winsource.c 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index feb406b..77620d0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-12-20 Tom Tromey + * tui/tui-winsource.c (tui_update_source_windows_with_addr): + Simplify. + +2019-12-20 Tom Tromey + * tui/tui-winsource.h (struct tui_source_window_base) : Take a sal, not a separate symtab and tui_line_or_address. diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index cad7dea..8f98904 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -206,21 +206,12 @@ void tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr) { + struct symtab_and_line sal {}; if (addr != 0) - { - struct symtab_and_line sal = find_pc_line (addr, 0); - - if (TUI_DISASM_WIN != nullptr) - TUI_DISASM_WIN->update_source_window (gdbarch, sal); + sal = find_pc_line (addr, 0); - if (TUI_SRC_WIN != nullptr) - TUI_SRC_WIN->update_source_window (gdbarch, sal); - } - else - { - for (struct tui_source_window_base *win_info : tui_source_windows ()) - win_info->erase_source_content (); - } + for (struct tui_source_window_base *win_info : tui_source_windows ()) + win_info->update_source_window (gdbarch, sal); } /* Function to ensure that the source and/or disassemly windows