From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28172 invoked by alias); 25 Nov 2014 17:28:58 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 28149 invoked by uid 89); 25 Nov 2014 17:28:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp13.uk.ibm.com Received: from e06smtp13.uk.ibm.com (HELO e06smtp13.uk.ibm.com) (195.75.94.109) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 25 Nov 2014 17:28:54 +0000 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 25 Nov 2014 17:28:50 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 25 Nov 2014 17:28:49 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 5A13F1B08051 for ; Tue, 25 Nov 2014 17:29:03 +0000 (GMT) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sAPHSmRJ8323466 for ; Tue, 25 Nov 2014 17:28:48 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sAPCPp7i018083 for ; Tue, 25 Nov 2014 07:25:51 -0500 Received: from br87z6lw.de.ibm.com ([9.81.65.28]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id sAPCPoK5018078 for ; Tue, 25 Nov 2014 07:25:51 -0500 From: Andreas Arnez To: gdb-patches@sourceware.org Subject: [PATCH] Provide useful completer for "info registers" Date: Tue, 25 Nov 2014 17:28:00 -0000 Message-ID: <87h9xnqje8.fsf@br87z6lw.de.ibm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14112517-0013-0000-0000-000001FC1E64 X-IsSubscribed: yes X-SW-Source: 2014-11/txt/msg00626.txt.bz2 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. gdb/ChangeLog: * completer.c: Include "target.h" and "reggroups.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/completer.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ gdb/completer.h | 3 +++ gdb/infcmd.c | 12 +++++++++--- 3 files changed, 63 insertions(+), 3 deletions(-) diff --git a/gdb/completer.c b/gdb/completer.c index a0f3fa3..42188c0 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -23,6 +23,8 @@ #include "filenames.h" /* For DOSish file names. */ #include "language.h" #include "gdb_signals.h" +#include "target.h" +#include "reggroups.h" #include "cli/cli-decode.h" @@ -836,6 +838,55 @@ 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 (text); + struct frame_info *frame; + struct gdbarch *gdbarch; + + if (!target_has_registers) + return result; + + frame = get_selected_frame (NULL); + gdbarch = get_frame_arch (frame); + + { + int i; + int n_regs = (gdbarch_num_regs (gdbarch) + + gdbarch_num_pseudo_regs (gdbarch)); + + for (i = 0; i < n_regs; i++) + { + const char *reg_name = gdbarch_register_name (gdbarch, i); + + if (reg_name != NULL && strncmp (text, reg_name, len) == 0) + VEC_safe_push (char_ptr, result, xstrdup (reg_name)); + } + } + + { + struct reggroup *group; + + for (group = reggroup_next (gdbarch, NULL); + group != NULL; + group = reggroup_next (gdbarch, group)) + { + const char *group_name = reggroup_name (group); + + if (strncmp (text, group_name, len) == 0) + VEC_safe_push (char_ptr, result, xstrdup (group_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.")); -- 1.7.9.5