FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify tui_add_win_to_layout

Browse source 
tui_add_win_to_layout is only ever called for the source or assembly
windows.  This simplifies the function by removing the DATA_WIN case.

gdb/ChangeLog
2020-02-22  Tom Tromey  <tom@tromey.com>

	* tui/tui-layout.h (tui_add_win_to_layout): Add comment.
	* tui/tui-layout.c (tui_add_win_to_layout): Add assert.  Remove
	DATA_WIN case.

Change-Id: Idfca902c6c90153acc5d19af4c33aa74bc3caf31
This commit is contained in:
Tom Tromey 2020-02-22 11:48:26 -07:00
parent 2a3d458be3
commit 59b8b5d247
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2020-02-22 Tom Tromey <tom@tromey.com>
* tui/tui-layout.h (tui_add_win_to_layout): Add comment.
* tui/tui-layout.c (tui_add_win_to_layout): Add assert. Remove
DATA_WIN case.
2020-02-22 Tom Tromey <tom@tromey.com>
* tui/tui-disasm.c (tui_get_low_disassembly_address): Use

19
gdb/tui/tui-layout.c
View file

@ -187,12 +187,13 @@ tui_set_layout (enum tui_layout_type layout_type)
}
}
/* Add the specified window to the layout in a logical way. This
means setting up the most logical layout given the window to be
added. */
/* See tui-layout.h. */
void
tui_add_win_to_layout (enum tui_win_type type)
{
gdb_assert (type == SRC_WIN || type == DISASSEM_WIN);
enum tui_layout_type cur_layout = tui_current_layout ();
switch (type)
@ -219,18 +220,6 @@ tui_add_win_to_layout (enum tui_win_type type)
tui_set_layout (DISASSEM_COMMAND);
}
break;
case DATA_WIN:
if (cur_layout != SRC_DATA_COMMAND
&& cur_layout != DISASSEM_DATA_COMMAND)
{
if (cur_layout == DISASSEM_COMMAND)
tui_set_layout (DISASSEM_DATA_COMMAND);
else
tui_set_layout (SRC_DATA_COMMAND);
}
break;
default:
break;
}
}

5
gdb/tui/tui-layout.h
View file

@ -173,7 +173,12 @@ private:
bool m_applied = false;
};
/* Add the specified window to the layout in a logical way. This
means setting up the most logical layout given the window to be
added. Only the source or disassembly window can be added this
way. */
extern void tui_add_win_to_layout (enum tui_win_type);
extern void tui_set_layout (enum tui_layout_type);
/* Apply the current layout. */