diff options
| author | Tom Tromey <tom@tromey.com> | 2019-06-16 15:53:36 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-06-25 07:48:36 -0600 |
| commit | dc2c33e4562e0af441a9c8acff0400a78cb45d98 (patch) | |
| tree | db6725303251823e7fcab4872863763a054a05de /gdb/tui/tui-regs.c | |
| parent | 214a5cbea656f3ffc1e7e525627c56849347c709 (diff) | |
| download | gdb-dc2c33e4562e0af441a9c8acff0400a78cb45d98.zip gdb-dc2c33e4562e0af441a9c8acff0400a78cb45d98.tar.gz gdb-dc2c33e4562e0af441a9c8acff0400a78cb45d98.tar.bz2 | |
Change tui_which_element::data_window to be a pointer
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-25 Tom Tromey <tom@tromey.com>
* 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) <data_window>: Now a
pointer.
* tui/tui-data.c (init_content_element): Update. Allocate the new
window.
(tui_free_data_content): Update.
(free_content_elements) <case DATA_WIN>: Free the window.
Diffstat (limited to 'gdb/tui/tui-regs.c')
| -rw-r--r-- | gdb/tui/tui-regs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index d7940af..7367cf7 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; |