From 71c247087cbff23fbbe10333a9e504f3e197c107 Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Fri, 12 Dec 2014 17:11:22 +0100 Subject: [PATCH] Provide completer for "info registers" Provide a new completion function for the argument of "info registers", "info all-registers", and the "lr" command in dbx mode. Without this patch the default symbol completer is used, which is more confusing than helpful. Also add a test for this new feature to "completion.exp": Determine the target's available set of registers/reggroups and compare this to the completion of "info registers ". For determining the available registers involve the new "maint print user-registers" command. gdb/ChangeLog: * completer.c: Include "target.h", "reggroups.h", and "user-regs.h". (reg_or_group_completer): New. * completer.h (reg_or_group_completer): Declare. * infcmd.c (_initialize_infcmd): Set reg_or_group_completer for the "info registers" and "info all-registers" commands and the dbx-mode "lr" command. gdb/testsuite/ChangeLog: * gdb.base/completion.exp: Add test for completion of "info registers ". --- gdb/ChangeLog | 10 +++++++++ gdb/completer.c | 42 +++++++++++++++++++++++++++++++++++ gdb/completer.h | 3 +++ gdb/infcmd.c | 12 +++++++--- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/completion.exp | 31 ++++++++++++++++++++++++++ 6 files changed, 100 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f757618..9b9d176 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2014-12-12 Andreas Arnez + * completer.c: Include "target.h", "reggroups.h", and + "user-regs.h". + (reg_or_group_completer): New. + * completer.h (reg_or_group_completer): Declare. + * infcmd.c (_initialize_infcmd): Set reg_or_group_completer for + the "info registers" and "info all-registers" commands and the + dbx-mode "lr" command. + +2014-12-12 Andreas Arnez + * user-regs.c: Include "arch-utils.h", "command.h", and "cli/cli-cmds.h". (maintenance_print_user_registers): New. diff --git a/gdb/completer.c b/gdb/completer.c index a0f3fa3..6767225 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -23,6 +23,9 @@ #include "filenames.h" /* For DOSish file names. */ #include "language.h" #include "gdb_signals.h" +#include "target.h" +#include "reggroups.h" +#include "user-regs.h" #include "cli/cli-decode.h" @@ -836,6 +839,45 @@ signal_completer (struct cmd_list_element *ignore, return return_val; } +/* Complete on a register or reggroup. */ + +VEC (char_ptr) * +reg_or_group_completer (struct cmd_list_element *ignore, + const char *text, const char *word) +{ + VEC (char_ptr) *result = NULL; + size_t len = strlen (word); + struct gdbarch *gdbarch; + struct reggroup *group; + const char *name; + int i; + + if (!target_has_registers) + return result; + + gdbarch = get_frame_arch (get_selected_frame (NULL)); + + for (i = 0; + (name = user_reg_map_regnum_to_name (gdbarch, i)) != NULL; + i++) + { + if (*name != '\0' && strncmp (word, name, len) == 0) + VEC_safe_push (char_ptr, result, xstrdup (name)); + } + + for (group = reggroup_next (gdbarch, NULL); + group != NULL; + group = reggroup_next (gdbarch, group)) + { + name = reggroup_name (group); + if (strncmp (word, name, len) == 0) + VEC_safe_push (char_ptr, result, xstrdup (name)); + } + + return result; +} + + /* Get the list of chars that are considered as word breaks for the current command. */ diff --git a/gdb/completer.h b/gdb/completer.h index bc7ed96..5e91030 100644 --- a/gdb/completer.h +++ b/gdb/completer.h @@ -45,6 +45,9 @@ extern VEC (char_ptr) *command_completer (struct cmd_list_element *, extern VEC (char_ptr) *signal_completer (struct cmd_list_element *, const char *, const char *); +extern VEC (char_ptr) *reg_or_group_completer (struct cmd_list_element *, + const char *, const char *); + extern char *get_gdb_completer_quote_characters (void); extern char *gdb_completion_word_break_characters (void); diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 4415b31..de0d24d 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -3235,18 +3235,24 @@ If non-stop mode is enabled, interrupt only the current thread,\n\ otherwise all the threads in the program are stopped. To \n\ interrupt all running threads in non-stop mode, use the -a option.")); - add_info ("registers", nofp_registers_info, _("\ + c = add_info ("registers", nofp_registers_info, _("\ List of integer registers and their contents, for selected stack frame.\n\ Register name as argument means describe only that register.")); add_info_alias ("r", "registers", 1); + set_cmd_completer (c, reg_or_group_completer); if (xdb_commands) - add_com ("lr", class_info, nofp_registers_info, _("\ + { + c = add_com ("lr", class_info, nofp_registers_info, _("\ List of integer registers and their contents, for selected stack frame.\n\ Register name as argument means describe only that register.")); - add_info ("all-registers", all_registers_info, _("\ + set_cmd_completer (c, reg_or_group_completer); + } + + c = add_info ("all-registers", all_registers_info, _("\ List of all registers and their contents, for selected stack frame.\n\ Register name as argument means describe only that register.")); + set_cmd_completer (c, reg_or_group_completer); add_info ("program", program_info, _("Execution status of the program.")); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6e17360..b21ac45 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-12-12 Andreas Arnez + + * gdb.base/completion.exp: Add test for completion of "info + registers ". + 2014-12-12 Maciej W. Rozycki * gdb.base/func-ptrs.c: New file. diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp index c633a51..08e1a52 100644 --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -137,6 +137,37 @@ gdb_test "complete set listsize unl" "set listsize unlimited" gdb_test "complete set trace-buffer-size " "set trace-buffer-size unlimited" gdb_test "complete set trace-buffer-size unl" "set trace-buffer-size unlimited" +# Test "info registers" completion: First determine this +# architecture's registers and reggroups... + +set regs_output [capture_command_output "mt print registers" \ + ".*Name.*Nr.*Rel.*Offset.*Size.*Type.\[^\n\]*\n"] +append regs_output "\n" +append regs_output [capture_command_output "mt print reggroups" \ + ".*Group.*Type\[^\n]*\n"] +set all_regs {} +foreach {- reg} [regexp -all -inline -line {^\s+(\w+)} $regs_output] { + lappend all_regs $reg +} + +set regs_output [capture_command_output "mt print user-registers" \ + ".*Nr.*Name\[^\n]*\n"] +foreach {- reg} [regexp -all -inline -line {^\s+\d+\s+(\w+)} $regs_output] { + lappend all_regs $reg +} + +set all_regs [join [lsort -unique $all_regs]] + +# ... and then compare them to the completion of "info registers". + +set regs_output [capture_command_output "complete info registers " ""] +set completed_regs {} +foreach {-> reg} [regexp -all -inline -line {^info registers (\w+\S*)} $regs_output] { + lappend completed_regs $reg +} +set completed_regs [join [lsort $completed_regs]] +gdb_assert {{$all_regs eq $completed_regs}} "complete 'info registers '" + # Tests below are about tab-completion, which doesn't work if readline # library isn't used. Check it first. -- 2.7.4