OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rearrange tui-regs.c some more 

This moves tui_reg_layout later in tui-regs.c, closer to where it is
used.

It also changes tui_show_registers not to enable the TUI or change the
layout -- this is already done by this point by all the callers.

2019-08-20  Tom Tromey  <tom@tromey.com>

	* tui/tui-regs.c (tui_reg_layout): Move later.
	(tui_show_registers): Don't enable TUI mode or change layout.
This commit is contained in:
Tom Tromey 2019-07-13 16:08:33 -06:00
parent b9ad36868f
commit 42cc14a753
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2019-08-20 Tom Tromey <tom@tromey.com>
* tui/tui-regs.c (tui_reg_layout): Move later.
(tui_show_registers): Don't enable TUI mode or change layout.
2019-08-20 Tom Tromey <tom@tromey.com> 2019-08-20 Tom Tromey <tom@tromey.com>
* tui/tui-regs.h (struct tui_data_item_window) * tui/tui-regs.h (struct tui_data_item_window)

38
gdb/tui/tui-regs.c
View File

@ -149,34 +149,11 @@ tui_data_window::first_reg_element_no_inline (int line_no) const
return (-1); return (-1);
} }
/* A helper function to display the register window in the appropriate
way. */
static void
tui_reg_layout ()
{
enum tui_layout_type cur_layout = tui_current_layout ();
enum tui_layout_type new_layout;
if (cur_layout == SRC_COMMAND || cur_layout == SRC_DATA_COMMAND)
new_layout = SRC_DATA_COMMAND;
else
new_layout = DISASSEM_DATA_COMMAND;
tui_set_layout (new_layout);
}
/* Show the registers of the given group in the data window /* Show the registers of the given group in the data window
and refresh the window. */ and refresh the window. */
void void
tui_show_registers (struct reggroup *group) tui_show_registers (struct reggroup *group)
{ {
/* Make sure the curses mode is enabled. */
tui_enable ();
/* Make sure the register window is visible. If not, select an
appropriate layout. */
if (TUI_DATA_WIN == NULL || !TUI_DATA_WIN->is_visible ())
tui_reg_layout ();
if (group == 0) if (group == 0)
group = general_reggroup; group = general_reggroup;
@ -676,6 +653,21 @@ tui_reg_prev (struct reggroup *current_group, struct gdbarch *gdbarch)
return group; return group;
} }
/* A helper function to display the register window in the appropriate
way. */
static void
tui_reg_layout ()
{
enum tui_layout_type cur_layout = tui_current_layout ();
enum tui_layout_type new_layout;
if (cur_layout == SRC_COMMAND || cur_layout == SRC_DATA_COMMAND)
new_layout = SRC_DATA_COMMAND;
else
new_layout = DISASSEM_DATA_COMMAND;
tui_set_layout (new_layout);
}
/* Implement the 'tui reg' command. Changes the register group displayed /* Implement the 'tui reg' command. Changes the register group displayed
in the tui register window. Displays the tui register window if it is in the tui register window. Displays the tui register window if it is
not already on display. */ not already on display. */