gdb: move set remote commands to remote.c

Commands "set debug remote" and "set remotetimeout" are defined in
cli/cli-cmds.c, I think it would make more sense for them to be in
remote.c.

gdb/ChangeLog:

	* cli/cli-cmds.c (show_remote_debug): Remove.
	(show_remote_timeout): Remove.
	(_initialize_cli_cmds): Don't register commands.
	* remote.c (show_remote_debug): Move here.
	(show_remote_timeout): Move here.
	(_initialize_remote): Register commands.

Change-Id: Ic4d81888aa4f8dde89d1d29397ef19a08951b80b

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index df54d9af985edbde766e99f62f96f26bc5c0272d..0eee5b51724e0547f9c1054b4bc952832d70c8fd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2021-01-22  Simon Marchi  <simon.marchi@polymtl.ca>
+
+       * cli/cli-cmds.c (show_remote_debug): Remove.
+       (show_remote_timeout): Remove.
+       (_initialize_cli_cmds): Don't register commands.
+       * remote.c (show_remote_debug): Move here.
+       (show_remote_timeout): Move here.
+       (_initialize_remote): Register commands.
+
 2021-01-22  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * gdbtypes.h (TYPE_OBJFILE): Remove, change all users to use the

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 5cde005ada6f6ee418b1305e4f0e128442ec8400..68ef92eca4c9ea19fc85c10802da8580f550ddc3 100644 (file)
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -2037,23 +2037,6 @@ show_history_expansion_p (struct ui_file *file, int from_tty,
                    value);
 }
 
-static void
-show_remote_debug (struct ui_file *file, int from_tty,
-                  struct cmd_list_element *c, const char *value)
-{
-  fprintf_filtered (file, _("Debugging of remote protocol is %s.\n"),
-                   value);
-}
-
-static void
-show_remote_timeout (struct ui_file *file, int from_tty,
-                    struct cmd_list_element *c, const char *value)
-{
-  fprintf_filtered (file,
-                   _("Timeout limit to wait for target to respond is %s.\n"),
-                   value);
-}
-
 static void
 show_max_user_call_depth (struct ui_file *file, int from_tty,
                          struct cmd_list_element *c, const char *value)
@@ -2455,25 +2438,6 @@ the previous command number shown."),
   add_cmd ("configuration", no_set_class, show_configuration,
           _("Show how GDB was configured at build time."), &showlist);
 
-  add_setshow_zinteger_cmd ("remote", no_class, &remote_debug, _("\
-Set debugging of remote protocol."), _("\
-Show debugging of remote protocol."), _("\
-When enabled, each packet sent or received with the remote target\n\
-is displayed."),
-                           NULL,
-                           show_remote_debug,
-                           &setdebuglist, &showdebuglist);
-
-  add_setshow_zuinteger_unlimited_cmd ("remotetimeout", no_class,
-                                      &remote_timeout, _("\
-Set timeout limit to wait for target to respond."), _("\
-Show timeout limit to wait for target to respond."), _("\
-This value is used to set the time limit for gdb to wait for a response\n\
-from the target."),
-                                      NULL,
-                                      show_remote_timeout,
-                                      &setlist, &showlist);
-
   add_basic_prefix_cmd ("debug", no_class,
                        _("Generic command for setting gdb debugging flags."),
                        &setdebuglist, "set debug ", 0, &setlist);

diff --git a/gdb/remote.c b/gdb/remote.c
index 5daabf236b7ed261a4887bdf035db3f9fd3bd69a..3793128a866b93ae1cf90eb4e554a85f0452289e 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -14533,6 +14533,23 @@ set_range_stepping (const char *ignore_args, int from_tty,
     }
 }
 
+static void
+show_remote_debug (struct ui_file *file, int from_tty,
+                  struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (file, _("Debugging of remote protocol is %s.\n"),
+                   value);
+}
+
+static void
+show_remote_timeout (struct ui_file *file, int from_tty,
+                    struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (file,
+                   _("Timeout limit to wait for target to respond is %s.\n"),
+                   value);
+}
+
 void _initialize_remote ();
 void
 _initialize_remote ()
@@ -15041,6 +15058,25 @@ Specify \"unlimited\" to display all the characters."),
                                       NULL, show_remote_packet_max_chars,
                                       &setdebuglist, &showdebuglist);
 
+  add_setshow_zinteger_cmd ("remote", no_class, &remote_debug, _("\
+Set debugging of remote protocol."), _("\
+Show debugging of remote protocol."), _("\
+When enabled, each packet sent or received with the remote target\n\
+is displayed."),
+                           NULL,
+                           show_remote_debug,
+                           &setdebuglist, &showdebuglist);
+
+  add_setshow_zuinteger_unlimited_cmd ("remotetimeout", no_class,
+                                      &remote_timeout, _("\
+Set timeout limit to wait for target to respond."), _("\
+Show timeout limit to wait for target to respond."), _("\
+This value is used to set the time limit for gdb to wait for a response\n\
+from the target."),
+                                      NULL,
+                                      show_remote_timeout,
+                                      &setlist, &showlist);
+
   /* Eventually initialize fileio.  See fileio.c */
   initialize_remote_fileio (&remote_set_cmdlist, &remote_show_cmdlist);
 }