[1/4] gdb: Remove register class specific layout names.

  * Pedro Alves <palves@redhat.com> [2015-05-21 09:12:45 +0100]:

> On 05/21/2015 12:17 AM, Andrew Burgess wrote:
> >
> > The first patch in this series removes the $FREGS style register set
> > names from the layout command, and cleans up all of the code relating
> > to them.
>
> Looks like this was really meant to switch to the matching registers
> layout when the user did "display $fpregs", etc. instead of manually
> specifying that layout.  We have:
> 
> static void
> display_command (char *arg, int from_tty)
> {
>   struct format_data fmt;
>   struct expression *expr;
>   struct display *newobj;
>   int display_it = 1;
>   const char *exp = arg;
> 
> #if defined(TUI)
>   /* NOTE: cagney/2003-02-13 The `tui_active' was previously
>      `tui_version'.  */
>   if (tui_active && exp != NULL && *exp == '$')
>     display_it = (tui_set_layout_for_display_command (exp) == TUI_FAILURE);
> #endif
> 
> Doesn't your series effectively make this bit in display_command dead?
> (while before it would switch on the registers layout).

Sorry for missing that use.

You're right, it's certainly dead now, though before my patch it still
didn't do anything, passing the '$FREGS', etc names to
tui_set_layout_for_display_command would just cause the regs display
to pop up with the default register set. (At least, that's all I
ever see, and I don't think anything else is possible.)

Given that it's not worked for a while, I propose to just remove the
above snippet (really having this in display seems nasty to me) and
just move to layout being for layout adjustment, and 'tui reg' to
change the displayed register set.

>                                                         (We should probably
> rename tui_set_layout_for_display_command too.)

Done, it's now tui_set_layout_by_name.

> I had never noticed these special register layouts before either.  I'm not
> at all adverse to removing them.  Not all expressions that start with $ are
> registers, and probably a better idea would be to have
> a separate "displays" window (so displays would go to that window
> instead of the command window when the TUI is active), so that the tui
> could neatly show watched variables/random expressions too.

Sounds like a good idea.

New patch below.

Thanks,
Andrew

--

gdb: Remove register class specific layout names.

The layout command supports the layout names $FREGS, $GREGS, $SREGS,
and $REGS. The intention of these layout names was to display the tui
register window with a specific set of registers.

First, these layout names no longer work, and haven't for a while, using
any of them will just result in switching to the general register view.

Second there is already the command 'tui reg GROUP' command to set the
displayed register set to GROUP, so making the layout command also
control the register set feels like unnecessary overloading of the
layout command.

This commit removes all code relating to supporting the register set
specific names from the layout command.  Afterwards the user can select
an available layout using the layout command, and control the choice of
register set using the 'tui reg GROUP' command.

gdb/ChangeLog:

	* tui/tui-layout.c (tui_set_layout): Remove
	tui_register_display_type parameter.  Remove all checking of this
	parameter, and reindent function.  Update header comment.
	(tui_set_layout_for_display_command): Rename to...
	(tui_set_layout_by_name): ...this, and don't check for different
	register class types, don't pass a tui_register_display_type to
	tui_set_layout.  Update header comment.
	(layout_names): Remove register set specific names.
	* tui/tui-layout.h (tui_set_layout): Remove
	tui_register_display_type parameter.
	* tui/tui.c (tui_rl_change_windows): Don't pass a
	tui_register_display_type to tui_set_layout.
	(tui_rl_delete_other_windows): Likewise.
	(tui_enable): Likewise.
	* tui/tui-data.h (TUI_FLOAT_REGS_NAME): Remove.
	(TUI_FLOAT_REGS_NAME_LOWER): Remove.
	(TUI_GENERAL_REGS_NAME): Remove.
	(TUI_GENERAL_REGS_NAME_LOWER): Remove.
	(TUI_SPECIAL_REGS_NAME): Remove.
	(TUI_SPECIAL_REGS_NAME_LOWER): Remove.
	(TUI_GENERAL_SPECIAL_REGS_NAME): Remove.
	(TUI_GENERAL_SPECIAL_REGS_NAME_LOWER): Remove.
	(enum tui_register_display_type): Remove.
	(struct tui_layout_def): Remove regs_display_type and
	float_regs_display_type fields.
	(struct tui_data_info): Remove regs_display_type field.
	(tui_layout_command): Use new name for
	tui_set_layout_for_display_command.
	* tui/tui-data.c (layout_def): Don't initialise removed fields.
	(tui_clear_win_detail): Don't initialise removed fields of
	win_info.
	* tui/tui-regs.c (tui_show_registers): Use new name for
	tui_set_layout_for_display_command.
	* tui/tui.h (tui_set_layout_for_display_command): Rename
	declaration to...
	(tui_set_layout_by_name): ...this.
	* printcmd.c (display_command): Remove tui related layout call,
	and reindent.

--

[1/4] gdb: Remove register class specific layout names.

Commit Message

Comments

Patch