From patchwork Wed Aug 14 16:21:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 34100 Received: (qmail 72083 invoked by alias); 14 Aug 2019 16:21:44 -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 71658 invoked by uid 89); 14 Aug 2019 16:21:41 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.2 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: gateway20.websitewelcome.com Received: from gateway20.websitewelcome.com (HELO gateway20.websitewelcome.com) (192.185.60.19) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 14 Aug 2019 16:21:39 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway20.websitewelcome.com (Postfix) with ESMTP id 248DC400D4A66 for ; Wed, 14 Aug 2019 10:17:20 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id xw1phyKHs4FKpxw1ph57y7; 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=92lCKUY392j6XGq4yZ3zdyZ1tLuxjepL+xOwjG0g/KU=; b=FiHdvbaZvtEfRAUuBCTv/snWc8 UG5lM2DGkqtXRmdIWgIExNVDCQM/0gF8QmwIlXwAs2P7byJG25CDjYF2Xc4jNjBphSDXgulThsJy5 wj4UhkvbGJRhLOld0IXfHvq5V; 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 1hxw1p-002Cwq-9K; Wed, 14 Aug 2019 11:21:37 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 07/15] Change tui_line_is_displayed to be a method Date: Wed, 14 Aug 2019 10:21:24 -0600 Message-Id: <20190814162132.31424-8-tom@tromey.com> In-Reply-To: <20190814162132.31424-1-tom@tromey.com> References: <20190814162132.31424-1-tom@tromey.com> This changes tui_line_is_displayed to be a method on tui_source_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_line_is_displayed): Don't declare. * tui/tui-winsource.c (tui_line_is_displayed): Move to tui-source.c. * tui/tui-source.h (struct tui_source_window) : Declare. * tui/tui-source.c (tui_source_window::line_is_displayed): New method. (tui_source_window::maybe_update): Update. --- gdb/ChangeLog | 11 +++++++++++ gdb/tui/tui-source.c | 21 ++++++++++++++++++++- gdb/tui/tui-source.h | 4 ++++ gdb/tui/tui-winsource.c | 28 ---------------------------- gdb/tui/tui-winsource.h | 3 --- 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index 34b8f54557d..7c173f8a6f9 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -294,6 +294,25 @@ tui_source_window::location_matches_p (struct bp_location *loc, int line_no) symtab_to_fullname (loc->symtab)) == 0); } +/* See tui-source.h. */ + +bool +tui_source_window::line_is_displayed (int line) 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_LINE + && content[i].line_or_addr.u.line_no == line); + i++; + } + + return is_displayed; +} + void tui_source_window::maybe_update (struct frame_info *fi, symtab_and_line sal, int line_no, CORE_ADDR addr) @@ -310,7 +329,7 @@ tui_source_window::maybe_update (struct frame_info *fi, symtab_and_line sal, l.loa = LOA_LINE; l.u.line_no = start_line; if (!(source_already_displayed - && tui_line_is_displayed (line_no, this, TRUE))) + && line_is_displayed (line_no))) tui_update_source_window (this, get_frame_arch (fi), sal.symtab, l, TRUE); else diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h index dc4470e9e5a..42338790947 100644 --- a/gdb/tui/tui-source.h +++ b/gdb/tui/tui-source.h @@ -59,6 +59,10 @@ private: void style_changed (); + /* Answer whether a particular line number or address is displayed + in the current source window. */ + bool line_is_displayed (int line) const; + /* A token used to register and unregister an observer. */ gdb::observers::token m_observable; }; diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index e8e7061d0f2..a85269657cf 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -640,31 +640,3 @@ tui_alloc_source_buffer (struct tui_source_window_base *win_info) win_info->content[i].line = (char *) xmalloc (line_width); } } - - -/* Answer whether a particular line number or address is displayed - in the current source window. */ -int -tui_line_is_displayed (int line, - 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_LINE - && win_info->content[i].line_or_addr.u.line_no == line; - i++; - } - - return is_displayed; -} diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index fb9c05cadc8..f88f6b7de45 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -172,9 +172,6 @@ extern void tui_clear_source_content (struct tui_source_window_base *); extern void tui_erase_source_content (struct tui_source_window_base *); extern void tui_alloc_source_buffer (struct tui_source_window_base *); -extern int tui_line_is_displayed (int, - struct tui_source_window_base *, - int); /* Constant definitions. */