From patchwork Sun Jun 23 22:42:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33310 Received: (qmail 56409 invoked by alias); 23 Jun 2019 23:25: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 56396 invoked by uid 89); 23 Jun 2019 23:25:50 -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, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=UD:line, 13277 X-HELO: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.144.80) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Jun 2019 23:25:48 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 3F5A12611B for ; Sun, 23 Jun 2019 18:25:47 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fBrnh9WxciQerfBrnhfNBQ; Sun, 23 Jun 2019 18:25:47 -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=wu4kfy7LVZ4IMEQw7rKzttKmIq2pfeYtcilbfOYlzIM=; b=LA87SXsva509gETgfg+GaqRscj vTCYj1HPMVUS//SJt55653OtlHCu+QalPZbOoEOPSIzcOwJaXBM6x6Ti8+Cxqg6wzCd9gwa6Fox/l JExYzNlCqi70qtpMOdUI0KoKL; Received: from 75-166-12-78.hlrn.qwest.net ([75.166.12.78]:54396 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hfBD9-000vDQ-Dw; Sun, 23 Jun 2019 17:43:47 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 34/66] Change tui_update_source_window for better type safety Date: Sun, 23 Jun 2019 16:42:57 -0600 Message-Id: <20190623224329.16060-35-tom@tromey.com> In-Reply-To: <20190623224329.16060-1-tom@tromey.com> References: <20190623224329.16060-1-tom@tromey.com> tui_update_source_window can only be called for source and disassembly windows, so change the argument type to enforce this at compile time. 2019-06-23 Tom Tromey * tui/tui-winsource.h (tui_update_source_window) (tui_update_source_window_as_is): Change parameter type. * tui/tui-winsource.c (tui_update_source_window): Change win_info to be a tui_source_window_base. (tui_update_source_window_as_is): Likewise. * tui/tui-win.c (make_visible_with_new_height): Update. --- gdb/ChangeLog | 9 +++++++++ gdb/tui/tui-win.c | 4 ++-- gdb/tui/tui-winsource.c | 7 +++---- gdb/tui/tui-winsource.h | 4 ++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index a40e6c5206b..c8fd267f362 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -1327,7 +1327,7 @@ make_visible_with_new_height (struct tui_win_info *win_info) line_or_addr = base->start_line_or_addr; tui_free_win_content (win_info); - tui_update_source_window (win_info, gdbarch, + tui_update_source_window (base, gdbarch, cursal.symtab, line_or_addr, TRUE); } else if (deprecated_safe_get_selected_frame () != NULL) @@ -1349,7 +1349,7 @@ make_visible_with_new_height (struct tui_win_info *win_info) line.loa = LOA_ADDRESS; find_line_pc (s, cursal.line, &line.u.addr); } - tui_update_source_window (win_info, gdbarch, s, line, TRUE); + tui_update_source_window (base, gdbarch, s, line, TRUE); } if (win_info->has_locator ()) { diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 254c7e00dcb..1ec9cecdc9c 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -69,14 +69,13 @@ tui_display_main () /* Function to display source in the source window. This function initializes the horizontal scroll to 0. */ void -tui_update_source_window (struct tui_win_info *win_info, +tui_update_source_window (struct tui_source_window_base *win_info, struct gdbarch *gdbarch, struct symtab *s, struct tui_line_or_address line_or_addr, int noerror) { - tui_source_window_base *base = (tui_source_window_base *) win_info; - base->horizontal_offset = 0; + win_info->horizontal_offset = 0; tui_update_source_window_as_is (win_info, gdbarch, s, line_or_addr, noerror); return; @@ -86,7 +85,7 @@ tui_update_source_window (struct tui_win_info *win_info, /* Function to display source in the source/asm window. This function shows the source as specified by the horizontal offset. */ void -tui_update_source_window_as_is (struct tui_win_info *win_info, +tui_update_source_window_as_is (struct tui_source_window_base *win_info, struct gdbarch *gdbarch, struct symtab *s, struct tui_line_or_address line_or_addr, diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index ada3964ad1a..6f2dc3533f7 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -39,11 +39,11 @@ extern int tui_update_breakpoint_info (struct tui_win_info *win, /* Function to display the "main" routine. */ extern void tui_display_main (void); -extern void tui_update_source_window (struct tui_win_info *, +extern void tui_update_source_window (struct tui_source_window_base *, struct gdbarch *, struct symtab *, struct tui_line_or_address, int); -extern void tui_update_source_window_as_is (struct tui_win_info *, +extern void tui_update_source_window_as_is (struct tui_source_window_base *, struct gdbarch *, struct symtab *, struct tui_line_or_address, int);