From 37a105a123de409e6d33eacc1030d1bebe5b1637 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Thu, 2 Feb 2006 02:04:28 +0000 Subject: [PATCH] * Makefile.in (remote.o): Update. * remote.c (show_packet_config_cmd): Shorten messages. (remote_set_cmdlist, remote_show_cmdlist): Make file-static. (show_remote_cmd): Iterate. (_initialize_remote): Remove remote_set_cmdlist, remote_show_cmdlist. --- gdb/ChangeLog | 9 +++++++++ gdb/Makefile.in | 3 ++- gdb/remote.c | 50 +++++++++++++++++++++++++++++++------------------ 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6ac5565bcdf..a1ae60a856f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2006-02-01 Daniel Jacobowitz + + * Makefile.in (remote.o): Update. + * remote.c (show_packet_config_cmd): Shorten messages. + (remote_set_cmdlist, remote_show_cmdlist): Make file-static. + (show_remote_cmd): Iterate. + (_initialize_remote): Remove remote_set_cmdlist, + remote_show_cmdlist. + 2006-02-01 Daniel Jacobowitz * Makefile.in (gdbtypes_h, gdbtypes.o, utils.o): Update. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 932d724bf79..88c8f11ce24 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2441,7 +2441,8 @@ remote.o: remote.c $(defs_h) $(gdb_string_h) $(inferior_h) $(bfd_h) \ $(symfile_h) $(exceptions_h) $(target_h) $(gdbcmd_h) $(objfiles_h) \ $(gdb_stabs_h) $(gdbthread_h) $(remote_h) $(regcache_h) $(value_h) \ $(gdb_assert_h) $(event_loop_h) $(event_top_h) $(inf_loop_h) \ - $(serial_h) $(gdbcore_h) $(remote_fileio_h) $(solib_h) $(observer_h) + $(serial_h) $(gdbcore_h) $(remote_fileio_h) $(solib_h) $(observer_h) \ + $(cli_decode_h) $(cli_setshow_h) remote-e7000.o: remote-e7000.c $(defs_h) $(gdbcore_h) $(gdbarch_h) \ $(inferior_h) $(target_h) $(value_h) $(command_h) $(gdb_string_h) \ $(exceptions_h) $(gdbcmd_h) $(serial_h) $(remote_utils_h) \ diff --git a/gdb/remote.c b/gdb/remote.c index 3318fb32bce..ba311a7dff0 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -43,6 +43,8 @@ #include "gdb_assert.h" #include "observer.h" #include "solib.h" +#include "cli/cli-decode.h" +#include "cli/cli-setshow.h" #include #include @@ -612,13 +614,13 @@ show_packet_config_cmd (struct packet_config *config) switch (config->detect) { case AUTO_BOOLEAN_AUTO: - printf_filtered (_("Support for remote protocol `%s' (%s) packet is auto-detected, currently %s.\n"), - config->name, config->title, support); + printf_filtered (_("Support for the `%s' packet is auto-detected, currently %s.\n"), + config->name, support); break; case AUTO_BOOLEAN_TRUE: case AUTO_BOOLEAN_FALSE: - printf_filtered (_("Support for remote protocol `%s' (%s) packet is currently %s.\n"), - config->name, config->title, support); + printf_filtered (_("Support for the `%s' packet is currently %s.\n"), + config->name, support); break; } } @@ -5544,6 +5546,9 @@ Specify the serial device it is connected to (e.g. /dev/ttya).", extended_async_remote_ops.to_mourn_inferior = extended_remote_mourn; } +static struct cmd_list_element *remote_set_cmdlist; +static struct cmd_list_element *remote_show_cmdlist; + static void set_remote_cmd (char *args, int from_tty) { @@ -5552,16 +5557,25 @@ set_remote_cmd (char *args, int from_tty) static void show_remote_cmd (char *args, int from_tty) { - /* FIXME: cagney/2002-06-15: This function should iterate over - remote_show_cmdlist for a list of sub commands to show. */ - show_remote_protocol_Z_packet_cmd (gdb_stdout, from_tty, NULL, NULL); - show_remote_protocol_P_packet_cmd (gdb_stdout, from_tty, NULL, NULL); - show_remote_protocol_p_packet_cmd (gdb_stdout, from_tty, NULL, NULL); - show_remote_protocol_qSymbol_packet_cmd (gdb_stdout, from_tty, NULL, NULL); - show_remote_protocol_vcont_packet_cmd (gdb_stdout, from_tty, NULL, NULL); - show_remote_protocol_binary_download_cmd (gdb_stdout, from_tty, NULL, NULL); - show_remote_protocol_qPart_auxv_packet_cmd (gdb_stdout, from_tty, NULL, NULL); - show_remote_protocol_qGetTLSAddr_packet_cmd (gdb_stdout, from_tty, NULL, NULL); + /* We can't just use cmd_show_list here, because we want to skip + the redundant "show remote Z-packet". */ + struct cleanup *showlist_chain; + struct cmd_list_element *list = remote_show_cmdlist; + + showlist_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "showlist"); + for (; list != NULL; list = list->next) + if (strcmp (list->name, "Z-packet") == 0) + continue; + else if (list->type == show_cmd) + { + struct cleanup *option_chain + = make_cleanup_ui_out_tuple_begin_end (uiout, "option"); + ui_out_field_string (uiout, "name", list->name); + ui_out_text (uiout, ": "); + do_setshow_command ((char *) NULL, from_tty, list); + /* Close the tuple. */ + do_cleanups (option_chain); + } } static void @@ -5590,9 +5604,6 @@ remote_new_objfile (struct objfile *objfile) void _initialize_remote (void) { - static struct cmd_list_element *remote_set_cmdlist; - static struct cmd_list_element *remote_show_cmdlist; - /* architecture specific data */ remote_gdbarch_data_handle = gdbarch_data_register_post_init (init_remote_state); @@ -5798,7 +5809,10 @@ Show the maximum size of the address (in bits) in a memory packet."), NULL, &remote_set_cmdlist, &remote_show_cmdlist, 0); - /* Keep the old ``set remote Z-packet ...'' working. */ + /* Keep the old ``set remote Z-packet ...'' working. Each individual + Z sub-packet has its own set and show commands, but users may + have sets to this variable in their .gdbinit files (or in their + documentation). */ add_setshow_auto_boolean_cmd ("Z-packet", class_obscure, &remote_Z_packet_detect, _("\ Set use of remote protocol `Z' packets"), _("\ -- 2.30.2