From patchwork Wed Aug 14 16:21:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 34094 Received: (qmail 71540 invoked by alias); 14 Aug 2019 16:21:40 -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 71460 invoked by uid 89); 14 Aug 2019 16:21:40 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway36.websitewelcome.com Received: from gateway36.websitewelcome.com (HELO gateway36.websitewelcome.com) (192.185.194.2) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 14 Aug 2019 16:21:38 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway36.websitewelcome.com (Postfix) with ESMTP id A4A07400C73DF for ; Wed, 14 Aug 2019 10:46:39 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id xw1phlm9JiQerxw1ph7rMT; Wed, 14 Aug 2019 11:21:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oBEenwFT1a7ZPTpDaP1w3qonPZnuBArLRTd4+Zn+2vQ=; b=BeLfHlI3iWlD9aWmcp2cQncWXo 6i64Qs8GZEKY8WL977twLF1aeo2Fo6o1fXS6zxVIB9btZAjvid9qmHCFS77bLFgmgXkQHTr1r4Wb9 JSFa4oqGdxZd5GX7+38uDBk4q; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:38600 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hxw1o-002Cwq-T2; Wed, 14 Aug 2019 11:21:37 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 06/15] Change tui_addr_is_displayed into a method Date: Wed, 14 Aug 2019 10:21:23 -0600 Message-Id: <20190814162132.31424-7-tom@tromey.com> In-Reply-To: <20190814162132.31424-1-tom@tromey.com> References: <20190814162132.31424-1-tom@tromey.com> This changes tui_addr_is_displayed to be a method on tui_disasm_window, now that it is obvious that it can only be called for this type. gdb/ChangeLog 2019-08-14 Tom Tromey * tui/tui-winsource.h (tui_addr_is_displayed): Don't declare. * tui/tui-winsource.c (tui_addr_is_displayed): Move to tui-disasm.c. * tui/tui-disasm.h (struct tui_disasm_window) : Declare. * tui/tui-disasm.c (tui_disasm_window::addr_is_displayed): New method. (tui_disasm_window::maybe_update): Update. --- gdb/ChangeLog | 11 +++++++++++ gdb/tui/tui-disasm.c | 20 +++++++++++++++++++- gdb/tui/tui-disasm.h | 4 ++++ gdb/tui/tui-winsource.c | 28 ---------------------------- gdb/tui/tui-winsource.h | 3 --- 5 files changed, 34 insertions(+), 32 deletions(-) diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index fcb33bccfd7..e55f35da214 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -381,6 +381,24 @@ tui_disasm_window::location_matches_p (struct bp_location *loc, int line_no) && content[line_no].line_or_addr.u.addr == loc->address); } +bool +tui_disasm_window::addr_is_displayed (CORE_ADDR addr) const +{ + bool is_displayed = false; + int threshold = SCROLL_THRESHOLD; + + int i = 0; + while (i < content.size () - threshold && !is_displayed) + { + is_displayed + = (content[i].line_or_addr.loa == LOA_ADDRESS + && content[i].line_or_addr.u.addr == addr); + i++; + } + + return is_displayed; +} + void tui_disasm_window::maybe_update (struct frame_info *fi, symtab_and_line sal, int line_no, CORE_ADDR addr) @@ -402,7 +420,7 @@ tui_disasm_window::maybe_update (struct frame_info *fi, symtab_and_line sal, a.loa = LOA_ADDRESS; a.u.addr = low; - if (!tui_addr_is_displayed (addr, this, TRUE)) + if (!addr_is_displayed (addr)) tui_update_source_window (this, get_frame_arch (fi), sal.symtab, a, TRUE); else diff --git a/gdb/tui/tui-disasm.h b/gdb/tui/tui-disasm.h index 20bc4290ffc..71b911182f8 100644 --- a/gdb/tui/tui-disasm.h +++ b/gdb/tui/tui-disasm.h @@ -51,6 +51,10 @@ struct tui_disasm_window : public tui_source_window_base protected: void do_scroll_vertical (int num_to_scroll) override; + +private: + bool addr_is_displayed (CORE_ADDR addr) const; + }; extern enum tui_status tui_set_disassem_content (tui_source_window_base *, diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 1b2b4393fd9..e8e7061d0f2 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -668,31 +668,3 @@ tui_line_is_displayed (int line, return is_displayed; } - - -/* Answer whether a particular line number or address is displayed - in the current source window. */ -int -tui_addr_is_displayed (CORE_ADDR addr, - struct tui_source_window_base *win_info, - int check_threshold) -{ - int is_displayed = FALSE; - int i, threshold; - - if (check_threshold) - threshold = SCROLL_THRESHOLD; - else - threshold = 0; - i = 0; - while (i < win_info->content.size () - threshold - && !is_displayed) - { - is_displayed - = win_info->content[i].line_or_addr.loa == LOA_ADDRESS - && win_info->content[i].line_or_addr.u.addr == addr; - i++; - } - - return is_displayed; -} diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index ed6cbec7626..fb9c05cadc8 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -175,9 +175,6 @@ extern void tui_alloc_source_buffer (struct tui_source_window_base *); extern int tui_line_is_displayed (int, struct tui_source_window_base *, int); -extern int tui_addr_is_displayed (CORE_ADDR, - struct tui_source_window_base *, - int); /* Constant definitions. */