From patchwork Sun Jun 23 22:42:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33325 Received: (qmail 59711 invoked by alias); 23 Jun 2019 23:26:12 -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 59437 invoked by uid 89); 23 Jun 2019 23:26:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.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: gateway22.websitewelcome.com Received: from gateway22.websitewelcome.com (HELO gateway22.websitewelcome.com) (192.185.46.156) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Jun 2019 23:26:08 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway22.websitewelcome.com (Postfix) with ESMTP id 4AE995258 for ; Sun, 23 Jun 2019 18:26:07 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fBs7hwzVAdnCefBs7hX8RT; Sun, 23 Jun 2019 18:26:07 -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=EFuYOeqQ2HIxhYk5/2u6HPF26pd2AE2Ekah5BM8A9z4=; b=aAY/KvxSolTPugtyo8R6uPh2aE SvkhqKOjDFwOEJwnDB5W5+WywZJlInRl55l1GO/OxPVc3dH3a32Icsn8hYwAHaF2f3E5N8r8zBLOM VC4F195mSJSfOmUHTTEUqaDWe; 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 1hfBD8-000vDQ-5f; Sun, 23 Jun 2019 17:43:46 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 30/66] Change tui_which_element::data_window to be a pointer Date: Sun, 23 Jun 2019 16:42:53 -0600 Message-Id: <20190623224329.16060-31-tom@tromey.com> In-Reply-To: <20190623224329.16060-1-tom@tromey.com> References: <20190623224329.16060-1-tom@tromey.com> A coming patch will add a constructor to tui_gen_win_info. However, because the tui_which_element union contains an object of this type, first something must be done here in order to avoid having a union with a member that has a constructor. This patch changes this element to be a pointer instead. gdb/ChangeLog 2019-06-23 Tom Tromey * tui/tui-wingeneral.c (tui_refresh_win): Update. * tui/tui-windata.c (tui_first_data_item_displayed) (tui_delete_data_content_windows): Update. * tui/tui-win.c (tui_data_window::set_new_height): Update. * tui/tui-regs.c (tui_show_registers, tui_show_register_group) (tui_display_registers_from, tui_check_register_values): Update. * tui/tui-data.h (union tui_which_element) : Now a pointer. * tui/tui-data.c (init_content_element): Update. Allocate the new window. (tui_free_data_content): Update. (free_content_elements) : Free the window. --- gdb/ChangeLog | 15 +++++++++++++++ gdb/tui/tui-data.c | 12 +++++++----- gdb/tui/tui-data.h | 2 +- gdb/tui/tui-regs.c | 10 +++++----- gdb/tui/tui-win.c | 2 +- gdb/tui/tui-windata.c | 4 ++-- gdb/tui/tui-wingeneral.c | 2 +- 7 files changed, 32 insertions(+), 15 deletions(-) diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index bdfc2de73af..af571450316 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -435,11 +435,12 @@ init_content_element (struct tui_win_element *element, element->which_element.source.has_break = FALSE; break; case DATA_WIN: - tui_init_generic_part (&element->which_element.data_window); - element->which_element.data_window.type = DATA_ITEM_WIN; - element->which_element.data_window.content = + element->which_element.data_window = XNEW (struct tui_gen_win_info); + tui_init_generic_part (element->which_element.data_window); + element->which_element.data_window->type = DATA_ITEM_WIN; + element->which_element.data_window->content = tui_alloc_content (1, DATA_ITEM_WIN); - element->which_element.data_window.content_size = 1; + element->which_element.data_window->content_size = 1; break; case CMD_WIN: element->which_element.command.line = NULL; @@ -646,7 +647,7 @@ tui_free_data_content (tui_win_content content, for (i = 0; i < content_size; i++) { struct tui_gen_win_info *generic_win - = &content[i]->which_element.data_window; + = content[i]->which_element.data_window; if (generic_win != NULL) { @@ -710,6 +711,7 @@ free_content_elements (tui_win_content content, xfree (element->which_element.source.line); break; case DATA_WIN: + xfree (element->which_element.data_window); xfree (element); break; case DATA_ITEM_WIN: diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 98e7a2ca34e..f915d209782 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -212,7 +212,7 @@ typedef char tui_exec_info_content[TUI_EXECINFO_SIZE]; union tui_which_element { struct tui_source_element source; /* The source elements. */ - struct tui_gen_win_info data_window; /* Data display elements. */ + struct tui_gen_win_info *data_window; /* Data display elements. */ struct tui_data_element data; /* Elements of data_window. */ struct tui_command_element command; /* Command elements. */ struct tui_locator_element locator; /* Locator elements. */ diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index d7940af984b..7367cf7c0cb 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -165,7 +165,7 @@ tui_show_registers (struct reggroup *group) struct tui_gen_win_info *data_item_win; struct tui_win_element *win; - data_item_win = &TUI_DATA_WIN->regs_content[i] + data_item_win = TUI_DATA_WIN->regs_content[i] ->which_element.data_window; win = data_item_win->content[0]; win->which_element.data.highlight = FALSE; @@ -261,7 +261,7 @@ tui_show_register_group (struct reggroup *group, continue; data_item_win = - &TUI_DATA_WIN->regs_content[pos]->which_element.data_window; + TUI_DATA_WIN->regs_content[pos]->which_element.data_window; data = &data_item_win->content[0]->which_element.data; if (data) { @@ -306,7 +306,7 @@ tui_display_registers_from (int start_element_no) int len; data_item_win - = &TUI_DATA_WIN->regs_content[i]->which_element.data_window; + = TUI_DATA_WIN->regs_content[i]->which_element.data_window; data = &data_item_win->content[0]->which_element.data; len = 0; p = data->content; @@ -347,7 +347,7 @@ tui_display_registers_from (int start_element_no) struct tui_data_element *data_element_ptr; /* Create the window if necessary. */ - data_item_win = &TUI_DATA_WIN->regs_content[i] + data_item_win = TUI_DATA_WIN->regs_content[i] ->which_element.data_window; data_element_ptr = &data_item_win->content[0]->which_element.data; if (data_item_win->handle != NULL @@ -485,7 +485,7 @@ tui_check_register_values (struct frame_info *frame) struct tui_gen_win_info *data_item_win_ptr; int was_hilighted; - data_item_win_ptr = &TUI_DATA_WIN->regs_content[i]-> + data_item_win_ptr = TUI_DATA_WIN->regs_content[i]-> which_element.data_window; data = &data_item_win_ptr->content[0]->which_element.data; was_hilighted = data->highlight; diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index dc40ab7736d..e4c1522a62d 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -1273,7 +1273,7 @@ tui_data_window::set_new_height (int height) for (int i = 0; i < generic.content_size; i++) { struct tui_gen_win_info *gen_win_info - = &generic.content[i]->which_element.data_window; + = generic.content[i]->which_element.data_window; tui_delete_win (gen_win_info->handle); gen_win_info->handle = NULL; } diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c index 770baf857f6..1647527e240 100644 --- a/gdb/tui/tui-windata.c +++ b/gdb/tui/tui-windata.c @@ -54,7 +54,7 @@ tui_first_data_item_displayed (void) struct tui_gen_win_info *data_item_win; data_item_win - = &TUI_DATA_WIN->generic.content[i]->which_element.data_window; + = TUI_DATA_WIN->generic.content[i]->which_element.data_window; if (data_item_win->handle != NULL && data_item_win->is_visible) element_no = i; @@ -75,7 +75,7 @@ tui_delete_data_content_windows (void) for (i = 0; (i < TUI_DATA_WIN->generic.content_size); i++) { data_item_win_ptr - = &TUI_DATA_WIN->generic.content[i]->which_element.data_window; + = TUI_DATA_WIN->generic.content[i]->which_element.data_window; tui_delete_win (data_item_win_ptr->handle); data_item_win_ptr->handle = NULL; data_item_win_ptr->is_visible = false; diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index c1778289442..ccee399057a 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -43,7 +43,7 @@ tui_refresh_win (struct tui_gen_win_info *win_info) { struct tui_gen_win_info *data_item_win_ptr; - data_item_win_ptr = &win_info->content[i]->which_element.data_window; + data_item_win_ptr = win_info->content[i]->which_element.data_window; if (data_item_win_ptr != NULL && data_item_win_ptr->handle != NULL) wrefresh (data_item_win_ptr->handle);