From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 49/66] Separate out execution-info window
Date: Sun, 23 Jun 2019 23:26:00 -0000 [thread overview]
Message-ID: <20190623224329.16060-50-tom@tromey.com> (raw)
In-Reply-To: <20190623224329.16060-1-tom@tromey.com>
This pulls the EXEC_INFO_WIN case out into its own subclass of
tui_gen_win_info. This lets us remove an element from
union tui_which_element.
gdb/ChangeLog
2019-06-23 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.c
(tui_exec_info_window::maybe_allocate_content): New method.
(tui_set_exec_info_content, tui_show_exec_info_content): Update.
* tui/tui-layout.c (init_and_make_win): Add EXEC_INFO_WIN case.
(make_source_or_disasm_window): Add cast.
* tui/tui-data.h (union tui_which_element) <simple_string>:
Remove.
(struct tui_source_info): New.
(struct tui_source_window_base) <execution_info>: Change type.
* tui/tui-data.c (init_content_element): Remove EXEC_INFO_WIN
case, and add assert.
(tui_alloc_content): Add assert.
---
gdb/ChangeLog | 15 +++++++++++++
gdb/tui/tui-data.c | 8 +++----
gdb/tui/tui-data.h | 31 +++++++++++++++++++++++++--
gdb/tui/tui-layout.c | 20 +++++++++++-------
gdb/tui/tui-winsource.c | 47 +++++++++++++++++++++--------------------
5 files changed, 84 insertions(+), 37 deletions(-)
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index 9b247b46808..d74c4f7b2a9 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -364,6 +364,8 @@ static void
init_content_element (struct tui_win_element *element,
enum tui_win_type type)
{
+ gdb_assert (type != EXEC_INFO_WIN);
+
switch (type)
{
case SRC_WIN:
@@ -397,10 +399,6 @@ init_content_element (struct tui_win_element *element,
element->which_element.locator.line_no = 0;
element->which_element.locator.addr = 0;
break;
- case EXEC_INFO_WIN:
- memset(element->which_element.simple_string, ' ',
- sizeof(element->which_element.simple_string));
- break;
default:
break;
}
@@ -427,6 +425,8 @@ tui_alloc_content (int num_elements, enum tui_win_type type)
struct tui_win_element *element_block_ptr;
int i;
+ gdb_assert (type != EXEC_INFO_WIN);
+
content = XNEWVEC (struct tui_win_element *, num_elements);
/*
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 7392a4e4133..23dd0fd9080 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -249,7 +249,6 @@ union tui_which_element
struct tui_data_element data; /* Elements of data_window. */
struct tui_command_element command; /* Command elements. */
struct tui_locator_element locator; /* Locator elements. */
- tui_exec_info_content simple_string; /* Simple char based elements. */
};
struct tui_win_element
@@ -257,6 +256,34 @@ struct tui_win_element
union tui_which_element which_element;
};
+/* Execution info window class. */
+
+struct tui_exec_info_window : public tui_gen_win_info
+{
+ tui_exec_info_window ()
+ : tui_gen_win_info (EXEC_INFO_WIN)
+ {
+ }
+
+ ~tui_exec_info_window () override
+ {
+ xfree (m_content);
+ }
+
+ /* Get or allocate contents. */
+ tui_exec_info_content *maybe_allocate_content (int n_elements);
+
+ /* Allocate contents. */
+ const tui_exec_info_content *get_content () const
+ {
+ return m_content;
+ }
+
+private:
+
+ tui_exec_info_content *m_content = nullptr;
+};
+
/* This defines information about each logical window. */
struct tui_win_info : public tui_gen_win_info
{
@@ -380,7 +407,7 @@ public:
/* Does locator belongs to this window? */
bool m_has_locator = false;
/* Execution information window. */
- struct tui_gen_win_info *execution_info = nullptr;
+ struct tui_exec_info_window *execution_info = nullptr;
/* Used for horizontal scroll. */
int horizontal_offset = 0;
struct tui_line_or_address start_line_or_addr;
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 6d343921d4c..a0745bf5384 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -816,6 +816,10 @@ init_and_make_win (tui_gen_win_info *win_info,
win_info = new tui_cmd_window ();
break;
+ case EXEC_INFO_WIN:
+ win_info = new tui_exec_info_window ();
+ break;
+
default:
gdb_assert (tui_win_is_auxillary (win_type));
win_info = new tui_gen_win_info (win_type);
@@ -834,14 +838,14 @@ static struct tui_win_info *
make_source_or_disasm_window (enum tui_win_type type,
int height, int origin_y)
{
- struct tui_gen_win_info *execution_info
- = init_and_make_win (nullptr,
- EXEC_INFO_WIN,
- height,
- 3,
- 0,
- origin_y,
- DONT_BOX_WINDOW);
+ struct tui_exec_info_window *execution_info
+ = (tui_exec_info_window *) init_and_make_win (nullptr,
+ EXEC_INFO_WIN,
+ height,
+ 3,
+ 0,
+ origin_y,
+ DONT_BOX_WINDOW);
/* Now create the source window. */
struct tui_source_window_base *result
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index e56fbcb76d6..204fee13be9 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -470,6 +470,16 @@ tui_update_breakpoint_info (struct tui_win_info *win,
return need_refresh;
}
+/* See tui-data.h. */
+
+tui_exec_info_content *
+tui_exec_info_window::maybe_allocate_content (int n_elements)
+{
+ if (m_content == nullptr)
+ m_content = XNEWVEC (tui_exec_info_content, n_elements);
+ return m_content;
+}
+
/* Function to initialize the content of the execution info window,
based upon the input window which is either the source or
@@ -479,45 +489,37 @@ tui_set_exec_info_content (struct tui_source_window_base *win_info)
{
if (win_info->execution_info != NULL)
{
- struct tui_gen_win_info *exec_info_ptr = win_info->execution_info;
-
- if (exec_info_ptr->content == NULL)
- exec_info_ptr->content =
- tui_alloc_content (win_info->height, exec_info_ptr->type);
+ tui_exec_info_content *content
+ = win_info->execution_info->maybe_allocate_content (win_info->height);
tui_update_breakpoint_info (win_info, 1);
for (int i = 0; i < win_info->content_size; i++)
{
- struct tui_win_element *element;
+ tui_exec_info_content &element = content[i];
struct tui_win_element *src_element;
int mode;
- element = exec_info_ptr->content[i];
src_element = win_info->content[i];
- memset(element->which_element.simple_string, ' ',
- sizeof(element->which_element.simple_string));
- element->which_element.simple_string[TUI_EXECINFO_SIZE - 1] = 0;
+ memset (element, ' ', sizeof (tui_exec_info_content));
+ element[TUI_EXECINFO_SIZE - 1] = 0;
/* Now update the exec info content based upon the state
of each line as indicated by the source content. */
mode = src_element->which_element.source.has_break;
if (mode & TUI_BP_HIT)
- element->which_element.simple_string[TUI_BP_HIT_POS] =
- (mode & TUI_BP_HARDWARE) ? 'H' : 'B';
+ element[TUI_BP_HIT_POS] = (mode & TUI_BP_HARDWARE) ? 'H' : 'B';
else if (mode & (TUI_BP_ENABLED | TUI_BP_DISABLED))
- element->which_element.simple_string[TUI_BP_HIT_POS] =
- (mode & TUI_BP_HARDWARE) ? 'h' : 'b';
+ element[TUI_BP_HIT_POS] = (mode & TUI_BP_HARDWARE) ? 'h' : 'b';
if (mode & TUI_BP_ENABLED)
- element->which_element.simple_string[TUI_BP_BREAK_POS] = '+';
+ element[TUI_BP_BREAK_POS] = '+';
else if (mode & TUI_BP_DISABLED)
- element->which_element.simple_string[TUI_BP_BREAK_POS] = '-';
+ element[TUI_BP_BREAK_POS] = '-';
if (src_element->which_element.source.is_exec_point)
- element->which_element.simple_string[TUI_EXEC_POS] = '>';
+ element[TUI_EXEC_POS] = '>';
}
- exec_info_ptr->content_size = win_info->content_size;
}
}
@@ -525,17 +527,16 @@ tui_set_exec_info_content (struct tui_source_window_base *win_info)
void
tui_show_exec_info_content (struct tui_source_window_base *win_info)
{
- struct tui_gen_win_info *exec_info = win_info->execution_info;
- int cur_line;
+ struct tui_exec_info_window *exec_info = win_info->execution_info;
+ const tui_exec_info_content *content = exec_info->get_content ();
werase (exec_info->handle);
exec_info->refresh_window ();
- for (cur_line = 1; (cur_line <= exec_info->content_size); cur_line++)
+ for (int cur_line = 1; (cur_line <= win_info->content_size); cur_line++)
mvwaddstr (exec_info->handle,
cur_line,
0,
- (char *) exec_info->content[cur_line - 1]
- ->which_element.simple_string);
+ content[cur_line - 1]);
exec_info->refresh_window ();
exec_info->content_in_use = TRUE;
}
--
2.17.2
next prev parent reply other threads:[~2019-06-23 23:26 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-23 22:43 [PATCH 00/66] Clean up the TUI Tom Tromey
2019-06-23 22:43 ` [PATCH 05/66] Simplify command window creation Tom Tromey
2019-06-23 22:43 ` [PATCH 01/66] Use new and delete for TUI windows Tom Tromey
2019-06-23 22:43 ` [PATCH 08/66] Remove tui_list Tom Tromey
2019-06-24 14:12 ` Pedro Alves
2019-06-24 15:12 ` Ruslan Kabatsayev
2019-06-24 16:05 ` Pedro Alves
2019-06-24 20:47 ` Tom Tromey
2019-06-23 22:43 ` [PATCH 10/66] Create tui_disasm_window Tom Tromey
2019-06-23 22:43 ` [PATCH 13/66] Remove tui_clear_win_detail Tom Tromey
2019-06-23 22:43 ` [PATCH 12/66] Don't use TUI_DISASM_WIN in tui_disasm_window method Tom Tromey
2019-06-23 22:44 ` [PATCH 07/66] Introduce tui_win_info::clear_detail method Tom Tromey
2019-06-23 22:44 ` [PATCH 11/66] Introduce methods for scrolling Tom Tromey
2019-06-23 22:44 ` [PATCH 29/66] Introduce set_highlight method Tom Tromey
2019-06-23 22:44 ` [PATCH 22/66] Use bool for visibility Tom Tromey
2019-06-23 22:44 ` [PATCH 14/66] Introduce has_locator method Tom Tromey
2019-06-24 14:13 ` Pedro Alves
2019-06-24 20:50 ` Tom Tromey
2019-06-23 22:44 ` [PATCH 16/66] Remove struct tui_command_info Tom Tromey
2019-06-23 22:44 ` [PATCH 06/66] Simplify source and disassembly window creation Tom Tromey
2019-06-23 22:44 ` [PATCH 27/66] Introduce max_height method Tom Tromey
2019-06-23 22:44 ` [PATCH 03/66] Create subclasses for different window types Tom Tromey
2019-06-24 22:21 ` Pedro Alves
2019-06-25 13:51 ` Tom Tromey
2019-06-23 22:44 ` [PATCH 23/66] Introduce the refresh method Tom Tromey
2019-06-23 22:44 ` [PATCH 15/66] Remove struct tui_source_info Tom Tromey
2019-06-23 22:44 ` [PATCH 20/66] Remove an unneeded NULL check Tom Tromey
2019-06-23 22:44 ` [PATCH 28/66] Remove redundant check from make_visible Tom Tromey
2019-06-23 22:44 ` [PATCH 18/66] Change tui_data_window::display_regs to bool Tom Tromey
2019-06-23 22:44 ` [PATCH 19/66] Inline constructors and initializers Tom Tromey
2019-06-23 22:44 ` [PATCH 26/66] Introduce set_new_height method Tom Tromey
2019-06-23 22:44 ` [PATCH 21/66] Introduce make_visible method Tom Tromey
2019-06-23 22:44 ` [PATCH 24/66] Introduce two TUI source window methods Tom Tromey
2019-06-23 22:44 ` [PATCH 17/66] Remove struct tui_data_info Tom Tromey
2019-06-23 22:44 ` [PATCH 25/66] Introduce the refresh_all method Tom Tromey
2019-06-23 22:44 ` [PATCH 02/66] Add destructor to tui_win_info Tom Tromey
2019-06-23 22:44 ` [PATCH 09/66] Split the tui_win_info destructor Tom Tromey
2019-06-23 22:44 ` [PATCH 04/66] Remove an unnecessary NULL check from the TUI Tom Tromey
2019-06-23 23:25 ` [PATCH 41/66] Move make_visible method to tui_gen_win_info Tom Tromey
2019-06-23 23:25 ` [PATCH 42/66] Introduce tui_gen_win_info::reset method Tom Tromey
2019-06-23 23:25 ` [PATCH 40/66] Remove tui_scroll_direction enum Tom Tromey
2019-06-24 14:13 ` Pedro Alves
2019-06-24 20:51 ` Tom Tromey
2019-06-23 23:25 ` [PATCH 45/66] Introduce tui_win_info::update_tab_width Tom Tromey
2019-06-23 23:25 ` [PATCH 35/66] Introduce tui_gen_win_info::name method Tom Tromey
2019-06-23 23:25 ` [PATCH 34/66] Change tui_update_source_window for better type safety Tom Tromey
2019-06-23 23:26 ` [PATCH 47/66] Don't check window type in tui_set_win_focus_to Tom Tromey
2019-06-23 23:26 ` [PATCH 44/66] Introduce enum tui_box Tom Tromey
2019-06-23 23:26 ` [PATCH 48/66] Remove tui_alloc_win_info Tom Tromey
2019-06-23 23:26 ` Tom Tromey [this message]
2019-06-24 14:13 ` [PATCH 49/66] Separate out execution-info window Pedro Alves
2019-06-24 20:52 ` Tom Tromey
2019-06-23 23:26 ` [PATCH 31/66] Use new and delete for tui_gen_win_info Tom Tromey
2019-06-23 23:26 ` [PATCH 32/66] Derive tui_win_info from tui_gen_win_info Tom Tromey
2019-06-23 23:26 ` [PATCH 36/66] Change tui_alloc_source_buffer return type to void Tom Tromey
2019-06-23 23:26 ` [PATCH 37/66] Remove NULL check from tui_set_exec_info_content Tom Tromey
2019-06-23 23:26 ` [PATCH 38/66] Change tui_set_exec_info_content to return void Tom Tromey
2019-06-23 23:26 ` [PATCH 43/66] Remove some TUI static allocations Tom Tromey
2019-06-23 23:26 ` [PATCH 46/66] Introduce tui_win_info::make_visible_with_new_height Tom Tromey
2019-06-23 23:26 ` [PATCH 30/66] Change tui_which_element::data_window to be a pointer Tom Tromey
2019-06-23 23:26 ` [PATCH 39/66] Change more TUI functions to take a tui_source_window_base Tom Tromey
2019-06-23 23:26 ` [PATCH 33/66] Introduce refresh_window method Tom Tromey
2019-06-24 14:23 ` [PATCH 00/66] Clean up the TUI Pedro Alves
2019-06-24 16:47 ` Tom Tromey
2019-06-24 17:46 ` Pedro Alves
2019-06-24 18:54 ` Tom Tromey
2019-06-24 22:23 ` Pedro Alves
2019-06-25 13:51 ` Tom Tromey
2019-06-24 18:49 ` [PATCH 50/66] Separate out locator window Tom Tromey
2019-06-24 18:48 ` [PATCH 55/66] Remove tui_init_generic_part Tom Tromey
2019-06-24 18:48 ` [PATCH 53/66] Remove two unused enum constants from tui_win_type Tom Tromey
2019-06-24 18:49 ` [PATCH 61/66] More type safety for TUI source window functions Tom Tromey
2019-06-24 18:49 ` [PATCH 64/66] Fix latent bug in set_is_exec_point_at Tom Tromey
2019-06-24 18:49 ` [PATCH 51/66] Remove layout_def::split Tom Tromey
2019-06-24 18:49 ` [PATCH 66/66] Tidy tui_delete_win Tom Tromey
2019-06-24 18:49 ` [PATCH 65/66] Make tui_gen_win_info constructor protected Tom Tromey
2019-06-24 18:49 ` [PATCH 62/66] Remove union tui_which_element Tom Tromey
2019-06-24 18:49 ` [PATCH 57/66] Remove "data_content" and "data_content_count" from TUI data window Tom Tromey
2019-06-24 18:49 ` [PATCH 63/66] Remove NULL checks before xfree Tom Tromey
2019-06-24 18:49 ` [PATCH 58/66] Separate out data window Tom Tromey
2019-06-24 18:49 ` [PATCH 54/66] Separate out data item window Tom Tromey
2019-06-24 18:49 ` [PATCH 52/66] Remove command from tui_which_element Tom Tromey
2019-06-24 18:49 ` [PATCH 60/66] Use bool for is_exec_point Tom Tromey
2019-06-24 18:49 ` [PATCH 56/66] Turn tui_first_data_item_displayed into a method Tom Tromey
2019-06-24 18:49 ` [PATCH 59/66] Fix "auxiliary" typo Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190623224329.16060-50-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox