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: 36761 Received: (qmail 1322 invoked by alias); 12 Dec 2019 02:35:20 -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 1110 invoked by uid 89); 12 Dec 2019 02:35:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.7 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=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; Thu, 12 Dec 2019 02:35:16 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 74BA120300; Wed, 11 Dec 2019 21:35:15 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 3206720641 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 2536A25BB4 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] Use start_line_or_addr in TUI windows X-Gerrit-Change-Id: I1fa807321cd7ad88b3cc5e41cc50f4d4e2d46271 X-Gerrit-Change-Number: 639 X-Gerrit-ChangeURL: X-Gerrit-Commit: ee182cf3b0ae7eca072e83e4e04a882be895cf0f 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.2536A25BB4@gnutoolchain-gerrit.osci.io> Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/639 ...................................................................... Use start_line_or_addr in TUI windows A few spots in the TUI source and disassembly windows referred to content[0], where start_line_or_addr is equivalent. This patch makes this substitution. gdb/ChangeLog 2019-12-11 Tom Tromey * tui/tui-winsource.c (tui_source_window_base::refill): Use start_line_or_addr. * tui/tui-source.c (tui_source_window::do_scroll_vertical): Use start_line_or_addr. * tui/tui-disasm.c (tui_disasm_window::do_scroll_vertical): Use start_line_or_addr. Change-Id: I1fa807321cd7ad88b3cc5e41cc50f4d4e2d46271 --- M gdb/ChangeLog M gdb/tui/tui-disasm.c M gdb/tui/tui-source.c M gdb/tui/tui-winsource.c 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 387df88..6e823b0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2019-12-11 Tom Tromey + * tui/tui-winsource.c (tui_source_window_base::refill): Use + start_line_or_addr. + * tui/tui-source.c (tui_source_window::do_scroll_vertical): Use + start_line_or_addr. + * tui/tui-disasm.c (tui_disasm_window::do_scroll_vertical): Use + start_line_or_addr. + +2019-12-11 Tom Tromey + * tui/tui-winsource.h (struct tui_source_window_base) : Return bool. * tui/tui-winsource.c diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 080253c..8a46bba 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -325,7 +325,7 @@ CORE_ADDR pc; struct tui_line_or_address val; - pc = content[0].line_or_addr.u.addr; + pc = start_line_or_addr.u.addr; if (num_to_scroll >= 0) num_to_scroll++; else diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index b7f3814..524f232 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -145,14 +145,14 @@ s = cursal.symtab; l.loa = LOA_LINE; - l.u.line_no = content[0].line_or_addr.u.line_no + l.u.line_no = start_line_or_addr.u.line_no + num_to_scroll; const std::vector *offsets; if (g_source_cache.get_line_charpos (s, &offsets) && l.u.line_no > offsets->size ()) /* line = s->nlines - win_info->content_size + 1; */ /* elz: fix for dts 23398. */ - l.u.line_no = content[0].line_or_addr.u.line_no; + l.u.line_no = start_line_or_addr.u.line_no; if (l.u.line_no <= 0) l.u.line_no = 1; diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index fad8d7b..708c2fe 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -413,7 +413,7 @@ : cursal.symtab); } - update_source_window_as_is (gdbarch, s, content[0].line_or_addr); + update_source_window_as_is (gdbarch, s, start_line_or_addr); } /* Scroll the source forward or backward horizontally. */