From patchwork Sat Aug 3 13:29:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33930 Received: (qmail 94848 invoked by alias); 3 Aug 2019 13:29:33 -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 94763 invoked by uid 89); 3 Aug 2019 13:29:32 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SEMBLACK, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=Layout X-HELO: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.144.95) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 03 Aug 2019 13:29:31 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway31.websitewelcome.com (Postfix) with ESMTP id ED8E2D5145 for ; Sat, 3 Aug 2019 08:29:28 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id tu6Ch5F3n4FKptu6ChE9km; Sat, 03 Aug 2019 08:29:28 -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=gerlpWVUGzhY1IoV8ZH4NeOuPB77DKMDUgVXIHV9bS4=; b=fRRUHjJlfaH/sTZyFYO8B1i982 ClFBMEUudfnN6Vb9a7434pngE+refJiTQDsVERPH6hkPtB2g/rctIWVoOjAlp/8/Y8PnjuQhsuFPA p9HFjdtMurPZuwPrRgHc2NjF9; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:36980 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1htu6C-003nqS-Ns; Sat, 03 Aug 2019 08:29:28 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 02/19] Remove struct tui_layout_def Date: Sat, 3 Aug 2019 07:29:08 -0600 Message-Id: <20190803132925.25074-3-tom@tromey.com> In-Reply-To: <20190803132925.25074-1-tom@tromey.com> References: <20190803132925.25074-1-tom@tromey.com> "layout_def" isn't actually used in the TUI, so remove it. gdb/ChangeLog 2019-08-03 Tom Tromey * tui/tui-layout.c (tui_set_layout): Update. * tui/tui-data.h (struct tui_layout_def): Remove. (tui_layout_def): Don't declare. * tui/tui-data.c (layout_def): Remove. (tui_layout_def): Remove. --- gdb/ChangeLog | 8 ++++++++ gdb/tui/tui-data.c | 11 ----------- gdb/tui/tui-data.h | 7 ------- gdb/tui/tui-layout.c | 5 ----- 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 2748230700c..af5e509ff0b 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -40,9 +40,6 @@ static int term_height, term_width; static struct tui_locator_window _locator; static std::vector source_windows; static struct tui_win_info *win_with_focus = NULL; -static struct tui_layout_def layout_def = { - SRC_WIN, /* DISPLAY_MODE */ -}; static int win_resized = FALSE; @@ -77,14 +74,6 @@ tui_set_win_resized_to (int resized) } -/* Answer a pointer to the current layout definition. */ -struct tui_layout_def * -tui_layout_def (void) -{ - return &layout_def; -} - - /* Answer the window with the logical focus. */ struct tui_win_info * tui_win_with_focus (void) diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 5a7c487def4..745181043aa 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -151,12 +151,6 @@ struct tui_line_or_address } u; }; -/* Current Layout definition. */ -struct tui_layout_def -{ - enum tui_win_type display_mode; -}; - /* Flags to tell what kind of breakpoint is at current line. */ enum tui_bp_flag { @@ -400,7 +394,6 @@ extern void tui_clear_source_windows_detail (void); extern void tui_add_to_source_windows (struct tui_source_window_base *); extern struct tui_win_info *tui_win_with_focus (void); extern void tui_set_win_with_focus (struct tui_win_info *); -extern struct tui_layout_def *tui_layout_def (void); extern int tui_win_resized (void); extern void tui_set_win_resized_to (int); diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index a5709c595f3..93687f3bd99 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -118,7 +118,6 @@ tui_set_layout (enum tui_layout_type layout_type) struct gdbarch *gdbarch; CORE_ADDR addr; struct tui_win_info *win_with_focus = tui_win_with_focus (); - struct tui_layout_def *layout_def = tui_layout_def (); extract_display_start_addr (&gdbarch, &addr); @@ -135,7 +134,6 @@ tui_set_layout (enum tui_layout_type layout_type) { case SRC_COMMAND: tui_set_win_focus_to (TUI_SRC_WIN); - layout_def->display_mode = SRC_WIN; break; case DISASSEM_COMMAND: /* The previous layout was not showing code. @@ -148,7 +146,6 @@ tui_set_layout (enum tui_layout_type layout_type) tui_get_begin_asm_address (&gdbarch, &addr); tui_set_win_focus_to (TUI_DISASM_WIN); - layout_def->display_mode = DISASSEM_WIN; break; case SRC_DISASSEM_COMMAND: /* The previous layout was not showing code. @@ -170,7 +167,6 @@ tui_set_layout (enum tui_layout_type layout_type) tui_set_win_focus_to (TUI_SRC_WIN); else tui_set_win_focus_to (TUI_DATA_WIN); - layout_def->display_mode = SRC_WIN; break; case DISASSEM_DATA_COMMAND: /* The previous layout was not showing code. @@ -186,7 +182,6 @@ tui_set_layout (enum tui_layout_type layout_type) tui_set_win_focus_to (TUI_DISASM_WIN); else tui_set_win_focus_to (TUI_DATA_WIN); - layout_def->display_mode = DISASSEM_WIN; break; default: break;