GDBserver: Pass process_info pointer to target_detach and target_join

[deliverable/binutils-gdb.git] / gdb / infcmd.c

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index e92b777023002cde533035627bc44fe7780d87a4..821bcc6544c2e5c9e3ef4a0a94466ba834495e72 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1,6 +1,6 @@
 /* Memory-access and commands for "inferior" process, for GDB.
 
 /* Memory-access and commands for "inferior" process, for GDB.
 

-   Copyright (C) 1986-2015 Free Software Foundation, Inc.
+   Copyright (C) 1986-2018 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -42,7 +42,7 @@
 #include "block.h"
 #include "solib.h"
 #include <ctype.h>
 #include "block.h"
 #include "solib.h"
 #include <ctype.h>

-#include "observer.h"
+#include "observable.h"

 #include "target-descriptions.h"
 #include "user-regs.h"
 #include "cli/cli-decode.h"
 #include "target-descriptions.h"
 #include "user-regs.h"
 #include "cli/cli-decode.h"


@@ -54,57 +54,18 @@
 #include "continuations.h"
 #include "linespec.h"
 #include "cli/cli-utils.h"
 #include "continuations.h"
 #include "linespec.h"
 #include "cli/cli-utils.h"

+#include "infcall.h"
+#include "thread-fsm.h"
+#include "top.h"
+#include "interps.h"
+#include "common/gdb_optional.h"
+#include "source.h"

 
 /* Local functions: */
 
 
 /* Local functions: */
 

-static void nofp_registers_info (char *, int);
-
-static void print_return_value (struct value *function,
-                               struct type *value_type);
-

 static void until_next_command (int);
 
 static void until_next_command (int);
 

-static void until_command (char *, int);
-
-static void path_info (char *, int);
-
-static void path_command (char *, int);
-
-static void unset_command (char *, int);
-
-static void float_info (char *, int);
-
-static void disconnect_command (char *, int);
-
-static void unset_environment_command (char *, int);
-
-static void set_environment_command (char *, int);
-
-static void environment_info (char *, int);
-
-static void program_info (char *, int);
-
-static void finish_command (char *, int);
-
-static void signal_command (char *, int);
-
-static void jump_command (char *, int);
-
-static void step_1 (int, int, char *);
-static void step_once (int skip_subroutines, int single_inst,
-                      int count, int thread);
-
-static void next_command (char *, int);
-
-static void step_command (char *, int);
-
-static void run_command (char *, int);
-
-static void run_no_args_command (char *args, int from_tty);
-
-static void go_command (char *line_no, int from_tty);
-
-void _initialize_infcmd (void);
+static void step_1 (int, int, const char *);

 
 #define ERROR_NO_INFERIOR \
    if (!target_has_execution) error (_("The program is not being run."));
 
 #define ERROR_NO_INFERIOR \
    if (!target_has_execution) error (_("The program is not being run."));


@@ -117,6 +78,10 @@ void _initialize_infcmd (void);
 
 static char *inferior_args_scratch;
 
 
 static char *inferior_args_scratch;
 

+/* Scratch area where the new cwd will be stored by 'set cwd'.  */
+
+static char *inferior_cwd_scratch;
+

 /* Scratch area where 'set inferior-tty' will store user-provided value.
    We'll immediate copy it into per-inferior storage.  */
 
 /* Scratch area where 'set inferior-tty' will store user-provided value.
    We'll immediate copy it into per-inferior storage.  */
 


@@ -129,10 +94,6 @@ static char *inferior_io_terminal_scratch;
 
 ptid_t inferior_ptid;
 
 
 ptid_t inferior_ptid;
 

-/* Address at which inferior stopped.  */
-
-CORE_ADDR stop_pc;
-

 /* Nonzero if stopped due to completion of a stack dummy routine.  */
 
 enum stop_stack_kind stop_stack_dummy;
 /* Nonzero if stopped due to completion of a stack dummy routine.  */
 
 enum stop_stack_kind stop_stack_dummy;


@@ -156,7 +117,11 @@ void
 set_inferior_io_terminal (const char *terminal_name)
 {
   xfree (current_inferior ()->terminal);
 set_inferior_io_terminal (const char *terminal_name)
 {
   xfree (current_inferior ()->terminal);

-  current_inferior ()->terminal = terminal_name ? xstrdup (terminal_name) : 0;
+
+  if (terminal_name != NULL && *terminal_name != '\0')
+    current_inferior ()->terminal = xstrdup (terminal_name);
+  else
+    current_inferior ()->terminal = NULL;

 }
 
 const char *
 }
 
 const char *


@@ -166,7 +131,7 @@ get_inferior_io_terminal (void)
 }
 
 static void
 }
 
 static void

-set_inferior_tty_command (char *args, int from_tty,
+set_inferior_tty_command (const char *args, int from_tty,

                          struct cmd_list_element *c)
 {
   /* CLI has assigned the user-provided value to inferior_io_terminal_scratch.
                          struct cmd_list_element *c)
 {
   /* CLI has assigned the user-provided value to inferior_io_terminal_scratch.


@@ -212,7 +177,7 @@ get_inferior_args (void)
    NEWARGS is not transferred.  */
 
 void
    NEWARGS is not transferred.  */
 
 void

-set_inferior_args (char *newargs)
+set_inferior_args (const char *newargs)

 {
   xfree (current_inferior ()->args);
   current_inferior ()->args = newargs ? xstrdup (newargs) : NULL;
 {
   xfree (current_inferior ()->args);
   current_inferior ()->args = newargs ? xstrdup (newargs) : NULL;


@@ -230,7 +195,7 @@ set_inferior_args_vector (int argc, char **argv)
 /* Notice when `set args' is run.  */
 
 static void
 /* Notice when `set args' is run.  */
 
 static void

-set_args_command (char *args, int from_tty, struct cmd_list_element *c)
+set_args_command (const char *args, int from_tty, struct cmd_list_element *c)

 {
   /* CLI has assigned the user-provided value to inferior_args_scratch.
      Now route it to current inferior.  */
 {
   /* CLI has assigned the user-provided value to inferior_args_scratch.
      Now route it to current inferior.  */


@@ -248,6 +213,60 @@ show_args_command (struct ui_file *file, int from_tty,
   deprecated_show_value_hack (file, from_tty, c, get_inferior_args ());
 }
 
   deprecated_show_value_hack (file, from_tty, c, get_inferior_args ());
 }
 

+/* See common/common-inferior.h.  */
+
+void
+set_inferior_cwd (const char *cwd)
+{
+  struct inferior *inf = current_inferior ();
+
+  gdb_assert (inf != NULL);
+
+  if (cwd == NULL)
+    inf->cwd.reset ();
+  else
+    inf->cwd.reset (xstrdup (cwd));
+}
+
+/* See common/common-inferior.h.  */
+
+const char *
+get_inferior_cwd ()
+{
+  return current_inferior ()->cwd.get ();
+}
+
+/* Handle the 'set cwd' command.  */
+
+static void
+set_cwd_command (const char *args, int from_tty, struct cmd_list_element *c)
+{
+  if (*inferior_cwd_scratch == '\0')
+    set_inferior_cwd (NULL);
+  else
+    set_inferior_cwd (inferior_cwd_scratch);
+}
+
+/* Handle the 'show cwd' command.  */
+
+static void
+show_cwd_command (struct ui_file *file, int from_tty,
+                 struct cmd_list_element *c, const char *value)
+{
+  const char *cwd = get_inferior_cwd ();
+
+  if (cwd == NULL)
+    fprintf_filtered (gdb_stdout,
+                     _("\
+You have not set the inferior's current working directory.\n\
+The inferior will inherit GDB's cwd if native debugging, or the remote\n\
+server's cwd if remote debugging.\n"));
+  else
+    fprintf_filtered (gdb_stdout,
+                     _("Current working directory that will be used "
+                       "when starting the inferior is \"%s\".\n"), cwd);
+}
+

 \f
 /* Compute command-line string given argument vector.  This does the
    same shell processing as fork_inferior.  */
 \f
 /* Compute command-line string given argument vector.  This does the
    same shell processing as fork_inferior.  */


@@ -262,14 +281,14 @@ construct_inferior_arguments (int argc, char **argv)
 #ifdef __MINGW32__
       /* This holds all the characters considered special to the
         Windows shells.  */
 #ifdef __MINGW32__
       /* This holds all the characters considered special to the
         Windows shells.  */

-      char *special = "\"!&*|[]{}<>?`~^=;, \t\n";
-      const char quote = '"';
+      static const char special[] = "\"!&*|[]{}<>?`~^=;, \t\n";
+      static const char quote = '"';

 #else
       /* This holds all the characters considered special to the
         typical Unix shells.  We include `^' because the SunOS
         /bin/sh treats it as a synonym for `|'.  */
 #else
       /* This holds all the characters considered special to the
         typical Unix shells.  We include `^' because the SunOS
         /bin/sh treats it as a synonym for `|'.  */

-      char *special = "\"!#$&*()\\|[]{}<>?'`~^; \t\n";
-      const char quote = '\'';
+      static const char special[] = "\"!#$&*()\\|[]{}<>?'`~^; \t\n";
+      static const char quote = '\'';

 #endif
       int i;
       int length = 0;
 #endif
       int i;
       int length = 0;


@@ -375,7 +394,7 @@ construct_inferior_arguments (int argc, char **argv)
    NULL is returned.  *BG_CHAR_P is an output boolean that indicates
    whether the '&' character was found.  */
 
    NULL is returned.  *BG_CHAR_P is an output boolean that indicates
    whether the '&' character was found.  */
 

-static char *
+static gdb::unique_xmalloc_ptr<char>

 strip_bg_char (const char *args, int *bg_char_p)
 {
   const char *p;
 strip_bg_char (const char *args, int *bg_char_p)
 {
   const char *p;


@@ -395,13 +414,14 @@ strip_bg_char (const char *args, int *bg_char_p)
 
       *bg_char_p = 1;
       if (p != args)
 
       *bg_char_p = 1;
       if (p != args)

-       return savestring (args, p - args);
+       return gdb::unique_xmalloc_ptr<char>
+         (savestring (args, p - args));

       else
       else

-       return NULL;
+       return gdb::unique_xmalloc_ptr<char> (nullptr);

     }
 
   *bg_char_p = 0;
     }
 
   *bg_char_p = 0;

-  return xstrdup (args);
+  return gdb::unique_xmalloc_ptr<char> (xstrdup (args));

 }
 
 /* Common actions to take after creating any sort of inferior, by any
 }
 
 /* Common actions to take after creating any sort of inferior, by any


@@ -411,10 +431,9 @@ strip_bg_char (const char *args, int *bg_char_p)
 void
 post_create_inferior (struct target_ops *target, int from_tty)
 {
 void
 post_create_inferior (struct target_ops *target, int from_tty)
 {

-  volatile struct gdb_exception ex;

 
   /* Be sure we own the terminal in case write operations are performed.  */ 
 
   /* Be sure we own the terminal in case write operations are performed.  */ 

-  target_terminal_ours ();
+  target_terminal::ours_for_output ();

 
   /* If the target hasn't taken care of this already, do it now.
      Targets which need to access registers during to_open,
 
   /* If the target hasn't taken care of this already, do it now.
      Targets which need to access registers during to_open,


@@ -425,16 +444,19 @@ post_create_inferior (struct target_ops *target, int from_tty)
   /* Now that we know the register layout, retrieve current PC.  But
      if the PC is unavailable (e.g., we're opening a core file with
      missing registers info), ignore it.  */
   /* Now that we know the register layout, retrieve current PC.  But
      if the PC is unavailable (e.g., we're opening a core file with
      missing registers info), ignore it.  */

-  stop_pc = 0;
-  TRY_CATCH (ex, RETURN_MASK_ERROR)
+  thread_info *thr = inferior_thread ();
+
+  thr->suspend.stop_pc = 0;
+  TRY

     {
     {

-      stop_pc = regcache_read_pc (get_current_regcache ());
+      thr->suspend.stop_pc = regcache_read_pc (get_current_regcache ());

     }
     }

-  if (ex.reason < 0)
+  CATCH (ex, RETURN_MASK_ERROR)

     {
       if (ex.error != NOT_AVAILABLE_ERROR)
        throw_exception (ex);
     }
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
        throw_exception (ex);
     }

+  END_CATCH

 
   if (exec_bfd)
     {
 
   if (exec_bfd)
     {


@@ -459,7 +481,7 @@ post_create_inferior (struct target_ops *target, int from_tty)
          /* If the solist is global across processes, there's no need to
             refetch it here.  */
          if (!gdbarch_has_global_solist (target_gdbarch ()))
          /* If the solist is global across processes, there's no need to
             refetch it here.  */
          if (!gdbarch_has_global_solist (target_gdbarch ()))

-           solib_add (NULL, 0, target, auto_solib_add);
+           solib_add (NULL, 0, auto_solib_add);

        }
     }
 
        }
     }
 


@@ -475,7 +497,7 @@ post_create_inferior (struct target_ops *target, int from_tty)
      if the now pushed target supports hardware watchpoints.  */
   breakpoint_re_set ();
 
      if the now pushed target supports hardware watchpoints.  */
   breakpoint_re_set ();
 

-  observer_notify_inferior_created (target, from_tty);
+  gdb::observers::inferior_created.notify (target, from_tty);

 }
 
 /* Kill the inferior if already running.  This function is designed
 }
 
 /* Kill the inferior if already running.  This function is designed


@@ -486,7 +508,7 @@ post_create_inferior (struct target_ops *target, int from_tty)
 static void
 kill_if_already_running (int from_tty)
 {
 static void
 kill_if_already_running (int from_tty)
 {

-  if (! ptid_equal (inferior_ptid, null_ptid) && target_has_execution)
+  if (inferior_ptid != null_ptid && target_has_execution)

     {
       /* Bail out before killing the program if we will not be able to
         restart it.  */
     {
       /* Bail out before killing the program if we will not be able to
         restart it.  */


@@ -507,34 +529,43 @@ prepare_execution_command (struct target_ops *target, int background)
 {
   /* If we get a request for running in the bg but the target
      doesn't support it, error out.  */
 {
   /* If we get a request for running in the bg but the target
      doesn't support it, error out.  */

-  if (background && !target->to_can_async_p (target))
+  if (background && !target->can_async_p ())

     error (_("Asynchronous execution not supported on this target."));
 
     error (_("Asynchronous execution not supported on this target."));
 

-  /* If we don't get a request of running in the bg, then we need
-     to simulate synchronous (fg) execution.  */
-  if (!background && target->to_can_async_p (target))
+  if (!background)

     {
     {

-      /* Simulate synchronous execution.  Note no cleanup is necessary
-        for this.  stdin is re-enabled whenever an error reaches the
-        top level.  */
-      async_disable_stdin ();
+      /* If we get a request for running in the fg, then we need to
+        simulate synchronous (fg) execution.  Note no cleanup is
+        necessary for this.  stdin is re-enabled whenever an error
+        reaches the top level.  */
+      all_uis_on_sync_execution_starting ();

     }
 }
 
     }
 }
 

-/* Implement the "run" command.  If TBREAK_AT_MAIN is set, then insert
-   a temporary breakpoint at the begining of the main program before
-   running the program.  */
+/* Determine how the new inferior will behave.  */
+
+enum run_how
+  {
+    /* Run program without any explicit stop during startup.  */
+    RUN_NORMAL,
+
+    /* Stop at the beginning of the program's main function.  */
+    RUN_STOP_AT_MAIN,
+
+    /* Stop at the first instruction of the program.  */
+    RUN_STOP_AT_FIRST_INSN
+  };
+
+/* Implement the "run" command.  Force a stop during program start if
+   requested by RUN_HOW.  */

 
 static void
 
 static void

-run_command_1 (char *args, int from_tty, int tbreak_at_main)
+run_command_1 (const char *args, int from_tty, enum run_how run_how)

 {
 {

-  char *exec_file;
-  struct cleanup *old_chain;
-  ptid_t ptid;
+  const char *exec_file;

   struct ui_out *uiout = current_uiout;
   struct target_ops *run_target;
   int async_exec;
   struct ui_out *uiout = current_uiout;
   struct target_ops *run_target;
   int async_exec;

-  struct cleanup *args_chain;

 
   dont_repeat ();
 
 
   dont_repeat ();
 


@@ -557,8 +588,8 @@ run_command_1 (char *args, int from_tty, int tbreak_at_main)
   reopen_exec_file ();
   reread_symbols ();
 
   reopen_exec_file ();
   reread_symbols ();
 

-  args = strip_bg_char (args, &async_exec);
-  args_chain = make_cleanup (xfree, args);
+  gdb::unique_xmalloc_ptr<char> stripped = strip_bg_char (args, &async_exec);
+  args = stripped.get ();

 
   /* Do validation and preparation before possibly changing anything
      in the inferior.  */
 
   /* Do validation and preparation before possibly changing anything
      in the inferior.  */


@@ -567,16 +598,16 @@ run_command_1 (char *args, int from_tty, int tbreak_at_main)
 
   prepare_execution_command (run_target, async_exec);
 
 
   prepare_execution_command (run_target, async_exec);
 

-  if (non_stop && !run_target->to_supports_non_stop (run_target))
+  if (non_stop && !run_target->supports_non_stop ())

     error (_("The target does not support running in non-stop mode."));
 
   /* Done.  Can now set breakpoints, change inferior args, etc.  */
 
     error (_("The target does not support running in non-stop mode."));
 
   /* Done.  Can now set breakpoints, change inferior args, etc.  */
 

-  /* Insert the temporary breakpoint if a location was specified.  */
-  if (tbreak_at_main)
+  /* Insert temporary breakpoint in main function if requested.  */
+  if (run_how == RUN_STOP_AT_MAIN)

     tbreak_command (main_name (), 0);
 
     tbreak_command (main_name (), 0);
 

-  exec_file = (char *) get_exec_file (0);
+  exec_file = get_exec_file (0);

 
   /* We keep symbols from add-symbol-file, on the grounds that the
      user might want to add some symbols before running the program
 
   /* We keep symbols from add-symbol-file, on the grounds that the
      user might want to add some symbols before running the program


@@ -592,26 +623,24 @@ run_command_1 (char *args, int from_tty, int tbreak_at_main)
 
   if (from_tty)
     {
 
   if (from_tty)
     {

-      ui_out_field_string (uiout, NULL, "Starting program");
-      ui_out_text (uiout, ": ");
+      uiout->field_string (NULL, "Starting program");
+      uiout->text (": ");

       if (exec_file)
       if (exec_file)

-       ui_out_field_string (uiout, "execfile", exec_file);
-      ui_out_spaces (uiout, 1);
+       uiout->field_string ("execfile", exec_file);
+      uiout->spaces (1);

       /* We call get_inferior_args() because we might need to compute
         the value now.  */
       /* We call get_inferior_args() because we might need to compute
         the value now.  */

-      ui_out_field_string (uiout, "infargs", get_inferior_args ());
-      ui_out_text (uiout, "\n");
-      ui_out_flush (uiout);
+      uiout->field_string ("infargs", get_inferior_args ());
+      uiout->text ("\n");
+      uiout->flush ();

     }
 
     }
 

-  /* Done with ARGS.  */
-  do_cleanups (args_chain);
-

   /* We call get_inferior_args() because we might need to compute
      the value now.  */
   /* We call get_inferior_args() because we might need to compute
      the value now.  */

-  run_target->to_create_inferior (run_target, exec_file, get_inferior_args (),
-                                 environ_vector (current_inferior ()->environment),
-                                 from_tty);
+  run_target->create_inferior (exec_file,
+                              std::string (get_inferior_args ()),
+                              current_inferior ()->environment.envp (),
+                              from_tty);

   /* to_create_inferior should push the target, so after this point we
      shouldn't refer to run_target again.  */
   run_target = NULL;
   /* to_create_inferior should push the target, so after this point we
      shouldn't refer to run_target again.  */
   run_target = NULL;


@@ -622,43 +651,44 @@ run_command_1 (char *args, int from_tty, int tbreak_at_main)
      events --- the frontend shouldn't see them as stopped.  In
      all-stop, always finish the state of all threads, as we may be
      resuming more than just the new process.  */
      events --- the frontend shouldn't see them as stopped.  In
      all-stop, always finish the state of all threads, as we may be
      resuming more than just the new process.  */

-  if (non_stop)
-    ptid = pid_to_ptid (ptid_get_pid (inferior_ptid));
-  else
-    ptid = minus_one_ptid;
-  old_chain = make_cleanup (finish_thread_state_cleanup, &ptid);
+  ptid_t finish_ptid = (non_stop
+                       ? ptid_t (current_inferior ()->pid)
+                       : minus_one_ptid);
+  scoped_finish_thread_state finish_state (finish_ptid);

 
   /* Pass zero for FROM_TTY, because at this point the "run" command
      has done its thing; now we are setting up the running program.  */
 
   /* Pass zero for FROM_TTY, because at this point the "run" command
      has done its thing; now we are setting up the running program.  */

-  post_create_inferior (&current_target, 0);
+  post_create_inferior (current_top_target (), 0);
+
+  /* Queue a pending event so that the program stops immediately.  */
+  if (run_how == RUN_STOP_AT_FIRST_INSN)
+    {
+      thread_info *thr = inferior_thread ();
+      thr->suspend.waitstatus_pending_p = 1;
+      thr->suspend.waitstatus.kind = TARGET_WAITKIND_STOPPED;
+      thr->suspend.waitstatus.value.sig = GDB_SIGNAL_0;
+    }

 
   /* Start the target running.  Do not use -1 continuation as it would skip
      breakpoint right at the entry point.  */
 
   /* Start the target running.  Do not use -1 continuation as it would skip
      breakpoint right at the entry point.  */

-  proceed (regcache_read_pc (get_current_regcache ()), GDB_SIGNAL_0, 0);
+  proceed (regcache_read_pc (get_current_regcache ()), GDB_SIGNAL_0);

 
   /* Since there was no error, there's no need to finish the thread
      states here.  */
 
   /* Since there was no error, there's no need to finish the thread
      states here.  */

-  discard_cleanups (old_chain);
+  finish_state.release ();

 }
 
 static void
 }
 
 static void

-run_command (char *args, int from_tty)
+run_command (const char *args, int from_tty)

 {
 {

-  run_command_1 (args, from_tty, 0);
+  run_command_1 (args, from_tty, RUN_NORMAL);

 }
 
 }
 

-static void
-run_no_args_command (char *args, int from_tty)
-{
-  set_inferior_args ("");
-}
-\f
-

 /* Start the execution of the program up until the beginning of the main
    program.  */
 
 static void
 /* Start the execution of the program up until the beginning of the main
    program.  */
 
 static void

-start_command (char *args, int from_tty)
+start_command (const char *args, int from_tty)

 {
   /* Some languages such as Ada need to search inside the program
      minimal symbols for the location where to put the temporary
 {
   /* Some languages such as Ada need to search inside the program
      minimal symbols for the location where to put the temporary


@@ -667,7 +697,16 @@ start_command (char *args, int from_tty)
     error (_("No symbol table loaded.  Use the \"file\" command."));
 
   /* Run the program until reaching the main procedure...  */
     error (_("No symbol table loaded.  Use the \"file\" command."));
 
   /* Run the program until reaching the main procedure...  */

-  run_command_1 (args, from_tty, 1);
+  run_command_1 (args, from_tty, RUN_STOP_AT_MAIN);
+}
+
+/* Start the execution of the program stopping at the first
+   instruction.  */
+
+static void
+starti_command (const char *args, int from_tty)
+{
+  run_command_1 (args, from_tty, RUN_STOP_AT_FIRST_INSN);

 } 
 
 static int
 } 
 
 static int


@@ -682,20 +721,20 @@ proceed_thread_callback (struct thread_info *thread, void *arg)
      much.  If/when GDB gains a way to tell the target `hold this
      thread stopped until I say otherwise', then we can optimize
      this.  */
      much.  If/when GDB gains a way to tell the target `hold this
      thread stopped until I say otherwise', then we can optimize
      this.  */

-  if (!is_stopped (thread->ptid))
+  if (thread->state != THREAD_STOPPED)

     return 0;
 
     return 0;
 

-  switch_to_thread (thread->ptid);
+  switch_to_thread (thread);

   clear_proceed_status (0);
   clear_proceed_status (0);

-  proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT, 0);
+  proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);

   return 0;
 }
 
 static void
 ensure_valid_thread (void)
 {
   return 0;
 }
 
 static void
 ensure_valid_thread (void)
 {

-  if (ptid_equal (inferior_ptid, null_ptid)
-      || is_exited (inferior_ptid))
+  if (inferior_ptid == null_ptid
+      || inferior_thread ()->state == THREAD_EXITED)

     error (_("Cannot execute this command without a live selected thread."));
 }
 
     error (_("Cannot execute this command without a live selected thread."));
 }
 


@@ -724,7 +763,7 @@ error_is_running (void)
 static void
 ensure_not_running (void)
 {
 static void
 ensure_not_running (void)
 {

-  if (is_running (inferior_ptid))
+  if (inferior_thread ()->state == THREAD_RUNNING)

     error_is_running ();
 }
 
     error_is_running ();
 }
 


@@ -738,14 +777,14 @@ continue_1 (int all_threads)
     {
       /* Don't error out if the current thread is running, because
         there may be other stopped threads.  */
     {
       /* Don't error out if the current thread is running, because
         there may be other stopped threads.  */

-      struct cleanup *old_chain;

 
 

-      /* Backup current thread and selected frame.  */
-      old_chain = make_cleanup_restore_current_thread ();
+      /* Backup current thread and selected frame and restore on scope
+        exit.  */
+      scoped_restore_current_thread restore_thread;

 
       iterate_over_threads (proceed_thread_callback, NULL);
 
 
       iterate_over_threads (proceed_thread_callback, NULL);
 

-      if (sync_execution)
+      if (current_ui->prompt_state == PROMPT_BLOCKED)

        {
          /* If all threads in the target were already running,
             proceed_thread_callback ends up never calling proceed,
        {
          /* If all threads in the target were already running,
             proceed_thread_callback ends up never calling proceed,


@@ -760,37 +799,31 @@ continue_1 (int all_threads)
              Continuing.
              <no thread was resumed, but the inferior now owns the terminal>
          */
              Continuing.
              <no thread was resumed, but the inferior now owns the terminal>
          */

-         target_terminal_inferior ();
+         target_terminal::inferior ();

        }
        }

-
-      /* Restore selected ptid.  */
-      do_cleanups (old_chain);

     }
   else
     {
       ensure_valid_thread ();
       ensure_not_running ();
       clear_proceed_status (0);
     }
   else
     {
       ensure_valid_thread ();
       ensure_not_running ();
       clear_proceed_status (0);

-      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT, 0);
+      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);

     }
 }
 
 /* continue [-a] [proceed-count] [&]  */
 
 static void
     }
 }
 
 /* continue [-a] [proceed-count] [&]  */
 
 static void

-continue_command (char *args, int from_tty)
+continue_command (const char *args, int from_tty)

 {
   int async_exec;
   int all_threads = 0;
 {
   int async_exec;
   int all_threads = 0;

-  struct cleanup *args_chain;

 
   ERROR_NO_INFERIOR;
 
   /* Find out whether we must run in the background.  */
 
   ERROR_NO_INFERIOR;
 
   /* Find out whether we must run in the background.  */

-  args = strip_bg_char (args, &async_exec);
-  args_chain = make_cleanup (xfree, args);
-
-  prepare_execution_command (&current_target, async_exec);
+  gdb::unique_xmalloc_ptr<char> stripped = strip_bg_char (args, &async_exec);
+  args = stripped.get ();

 
   if (args != NULL)
     {
 
   if (args != NULL)
     {


@@ -820,7 +853,7 @@ continue_command (char *args, int from_tty)
       struct thread_info *tp;
 
       if (non_stop)
       struct thread_info *tp;
 
       if (non_stop)

-       tp = find_thread_ptid (inferior_ptid);
+       tp = inferior_thread ();

       else
        {
          ptid_t last_ptid;
       else
        {
          ptid_t last_ptid;


@@ -852,8 +885,16 @@ continue_command (char *args, int from_tty)
        }
     }
 
        }
     }
 

-  /* Done with ARGS.  */
-  do_cleanups (args_chain);
+  ERROR_NO_INFERIOR;
+  ensure_not_tfind_mode ();
+
+  if (!non_stop || !all_threads)
+    {
+      ensure_valid_thread ();
+      ensure_not_running ();
+    }
+
+  prepare_execution_command (current_top_target (), async_exec);

 
   if (from_tty)
     printf_filtered (_("Continuing.\n"));
 
   if (from_tty)
     printf_filtered (_("Continuing.\n"));


@@ -866,16 +907,20 @@ continue_command (char *args, int from_tty)
 static void
 set_step_frame (void)
 {
 static void
 set_step_frame (void)
 {

-  struct symtab_and_line sal;
+  frame_info *frame = get_current_frame ();
+
+  symtab_and_line sal = find_frame_sal (frame);
+  set_step_info (frame, sal);

 
 

-  find_frame_sal (get_current_frame (), &sal);
-  set_step_info (get_current_frame (), sal);
+  CORE_ADDR pc = get_frame_pc (frame);
+  thread_info *tp = inferior_thread ();
+  tp->control.step_start_function = find_pc_function (pc);

 }
 
 /* Step until outside of current statement.  */
 
 static void
 }
 
 /* Step until outside of current statement.  */
 
 static void

-step_command (char *count_string, int from_tty)
+step_command (const char *count_string, int from_tty)

 {
   step_1 (0, 0, count_string);
 }
 {
   step_1 (0, 0, count_string);
 }


@@ -883,7 +928,7 @@ step_command (char *count_string, int from_tty)
 /* Likewise, but skip over subroutine calls as if single instructions.  */
 
 static void
 /* Likewise, but skip over subroutine calls as if single instructions.  */
 
 static void

-next_command (char *count_string, int from_tty)
+next_command (const char *count_string, int from_tty)

 {
   step_1 (1, 0, count_string);
 }
 {
   step_1 (1, 0, count_string);
 }


@@ -891,13 +936,13 @@ next_command (char *count_string, int from_tty)
 /* Likewise, but step only one instruction.  */
 
 static void
 /* Likewise, but step only one instruction.  */
 
 static void

-stepi_command (char *count_string, int from_tty)
+stepi_command (const char *count_string, int from_tty)

 {
   step_1 (0, 1, count_string);
 }
 
 static void
 {
   step_1 (0, 1, count_string);
 }
 
 static void

-nexti_command (char *count_string, int from_tty)
+nexti_command (const char *count_string, int from_tty)

 {
   step_1 (1, 1, count_string);
 }
 {
   step_1 (1, 1, count_string);
 }


@@ -909,154 +954,199 @@ delete_longjmp_breakpoint_cleanup (void *arg)
   delete_longjmp_breakpoint (thread);
 }
 
   delete_longjmp_breakpoint (thread);
 }
 

+/* Data for the FSM that manages the step/next/stepi/nexti
+   commands.  */
+
+struct step_command_fsm
+{
+  /* The base class.  */
+  struct thread_fsm thread_fsm;
+
+  /* How many steps left in a "step N"-like command.  */
+  int count;
+
+  /* If true, this is a next/nexti, otherwise a step/stepi.  */
+  int skip_subroutines;
+
+  /* If true, this is a stepi/nexti, otherwise a step/step.  */
+  int single_inst;
+};
+
+static void step_command_fsm_clean_up (struct thread_fsm *self,
+                                      struct thread_info *thread);
+static int step_command_fsm_should_stop (struct thread_fsm *self,
+                                        struct thread_info *thread);
+static enum async_reply_reason
+  step_command_fsm_async_reply_reason (struct thread_fsm *self);
+
+/* step_command_fsm's vtable.  */
+
+static struct thread_fsm_ops step_command_fsm_ops =
+{
+  NULL,
+  step_command_fsm_clean_up,
+  step_command_fsm_should_stop,
+  NULL,        /* return_value */
+  step_command_fsm_async_reply_reason,
+};
+
+/* Allocate a new step_command_fsm.  */
+
+static struct step_command_fsm *
+new_step_command_fsm (struct interp *cmd_interp)
+{
+  struct step_command_fsm *sm;
+
+  sm = XCNEW (struct step_command_fsm);
+  thread_fsm_ctor (&sm->thread_fsm, &step_command_fsm_ops, cmd_interp);
+
+  return sm;
+}
+
+/* Prepare for a step/next/etc. command.  Any target resource
+   allocated here is undone in the FSM's clean_up method.  */
+
+static void
+step_command_fsm_prepare (struct step_command_fsm *sm,
+                         int skip_subroutines, int single_inst,
+                         int count, struct thread_info *thread)
+{
+  sm->skip_subroutines = skip_subroutines;
+  sm->single_inst = single_inst;
+  sm->count = count;
+
+  /* Leave the si command alone.  */
+  if (!sm->single_inst || sm->skip_subroutines)
+    set_longjmp_breakpoint (thread, get_frame_id (get_current_frame ()));
+
+  thread->control.stepping_command = 1;
+}
+
+static int prepare_one_step (struct step_command_fsm *sm);
+

 static void
 static void

-step_1 (int skip_subroutines, int single_inst, char *count_string)
+step_1 (int skip_subroutines, int single_inst, const char *count_string)

 {
 {

-  int count = 1;
-  struct cleanup *cleanups = make_cleanup (null_cleanup, NULL);
+  int count;

   int async_exec;
   int async_exec;

-  int thread = -1;
-  struct cleanup *args_chain;
+  struct thread_info *thr;
+  struct step_command_fsm *step_sm;

 
   ERROR_NO_INFERIOR;
   ensure_not_tfind_mode ();
   ensure_valid_thread ();
   ensure_not_running ();
 
 
   ERROR_NO_INFERIOR;
   ensure_not_tfind_mode ();
   ensure_valid_thread ();
   ensure_not_running ();
 

-  count_string = strip_bg_char (count_string, &async_exec);
-  args_chain = make_cleanup (xfree, count_string);
+  gdb::unique_xmalloc_ptr<char> stripped
+    = strip_bg_char (count_string, &async_exec);
+  count_string = stripped.get ();

 
 

-  prepare_execution_command (&current_target, async_exec);
+  prepare_execution_command (current_top_target (), async_exec);

 
   count = count_string ? parse_and_eval_long (count_string) : 1;
 
 
   count = count_string ? parse_and_eval_long (count_string) : 1;
 

-  /* Done with ARGS.  */
-  do_cleanups (args_chain);
+  clear_proceed_status (1);

 
 

-  if (!single_inst || skip_subroutines)                /* Leave si command alone.  */
-    {
-      struct thread_info *tp = inferior_thread ();
+  /* Setup the execution command state machine to handle all the COUNT
+     steps.  */
+  thr = inferior_thread ();
+  step_sm = new_step_command_fsm (command_interp ());
+  thr->thread_fsm = &step_sm->thread_fsm;

 
 

-      if (in_thread_list (inferior_ptid))
-       thread = pid_to_thread_id (inferior_ptid);
+  step_command_fsm_prepare (step_sm, skip_subroutines,
+                           single_inst, count, thr);

 
 

-      set_longjmp_breakpoint (tp, get_frame_id (get_current_frame ()));
+  /* Do only one step for now, before returning control to the event
+     loop.  Let the continuation figure out how many other steps we
+     need to do, and handle them one at the time, through
+     step_once.  */
+  if (!prepare_one_step (step_sm))
+    proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);
+  else
+    {
+      int proceeded;

 
 

-      make_cleanup (delete_longjmp_breakpoint_cleanup, &thread);
+      /* Stepped into an inline frame.  Pretend that we've
+        stopped.  */
+      thread_fsm_clean_up (thr->thread_fsm, thr);
+      proceeded = normal_stop ();
+      if (!proceeded)
+       inferior_event_handler (INF_EXEC_COMPLETE, NULL);
+      all_uis_check_sync_execution_done ();

     }
     }

+}

 
 

-  /* In synchronous case, all is well; each step_once call will step once.  */
-  if (!target_can_async_p ())
-    {
-      for (; count > 0; count--)
-       {
-         step_once (skip_subroutines, single_inst, count, thread);
+/* Implementation of the 'should_stop' FSM method for stepping
+   commands.  Called after we are done with one step operation, to
+   check whether we need to step again, before we print the prompt and
+   return control to the user.  If count is > 1, returns false, as we
+   will need to keep going.  */

 
 

-         if (!target_has_execution)
-           break;
-         else
-           {
-             struct thread_info *tp = inferior_thread ();
-
-             if (!tp->control.stop_step || !tp->step_multi)
-               {
-                 /* If we stopped for some reason that is not stepping
-                    there are no further steps to make.  */
-                 tp->step_multi = 0;
-                 break;
-               }
-           }
-       }
+static int
+step_command_fsm_should_stop (struct thread_fsm *self, struct thread_info *tp)
+{
+  struct step_command_fsm *sm = (struct step_command_fsm *) self;

 
 

-      do_cleanups (cleanups);
-    }
-  else
+  if (tp->control.stop_step)

     {
     {

-      /* In the case of an asynchronous target things get complicated;
-        do only one step for now, before returning control to the
-        event loop.  Let the continuation figure out how many other
-        steps we need to do, and handle them one at the time, through
-        step_once.  */
-      step_once (skip_subroutines, single_inst, count, thread);
+      /* There are more steps to make, and we did stop due to
+        ending a stepping range.  Do another step.  */
+      if (--sm->count > 0)
+       return prepare_one_step (sm);

 
 

-      /* We are running, and the continuation is installed.  It will
-        disable the longjmp breakpoint as appropriate.  */
-      discard_cleanups (cleanups);
+      thread_fsm_set_finished (self);

     }
     }

-}

 
 

-struct step_1_continuation_args
-{
-  int count;
-  int skip_subroutines;
-  int single_inst;
-  int thread;
-};
+  return 1;
+}

 
 

-/* Called after we are done with one step operation, to check whether
-   we need to step again, before we print the prompt and return control
-   to the user.  If count is > 1, we will need to do one more call to
-   proceed(), via step_once().  Basically it is like step_once and
-   step_1_continuation are co-recursive.  */
+/* Implementation of the 'clean_up' FSM method for stepping commands.  */

 
 static void
 
 static void

-step_1_continuation (void *args, int err)
+step_command_fsm_clean_up (struct thread_fsm *self, struct thread_info *thread)

 {
 {

-  struct step_1_continuation_args *a = args;
+  struct step_command_fsm *sm = (struct step_command_fsm *) self;

 
 

-  if (target_has_execution)
-    {
-      struct thread_info *tp;
+  if (!sm->single_inst || sm->skip_subroutines)
+    delete_longjmp_breakpoint (thread->global_num);
+}

 
 

-      tp = inferior_thread ();
-      if (!err
-         && tp->step_multi && tp->control.stop_step)
-       {
-         /* There are more steps to make, and we did stop due to
-            ending a stepping range.  Do another step.  */
-         step_once (a->skip_subroutines, a->single_inst,
-                    a->count - 1, a->thread);
-         return;
-       }
-      tp->step_multi = 0;
-    }
+/* Implementation of the 'async_reply_reason' FSM method for stepping
+   commands.  */

 
 

-  /* We either hit an error, or stopped for some reason that is
-     not stepping, or there are no further steps to make.
-     Cleanup.  */
-  if (!a->single_inst || a->skip_subroutines)
-    delete_longjmp_breakpoint (a->thread);
+static enum async_reply_reason
+step_command_fsm_async_reply_reason (struct thread_fsm *self)
+{
+  return EXEC_ASYNC_END_STEPPING_RANGE;

 }
 
 }
 

-/* Do just one step operation.  This is useful to implement the 'step
-   n' kind of commands.  In case of asynchronous targets, we will have
-   to set up a continuation to be done after the target stops (after
-   this one step).  For synch targets, the caller handles further
-   stepping.  */
+/* Prepare for one step in "step N".  The actual target resumption is
+   done by the caller.  Return true if we're done and should thus
+   report a stop to the user.  Returns false if the target needs to be
+   resumed.  */

 
 

-static void
-step_once (int skip_subroutines, int single_inst, int count, int thread)
+static int
+prepare_one_step (struct step_command_fsm *sm)

 {
 {

-  struct frame_info *frame = get_current_frame ();
-
-  if (count > 0)
+  if (sm->count > 0)

     {
     {

+      struct frame_info *frame = get_current_frame ();
+

       /* Don't assume THREAD is a valid thread id.  It is set to -1 if
         the longjmp breakpoint was not required.  Use the
         INFERIOR_PTID thread instead, which is the same thread when
         THREAD is set.  */
       struct thread_info *tp = inferior_thread ();
 
       /* Don't assume THREAD is a valid thread id.  It is set to -1 if
         the longjmp breakpoint was not required.  Use the
         INFERIOR_PTID thread instead, which is the same thread when
         THREAD is set.  */
       struct thread_info *tp = inferior_thread ();
 

-      clear_proceed_status (!skip_subroutines);

       set_step_frame ();
 
       set_step_frame ();
 

-      if (!single_inst)
+      if (!sm->single_inst)

        {
          CORE_ADDR pc;
 
          /* Step at an inlined function behaves like "down".  */
        {
          CORE_ADDR pc;
 
          /* Step at an inlined function behaves like "down".  */

-         if (!skip_subroutines
-             && inline_skipped_frames (inferior_ptid))
+         if (!sm->skip_subroutines
+             && inline_skipped_frames (tp))

            {
              ptid_t resume_ptid;
 
            {
              ptid_t resume_ptid;
 


@@ -1064,18 +1154,9 @@ step_once (int skip_subroutines, int single_inst, int count, int thread)
              resume_ptid = user_visible_resume_ptid (1);
              set_running (resume_ptid, 1);
 
              resume_ptid = user_visible_resume_ptid (1);
              set_running (resume_ptid, 1);
 

-             step_into_inline_frame (inferior_ptid);
-             if (count > 1)
-               step_once (skip_subroutines, single_inst, count - 1, thread);
-             else
-               {
-                 /* Pretend that we've stopped.  */
-                 normal_stop ();
-
-                 if (target_can_async_p ())
-                   inferior_event_handler (INF_EXEC_COMPLETE, NULL);
-               }
-             return;
+             step_into_inline_frame (tp);
+             sm->count--;
+             return prepare_one_step (sm);

            }
 
          pc = get_frame_pc (frame);
            }
 
          pc = get_frame_pc (frame);


@@ -1100,7 +1181,7 @@ step_once (int skip_subroutines, int single_inst, int count, int thread)
                                            &tp->control.step_range_end) == 0)
                error (_("Cannot find bounds of current function"));
 
                                            &tp->control.step_range_end) == 0)
                error (_("Cannot find bounds of current function"));
 

-             target_terminal_ours ();
+             target_terminal::ours_for_output ();

              printf_filtered (_("Single stepping until exit from function %s,"
                                 "\nwhich has no line number information.\n"),
                               name);
              printf_filtered (_("Single stepping until exit from function %s,"
                                 "\nwhich has no line number information.\n"),
                               name);


@@ -1110,51 +1191,35 @@ step_once (int skip_subroutines, int single_inst, int count, int thread)
        {
          /* Say we are stepping, but stop after one insn whatever it does.  */
          tp->control.step_range_start = tp->control.step_range_end = 1;
        {
          /* Say we are stepping, but stop after one insn whatever it does.  */
          tp->control.step_range_start = tp->control.step_range_end = 1;

-         if (!skip_subroutines)
+         if (!sm->skip_subroutines)

            /* It is stepi.
               Don't step over function calls, not even to functions lacking
               line numbers.  */
            tp->control.step_over_calls = STEP_OVER_NONE;
        }
 
            /* It is stepi.
               Don't step over function calls, not even to functions lacking
               line numbers.  */
            tp->control.step_over_calls = STEP_OVER_NONE;
        }
 

-      if (skip_subroutines)
+      if (sm->skip_subroutines)

        tp->control.step_over_calls = STEP_OVER_ALL;
 
        tp->control.step_over_calls = STEP_OVER_ALL;
 

-      tp->step_multi = (count > 1);
-      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT, 1);
-
-      /* For async targets, register a continuation to do any
-        additional steps.  For sync targets, the caller will handle
-        further stepping.  */
-      if (target_can_async_p ())
-       {
-         struct step_1_continuation_args *args;
-
-         args = xmalloc (sizeof (*args));
-         args->skip_subroutines = skip_subroutines;
-         args->single_inst = single_inst;
-         args->count = count;
-         args->thread = thread;
-
-         add_intermediate_continuation (tp, step_1_continuation, args, xfree);
-       }
+      return 0;

     }
     }

+
+  /* Done.  */
+  thread_fsm_set_finished (&sm->thread_fsm);
+  return 1;

 }
 
 \f
 /* Continue program at specified address.  */
 
 static void
 }
 
 \f
 /* Continue program at specified address.  */
 
 static void

-jump_command (char *arg, int from_tty)
+jump_command (const char *arg, int from_tty)

 {
   struct gdbarch *gdbarch = get_current_arch ();
   CORE_ADDR addr;
 {
   struct gdbarch *gdbarch = get_current_arch ();
   CORE_ADDR addr;

-  struct symtabs_and_lines sals;
-  struct symtab_and_line sal;

   struct symbol *fn;
   struct symbol *sfn;
   int async_exec;
   struct symbol *fn;
   struct symbol *sfn;
   int async_exec;

-  struct cleanup *args_chain;

 
   ERROR_NO_INFERIOR;
   ensure_not_tfind_mode ();
 
   ERROR_NO_INFERIOR;
   ensure_not_tfind_mode ();


@@ -1162,25 +1227,20 @@ jump_command (char *arg, int from_tty)
   ensure_not_running ();
 
   /* Find out whether we must run in the background.  */
   ensure_not_running ();
 
   /* Find out whether we must run in the background.  */

-  arg = strip_bg_char (arg, &async_exec);
-  args_chain = make_cleanup (xfree, arg);
+  gdb::unique_xmalloc_ptr<char> stripped = strip_bg_char (arg, &async_exec);
+  arg = stripped.get ();

 
 

-  prepare_execution_command (&current_target, async_exec);
+  prepare_execution_command (current_top_target (), async_exec);

 
   if (!arg)
     error_no_arg (_("starting address"));
 
 
   if (!arg)
     error_no_arg (_("starting address"));
 

-  sals = decode_line_with_last_displayed (arg, DECODE_LINE_FUNFIRSTLINE);
-  if (sals.nelts != 1)
-    {
-      error (_("Unreasonable jump request"));
-    }
+  std::vector<symtab_and_line> sals
+    = decode_line_with_last_displayed (arg, DECODE_LINE_FUNFIRSTLINE);
+  if (sals.size () != 1)
+    error (_("Unreasonable jump request"));

 
 

-  sal = sals.sals[0];
-  xfree (sals.sals);
-
-  /* Done with ARGS.  */
-  do_cleanups (args_chain);
+  symtab_and_line &sal = sals[0];

 
   if (sal.symtab == 0 && sal.pc == 0)
     error (_("No source file has been specified."));
 
   if (sal.symtab == 0 && sal.pc == 0)
     error (_("No source file has been specified."));


@@ -1228,33 +1288,16 @@ jump_command (char *arg, int from_tty)
     }
 
   clear_proceed_status (0);
     }
 
   clear_proceed_status (0);

-  proceed (addr, GDB_SIGNAL_0, 0);
+  proceed (addr, GDB_SIGNAL_0);

 }
 \f
 }
 \f

-
-/* Go to line or address in current procedure.  */
-
-static void
-go_command (char *line_no, int from_tty)
-{
-  if (line_no == (char *) NULL || !*line_no)
-    printf_filtered (_("Usage: go <location>\n"));
-  else
-    {
-      tbreak_command (line_no, from_tty);
-      jump_command (line_no, from_tty);
-    }
-}
-\f
-

 /* Continue program giving it specified signal.  */
 
 static void
 /* Continue program giving it specified signal.  */
 
 static void

-signal_command (char *signum_exp, int from_tty)
+signal_command (const char *signum_exp, int from_tty)

 {
   enum gdb_signal oursig;
   int async_exec;
 {
   enum gdb_signal oursig;
   int async_exec;

-  struct cleanup *args_chain;

 
   dont_repeat ();              /* Too dangerous.  */
   ERROR_NO_INFERIOR;
 
   dont_repeat ();              /* Too dangerous.  */
   ERROR_NO_INFERIOR;


@@ -1263,10 +1306,11 @@ signal_command (char *signum_exp, int from_tty)
   ensure_not_running ();
 
   /* Find out whether we must run in the background.  */
   ensure_not_running ();
 
   /* Find out whether we must run in the background.  */

-  signum_exp = strip_bg_char (signum_exp, &async_exec);
-  args_chain = make_cleanup (xfree, signum_exp);
+  gdb::unique_xmalloc_ptr<char> stripped
+    = strip_bg_char (signum_exp, &async_exec);
+  signum_exp = stripped.get ();

 
 

-  prepare_execution_command (&current_target, async_exec);
+  prepare_execution_command (current_top_target (), async_exec);

 
   if (!signum_exp)
     error_no_arg (_("signal number"));
 
   if (!signum_exp)
     error_no_arg (_("signal number"));


@@ -1305,9 +1349,9 @@ signal_command (char *signum_exp, int from_tty)
 
       ALL_NON_EXITED_THREADS (tp)
        {
 
       ALL_NON_EXITED_THREADS (tp)
        {

-         if (ptid_equal (tp->ptid, inferior_ptid))
+         if (tp->ptid == inferior_ptid)

            continue;
            continue;

-         if (!ptid_match (tp->ptid, resume_ptid))
+         if (!tp->ptid.matches (resume_ptid))

            continue;
 
          if (tp->suspend.stop_signal != GDB_SIGNAL_0
            continue;
 
          if (tp->suspend.stop_signal != GDB_SIGNAL_0


@@ -1315,8 +1359,8 @@ signal_command (char *signum_exp, int from_tty)
            {
              if (!must_confirm)
                printf_unfiltered (_("Note:\n"));
            {
              if (!must_confirm)
                printf_unfiltered (_("Note:\n"));

-             printf_unfiltered (_("  Thread %d previously stopped with signal %s, %s.\n"),
-                                tp->num,
+             printf_unfiltered (_("  Thread %s previously stopped with signal %s, %s.\n"),
+                                print_thread_id (tp),

                                 gdb_signal_to_name (tp->suspend.stop_signal),
                                 gdb_signal_to_string (tp->suspend.stop_signal));
              must_confirm = 1;
                                 gdb_signal_to_name (tp->suspend.stop_signal),
                                 gdb_signal_to_string (tp->suspend.stop_signal));
              must_confirm = 1;


@@ -1324,10 +1368,10 @@ signal_command (char *signum_exp, int from_tty)
        }
 
       if (must_confirm
        }
 
       if (must_confirm

-         && !query (_("Continuing thread %d (the current thread) with specified signal will\n"
+         && !query (_("Continuing thread %s (the current thread) with specified signal will\n"

                       "still deliver the signals noted above to their respective threads.\n"
                       "Continue anyway? "),
                       "still deliver the signals noted above to their respective threads.\n"
                       "Continue anyway? "),

-                    inferior_thread ()->num))
+                    print_thread_id (inferior_thread ())))

        error (_("Not confirmed."));
     }
 
        error (_("Not confirmed."));
     }
 


@@ -1341,13 +1385,13 @@ signal_command (char *signum_exp, int from_tty)
     }
 
   clear_proceed_status (0);
     }
 
   clear_proceed_status (0);

-  proceed ((CORE_ADDR) -1, oursig, 0);
+  proceed ((CORE_ADDR) -1, oursig);

 }
 
 /* Queue a signal to be delivered to the current thread.  */
 
 static void
 }
 
 /* Queue a signal to be delivered to the current thread.  */
 
 static void

-queue_signal_command (char *signum_exp, int from_tty)
+queue_signal_command (const char *signum_exp, int from_tty)

 {
   enum gdb_signal oursig;
   struct thread_info *tp;
 {
   enum gdb_signal oursig;
   struct thread_info *tp;


@@ -1384,22 +1428,80 @@ queue_signal_command (char *signum_exp, int from_tty)
   tp->suspend.stop_signal = oursig;
 }
 
   tp->suspend.stop_signal = oursig;
 }
 

-/* Continuation args to be passed to the "until" command
-   continuation.  */
-struct until_next_continuation_args
+/* Data for the FSM that manages the until (with no argument)
+   command.  */
+
+struct until_next_fsm

 {
 {

-  /* The thread that was current when the command was executed.  */
+  /* The base class.  */
+  struct thread_fsm thread_fsm;
+
+  /* The thread that as current when the command was executed.  */

   int thread;
 };
 
   int thread;
 };
 

-/* A continuation callback for until_next_command.  */
+static int until_next_fsm_should_stop (struct thread_fsm *self,
+                                      struct thread_info *thread);
+static void until_next_fsm_clean_up (struct thread_fsm *self,
+                                    struct thread_info *thread);
+static enum async_reply_reason
+  until_next_fsm_async_reply_reason (struct thread_fsm *self);
+
+/* until_next_fsm's vtable.  */
+
+static struct thread_fsm_ops until_next_fsm_ops =
+{
+  NULL, /* dtor */
+  until_next_fsm_clean_up,
+  until_next_fsm_should_stop,
+  NULL, /* return_value */
+  until_next_fsm_async_reply_reason,
+};
+
+/* Allocate a new until_next_fsm.  */
+
+static struct until_next_fsm *
+new_until_next_fsm (struct interp *cmd_interp, int thread)
+{
+  struct until_next_fsm *sm;
+
+  sm = XCNEW (struct until_next_fsm);
+  thread_fsm_ctor (&sm->thread_fsm, &until_next_fsm_ops, cmd_interp);
+
+  sm->thread = thread;
+
+  return sm;
+}
+
+/* Implementation of the 'should_stop' FSM method for the until (with
+   no arg) command.  */
+
+static int
+until_next_fsm_should_stop (struct thread_fsm *self,
+                           struct thread_info *tp)
+{
+  if (tp->control.stop_step)
+    thread_fsm_set_finished (self);
+
+  return 1;
+}
+
+/* Implementation of the 'clean_up' FSM method for the until (with no
+   arg) command.  */

 
 static void
 
 static void

-until_next_continuation (void *arg, int err)
+until_next_fsm_clean_up (struct thread_fsm *self, struct thread_info *thread)

 {
 {

-  struct until_next_continuation_args *a = arg;
+  delete_longjmp_breakpoint (thread->global_num);
+}

 
 

-  delete_longjmp_breakpoint (a->thread);
+/* Implementation of the 'async_reply_reason' FSM method for the until
+   (with no arg) command.  */
+
+static enum async_reply_reason
+until_next_fsm_async_reply_reason (struct thread_fsm *self)
+{
+  return EXEC_ASYNC_END_STEPPING_RANGE;

 }
 
 /* Proceed until we reach a different source line with pc greater than
 }
 
 /* Proceed until we reach a different source line with pc greater than


@@ -1418,8 +1520,9 @@ until_next_command (int from_tty)
   struct symbol *func;
   struct symtab_and_line sal;
   struct thread_info *tp = inferior_thread ();
   struct symbol *func;
   struct symtab_and_line sal;
   struct thread_info *tp = inferior_thread ();

-  int thread = tp->num;
+  int thread = tp->global_num;

   struct cleanup *old_chain;
   struct cleanup *old_chain;

+  struct until_next_fsm *sm;

 
   clear_proceed_status (0);
   set_step_frame ();
 
   clear_proceed_status (0);
   set_step_frame ();


@@ -1456,32 +1559,20 @@ until_next_command (int from_tty)
 
   tp->control.step_over_calls = STEP_OVER_ALL;
 
 
   tp->control.step_over_calls = STEP_OVER_ALL;
 

-  tp->step_multi = 0;          /* Only one call to proceed */
-

   set_longjmp_breakpoint (tp, get_frame_id (frame));
   old_chain = make_cleanup (delete_longjmp_breakpoint_cleanup, &thread);
 
   set_longjmp_breakpoint (tp, get_frame_id (frame));
   old_chain = make_cleanup (delete_longjmp_breakpoint_cleanup, &thread);
 

-  proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT, 1);
-
-  if (target_can_async_p () && is_running (inferior_ptid))
-    {
-      struct until_next_continuation_args *cont_args;
-
-      discard_cleanups (old_chain);
-      cont_args = XNEW (struct until_next_continuation_args);
-      cont_args->thread = inferior_thread ()->num;
+  sm = new_until_next_fsm (command_interp (), tp->global_num);
+  tp->thread_fsm = &sm->thread_fsm;
+  discard_cleanups (old_chain);

 
 

-      add_continuation (tp, until_next_continuation, cont_args, xfree);
-    }
-  else
-    do_cleanups (old_chain);
+  proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);

 }
 
 static void
 }
 
 static void

-until_command (char *arg, int from_tty)
+until_command (const char *arg, int from_tty)

 {
   int async_exec;
 {
   int async_exec;

-  struct cleanup *args_chain;

 
   ERROR_NO_INFERIOR;
   ensure_not_tfind_mode ();
 
   ERROR_NO_INFERIOR;
   ensure_not_tfind_mode ();


@@ -1489,25 +1580,21 @@ until_command (char *arg, int from_tty)
   ensure_not_running ();
 
   /* Find out whether we must run in the background.  */
   ensure_not_running ();
 
   /* Find out whether we must run in the background.  */

-  arg = strip_bg_char (arg, &async_exec);
-  args_chain = make_cleanup (xfree, arg);
+  gdb::unique_xmalloc_ptr<char> stripped = strip_bg_char (arg, &async_exec);
+  arg = stripped.get ();

 
 

-  prepare_execution_command (&current_target, async_exec);
+  prepare_execution_command (current_top_target (), async_exec);

 
   if (arg)
     until_break_command (arg, from_tty, 0);
   else
     until_next_command (from_tty);
 
   if (arg)
     until_break_command (arg, from_tty, 0);
   else
     until_next_command (from_tty);

-
-  /* Done with ARGS.  */
-  do_cleanups (args_chain);

 }
 
 static void
 }
 
 static void

-advance_command (char *arg, int from_tty)
+advance_command (const char *arg, int from_tty)

 {
   int async_exec;
 {
   int async_exec;

-  struct cleanup *args_chain;

 
   ERROR_NO_INFERIOR;
   ensure_not_tfind_mode ();
 
   ERROR_NO_INFERIOR;
   ensure_not_tfind_mode ();


@@ -1518,38 +1605,26 @@ advance_command (char *arg, int from_tty)
     error_no_arg (_("a location"));
 
   /* Find out whether we must run in the background.  */
     error_no_arg (_("a location"));
 
   /* Find out whether we must run in the background.  */

-  arg = strip_bg_char (arg, &async_exec);
-  args_chain = make_cleanup (xfree, arg);
+  gdb::unique_xmalloc_ptr<char> stripped = strip_bg_char (arg, &async_exec);
+  arg = stripped.get ();

 
 

-  prepare_execution_command (&current_target, async_exec);
+  prepare_execution_command (current_top_target (), async_exec);

 
   until_break_command (arg, from_tty, 1);
 
   until_break_command (arg, from_tty, 1);

-
-  /* Done with ARGS.  */
-  do_cleanups (args_chain);

 }
 \f
 /* Return the value of the result of a function at the end of a 'finish'
 }
 \f
 /* Return the value of the result of a function at the end of a 'finish'

-   command/BP.  */
+   command/BP.  DTOR_DATA (if not NULL) can represent inferior registers
+   right after an inferior call has finished.  */

 
 struct value *
 get_return_value (struct value *function, struct type *value_type)
 {
 
 struct value *
 get_return_value (struct value *function, struct type *value_type)
 {

-  struct regcache *stop_regs = stop_registers;
-  struct gdbarch *gdbarch;
+  regcache *stop_regs = get_current_regcache ();
+  struct gdbarch *gdbarch = stop_regs->arch ();

   struct value *value;
   struct value *value;

-  struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
-
-  /* If stop_registers were not saved, use the current registers.  */
-  if (!stop_regs)
-    {
-      stop_regs = regcache_dup (get_current_regcache ());
-      make_cleanup_regcache_xfree (stop_regs);
-    }

 
 

-  gdbarch = get_regcache_arch (stop_regs);
-
-  CHECK_TYPEDEF (value_type);
+  value_type = check_typedef (value_type);

   gdb_assert (TYPE_CODE (value_type) != TYPE_CODE_VOID);
 
   /* FIXME: 2003-09-27: When returning from a nested inferior function
   gdb_assert (TYPE_CODE (value_type) != TYPE_CODE_VOID);
 
   /* FIXME: 2003-09-27: When returning from a nested inferior function


@@ -1576,136 +1651,223 @@ get_return_value (struct value *function, struct type *value_type)
       internal_error (__FILE__, __LINE__, _("bad switch"));
     }
 
       internal_error (__FILE__, __LINE__, _("bad switch"));
     }
 

-  do_cleanups (cleanup);
-

   return value;
 }
 
   return value;
 }
 

-/* Print the result of a function at the end of a 'finish' command.  */
+/* The captured function return value/type and its position in the
+   value history.  */

 
 

-static void
-print_return_value (struct value *function, struct type *value_type)
+struct return_value_info

 {
 {

-  struct value *value = get_return_value (function, value_type);
-  struct ui_out *uiout = current_uiout;
+  /* The captured return value.  May be NULL if we weren't able to
+     retrieve it.  See get_return_value.  */
+  struct value *value;

 
 

-  if (value)
+  /* The return type.  In some cases, we'll not be able extract the
+     return value, but we always know the type.  */
+  struct type *type;
+
+  /* If we captured a value, this is the value history index.  */
+  int value_history_index;
+};
+
+/* Helper for print_return_value.  */
+
+static void
+print_return_value_1 (struct ui_out *uiout, struct return_value_info *rv)
+{
+  if (rv->value != NULL)

     {
       struct value_print_options opts;
     {
       struct value_print_options opts;

-      struct ui_file *stb;
-      struct cleanup *old_chain;

 
       /* Print it.  */
 
       /* Print it.  */

-      stb = mem_fileopen ();
-      old_chain = make_cleanup_ui_file_delete (stb);
-      ui_out_text (uiout, "Value returned is ");
-      ui_out_field_fmt (uiout, "gdb-result-var", "$%d",
-                       record_latest_value (value));
-      ui_out_text (uiout, " = ");
-      get_no_prettyformat_print_options (&opts);
-      value_print (value, stb, &opts);
-      ui_out_field_stream (uiout, "return-value", stb);
-      ui_out_text (uiout, "\n");
-      do_cleanups (old_chain);
+      uiout->text ("Value returned is ");
+      uiout->field_fmt ("gdb-result-var", "$%d",
+                        rv->value_history_index);
+      uiout->text (" = ");
+      get_user_print_options (&opts);
+
+      string_file stb;
+
+      value_print (rv->value, &stb, &opts);
+      uiout->field_stream ("return-value", stb);
+      uiout->text ("\n");

     }
   else
     {
     }
   else
     {

-      struct cleanup *oldchain;
-      char *type_name;
+      std::string type_name = type_to_string (rv->type);
+      uiout->text ("Value returned has type: ");
+      uiout->field_string ("return-type", type_name.c_str ());
+      uiout->text (".");
+      uiout->text (" Cannot determine contents\n");
+    }
+}
+
+/* Print the result of a function at the end of a 'finish' command.
+   RV points at an object representing the captured return value/type
+   and its position in the value history.  */

 
 

-      type_name = type_to_string (value_type);
-      oldchain = make_cleanup (xfree, type_name);
-      ui_out_text (uiout, "Value returned has type: ");
-      ui_out_field_string (uiout, "return-type", type_name);
-      ui_out_text (uiout, ".");
-      ui_out_text (uiout, " Cannot determine contents\n");
-      do_cleanups (oldchain);
+void
+print_return_value (struct ui_out *uiout, struct return_value_info *rv)
+{
+  if (rv->type == NULL || TYPE_CODE (rv->type) == TYPE_CODE_VOID)
+    return;
+
+  TRY
+    {
+      /* print_return_value_1 can throw an exception in some
+        circumstances.  We need to catch this so that we still
+        delete the breakpoint.  */
+      print_return_value_1 (uiout, rv);
+    }
+  CATCH (ex, RETURN_MASK_ALL)
+    {
+      exception_print (gdb_stdout, ex);

     }
     }

+  END_CATCH

 }
 
 }
 

-/* Stuff that needs to be done by the finish command after the target
-   has stopped.  In asynchronous mode, we wait for the target to stop
-   in the call to poll or select in the event loop, so it is
-   impossible to do all the stuff as part of the finish_command
-   function itself.  The only chance we have to complete this command
-   is in fetch_inferior_event, which is called by the event loop as
-   soon as it detects that the target has stopped.  */
+/* Data for the FSM that manages the finish command.  */

 
 

-struct finish_command_continuation_args
+struct finish_command_fsm

 {
 {

-  /* The thread that as current when the command was executed.  */
-  int thread;
+  /* The base class.  */
+  struct thread_fsm thread_fsm;
+
+  /* The momentary breakpoint set at the function's return address in
+     the caller.  */

   struct breakpoint *breakpoint;
   struct breakpoint *breakpoint;

+
+  /* The function that we're stepping out of.  */

   struct symbol *function;
   struct symbol *function;

+
+  /* If the FSM finishes successfully, this stores the function's
+     return value.  */
+  struct return_value_info return_value;

 };
 
 };
 

-static void
-finish_command_continuation (void *arg, int err)
+static int finish_command_fsm_should_stop (struct thread_fsm *self,
+                                          struct thread_info *thread);
+static void finish_command_fsm_clean_up (struct thread_fsm *self,
+                                        struct thread_info *thread);
+static struct return_value_info *
+  finish_command_fsm_return_value (struct thread_fsm *self);
+static enum async_reply_reason
+  finish_command_fsm_async_reply_reason (struct thread_fsm *self);
+
+/* finish_command_fsm's vtable.  */
+
+static struct thread_fsm_ops finish_command_fsm_ops =
+{
+  NULL, /* dtor */
+  finish_command_fsm_clean_up,
+  finish_command_fsm_should_stop,
+  finish_command_fsm_return_value,
+  finish_command_fsm_async_reply_reason,
+  NULL, /* should_notify_stop */
+};
+
+/* Allocate a new finish_command_fsm.  */
+
+static struct finish_command_fsm *
+new_finish_command_fsm (struct interp *cmd_interp)
+{
+  struct finish_command_fsm *sm;
+
+  sm = XCNEW (struct finish_command_fsm);
+  thread_fsm_ctor (&sm->thread_fsm, &finish_command_fsm_ops, cmd_interp);
+
+  return sm;
+}
+
+/* Implementation of the 'should_stop' FSM method for the finish
+   commands.  Detects whether the thread stepped out of the function
+   successfully, and if so, captures the function's return value and
+   marks the FSM finished.  */
+
+static int
+finish_command_fsm_should_stop (struct thread_fsm *self,
+                               struct thread_info *tp)

 {
 {

-  struct finish_command_continuation_args *a = arg;
+  struct finish_command_fsm *f = (struct finish_command_fsm *) self;
+  struct return_value_info *rv = &f->return_value;

 
 

-  if (!err)
+  if (f->function != NULL
+      && bpstat_find_breakpoint (tp->control.stop_bpstat,
+                                f->breakpoint) != NULL)

     {
     {

-      struct thread_info *tp = NULL;
-      bpstat bs = NULL;
+      /* We're done.  */
+      thread_fsm_set_finished (self);

 
 

-      if (!ptid_equal (inferior_ptid, null_ptid)
-         && target_has_execution
-         && is_stopped (inferior_ptid))
-       {
-         tp = inferior_thread ();
-         bs = tp->control.stop_bpstat;
-       }
+      rv->type = TYPE_TARGET_TYPE (SYMBOL_TYPE (f->function));
+      if (rv->type == NULL)
+       internal_error (__FILE__, __LINE__,
+                       _("finish_command: function has no target type"));

 
 

-      if (bpstat_find_breakpoint (bs, a->breakpoint) != NULL
-         && a->function != NULL)
+      if (TYPE_CODE (rv->type) != TYPE_CODE_VOID)

        {
        {

-         struct type *value_type;
+         struct value *func;

 
 

-         value_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (a->function));
-         if (!value_type)
-           internal_error (__FILE__, __LINE__,
-                           _("finish_command: function has no target type"));
+         func = read_var_value (f->function, NULL, get_current_frame ());
+         rv->value = get_return_value (func, rv->type);
+         if (rv->value != NULL)
+           rv->value_history_index = record_latest_value (rv->value);
+       }
+    }
+  else if (tp->control.stop_step)
+    {
+      /* Finishing from an inline frame, or reverse finishing.  In
+        either case, there's no way to retrieve the return value.  */
+      thread_fsm_set_finished (self);
+    }

 
 

-         if (TYPE_CODE (value_type) != TYPE_CODE_VOID)
-           {
-             volatile struct gdb_exception ex;
-             struct value *func;
+  return 1;
+}

 
 

-             func = read_var_value (a->function, get_current_frame ());
-             TRY_CATCH (ex, RETURN_MASK_ALL)
-               {
-                 /* print_return_value can throw an exception in some
-                    circumstances.  We need to catch this so that we still
-                    delete the breakpoint.  */
-                 print_return_value (func, value_type);
-               }
-             if (ex.reason < 0)
-               exception_print (gdb_stdout, ex);
-           }
-       }
+/* Implementation of the 'clean_up' FSM method for the finish
+   commands.  */
+
+static void
+finish_command_fsm_clean_up (struct thread_fsm *self,
+                            struct thread_info *thread)
+{
+  struct finish_command_fsm *f = (struct finish_command_fsm *) self;

 
 

-      /* We suppress normal call of normal_stop observer and do it
-        here so that the *stopped notification includes the return
-        value.  */
-      if (bs != NULL && tp->control.proceed_to_finish)
-       observer_notify_normal_stop (bs, 1 /* print frame */);
+  if (f->breakpoint != NULL)
+    {
+      delete_breakpoint (f->breakpoint);
+      f->breakpoint = NULL;

     }
     }

+  delete_longjmp_breakpoint (thread->global_num);
+}
+
+/* Implementation of the 'return_value' FSM method for the finish
+   commands.  */

 
 

-  delete_breakpoint (a->breakpoint);
-  delete_longjmp_breakpoint (a->thread);
+static struct return_value_info *
+finish_command_fsm_return_value (struct thread_fsm *self)
+{
+  struct finish_command_fsm *f = (struct finish_command_fsm *) self;
+
+  return &f->return_value;

 }
 
 }
 

-static void
-finish_command_continuation_free_arg (void *arg)
+/* Implementation of the 'async_reply_reason' FSM method for the
+   finish commands.  */
+
+static enum async_reply_reason
+finish_command_fsm_async_reply_reason (struct thread_fsm *self)

 {
 {

-  xfree (arg);
+  if (execution_direction == EXEC_REVERSE)
+    return EXEC_ASYNC_END_STEPPING_RANGE;
+  else
+    return EXEC_ASYNC_FUNCTION_FINISHED;

 }
 
 /* finish_backward -- helper function for finish_command.  */
 
 static void
 }
 
 /* finish_backward -- helper function for finish_command.  */
 
 static void

-finish_backward (struct symbol *function)
+finish_backward (struct finish_command_fsm *sm)

 {
   struct symtab_and_line sal;
   struct thread_info *tp = inferior_thread ();
 {
   struct symtab_and_line sal;
   struct thread_info *tp = inferior_thread ();


@@ -1733,82 +1895,89 @@ finish_backward (struct symbol *function)
     {
       struct frame_info *frame = get_selected_frame (NULL);
       struct gdbarch *gdbarch = get_frame_arch (frame);
     {
       struct frame_info *frame = get_selected_frame (NULL);
       struct gdbarch *gdbarch = get_frame_arch (frame);

-      struct symtab_and_line sr_sal;

 
       /* Set a step-resume at the function's entry point.  Once that's
         hit, we'll do one more step backwards.  */
 
       /* Set a step-resume at the function's entry point.  Once that's
         hit, we'll do one more step backwards.  */

-      init_sal (&sr_sal);
+      symtab_and_line sr_sal;

       sr_sal.pc = sal.pc;
       sr_sal.pspace = get_frame_program_space (frame);
       insert_step_resume_breakpoint_at_sal (gdbarch,
                                            sr_sal, null_frame_id);
 
       sr_sal.pc = sal.pc;
       sr_sal.pspace = get_frame_program_space (frame);
       insert_step_resume_breakpoint_at_sal (gdbarch,
                                            sr_sal, null_frame_id);
 

-      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT, 0);
+      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);

     }
   else
     {
       /* We're almost there -- we just need to back up by one more
         single-step.  */
       tp->control.step_range_start = tp->control.step_range_end = 1;
     }
   else
     {
       /* We're almost there -- we just need to back up by one more
         single-step.  */
       tp->control.step_range_start = tp->control.step_range_end = 1;

-      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT, 1);
+      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);

     }
 }
 
     }
 }
 

-/* finish_forward -- helper function for finish_command.  */
+/* finish_forward -- helper function for finish_command.  FRAME is the
+   frame that called the function we're about to step out of.  */

 
 static void
 
 static void

-finish_forward (struct symbol *function, struct frame_info *frame)
+finish_forward (struct finish_command_fsm *sm, struct frame_info *frame)

 {
   struct frame_id frame_id = get_frame_id (frame);
   struct gdbarch *gdbarch = get_frame_arch (frame);
   struct symtab_and_line sal;
   struct thread_info *tp = inferior_thread ();
 {
   struct frame_id frame_id = get_frame_id (frame);
   struct gdbarch *gdbarch = get_frame_arch (frame);
   struct symtab_and_line sal;
   struct thread_info *tp = inferior_thread ();

-  struct breakpoint *breakpoint;
-  struct cleanup *old_chain;
-  struct finish_command_continuation_args *cargs;
-  int thread = tp->num;

 
   sal = find_pc_line (get_frame_pc (frame), 0);
   sal.pc = get_frame_pc (frame);
 
 
   sal = find_pc_line (get_frame_pc (frame), 0);
   sal.pc = get_frame_pc (frame);
 

-  breakpoint = set_momentary_breakpoint (gdbarch, sal,
-                                        get_stack_frame_id (frame),
-                                         bp_finish);
+  sm->breakpoint = set_momentary_breakpoint (gdbarch, sal,
+                                            get_stack_frame_id (frame),
+                                            bp_finish).release ();

 
   /* set_momentary_breakpoint invalidates FRAME.  */
   frame = NULL;
 
 
   /* set_momentary_breakpoint invalidates FRAME.  */
   frame = NULL;
 

-  old_chain = make_cleanup_delete_breakpoint (breakpoint);
-

   set_longjmp_breakpoint (tp, frame_id);
   set_longjmp_breakpoint (tp, frame_id);

-  make_cleanup (delete_longjmp_breakpoint_cleanup, &thread);

 
 

-  /* We want stop_registers, please...  */
+  /* We want to print return value, please...  */

   tp->control.proceed_to_finish = 1;
   tp->control.proceed_to_finish = 1;

-  cargs = xmalloc (sizeof (*cargs));

 
 

-  cargs->thread = thread;
-  cargs->breakpoint = breakpoint;
-  cargs->function = function;
-  add_continuation (tp, finish_command_continuation, cargs,
-                    finish_command_continuation_free_arg);
-  proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT, 0);
+  proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);
+}

 
 

-  discard_cleanups (old_chain);
-  if (!target_can_async_p ())
-    do_all_continuations (0);
+/* Skip frames for "finish".  */
+
+static struct frame_info *
+skip_finish_frames (struct frame_info *frame)
+{
+  struct frame_info *start;
+
+  do
+    {
+      start = frame;
+
+      frame = skip_tailcall_frames (frame);
+      if (frame == NULL)
+       break;
+
+      frame = skip_unwritable_frames (frame);
+      if (frame == NULL)
+       break;
+    }
+  while (start != frame);
+
+  return frame;

 }
 
 /* "finish": Set a temporary breakpoint at the place the selected
    frame will return to, then continue.  */
 
 static void
 }
 
 /* "finish": Set a temporary breakpoint at the place the selected
    frame will return to, then continue.  */
 
 static void

-finish_command (char *arg, int from_tty)
+finish_command (const char *arg, int from_tty)

 {
   struct frame_info *frame;
 {
   struct frame_info *frame;

-  struct symbol *function;

   int async_exec;
   int async_exec;

-  struct cleanup *args_chain;
+  struct finish_command_fsm *sm;
+  struct thread_info *tp;

 
   ERROR_NO_INFERIOR;
   ensure_not_tfind_mode ();
 
   ERROR_NO_INFERIOR;
   ensure_not_tfind_mode ();


@@ -1816,26 +1985,28 @@ finish_command (char *arg, int from_tty)
   ensure_not_running ();
 
   /* Find out whether we must run in the background.  */
   ensure_not_running ();
 
   /* Find out whether we must run in the background.  */

-  arg = strip_bg_char (arg, &async_exec);
-  args_chain = make_cleanup (xfree, arg);
+  gdb::unique_xmalloc_ptr<char> stripped = strip_bg_char (arg, &async_exec);
+  arg = stripped.get ();

 
 

-  prepare_execution_command (&current_target, async_exec);
+  prepare_execution_command (current_top_target (), async_exec);

 
   if (arg)
     error (_("The \"finish\" command does not take any arguments."));
 
 
   if (arg)
     error (_("The \"finish\" command does not take any arguments."));
 

-  /* Done with ARGS.  */
-  do_cleanups (args_chain);
-

   frame = get_prev_frame (get_selected_frame (_("No selected frame.")));
   if (frame == 0)
     error (_("\"finish\" not meaningful in the outermost frame."));
 
   clear_proceed_status (0);
 
   frame = get_prev_frame (get_selected_frame (_("No selected frame.")));
   if (frame == 0)
     error (_("\"finish\" not meaningful in the outermost frame."));
 
   clear_proceed_status (0);
 

+  tp = inferior_thread ();
+
+  sm = new_finish_command_fsm (command_interp ());
+
+  tp->thread_fsm = &sm->thread_fsm;
+

   /* Finishing from an inline frame is completely different.  We don't
   /* Finishing from an inline frame is completely different.  We don't

-     try to show the "return value" - no way to locate it.  So we do
-     not need a completion.  */
+     try to show the "return value" - no way to locate it.  */

   if (get_frame_type (get_selected_frame (_("No selected frame.")))
       == INLINE_FRAME)
     {
   if (get_frame_type (get_selected_frame (_("No selected frame.")))
       == INLINE_FRAME)
     {


@@ -1844,11 +2015,7 @@ finish_command (char *arg, int from_tty)
         called by that frame.  We don't use the magic "1" value for
         step_range_end, because then infrun will think this is nexti,
         and not step over the rest of this inlined function call.  */
         called by that frame.  We don't use the magic "1" value for
         step_range_end, because then infrun will think this is nexti,
         and not step over the rest of this inlined function call.  */

-      struct thread_info *tp = inferior_thread ();
-      struct symtab_and_line empty_sal;
-
-      init_sal (&empty_sal);
-      set_step_info (frame, empty_sal);
+      set_step_info (frame, {});

       tp->control.step_range_start = get_frame_pc (frame);
       tp->control.step_range_end = tp->control.step_range_start;
       tp->control.step_over_calls = STEP_OVER_ALL;
       tp->control.step_range_start = get_frame_pc (frame);
       tp->control.step_range_end = tp->control.step_range_start;
       tp->control.step_over_calls = STEP_OVER_ALL;


@@ -1861,18 +2028,13 @@ finish_command (char *arg, int from_tty)
          print_stack_frame (get_selected_frame (NULL), 1, LOCATION, 0);
        }
 
          print_stack_frame (get_selected_frame (NULL), 1, LOCATION, 0);
        }
 

-      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT, 1);
+      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);

       return;
     }
 
       return;
     }
 

-  /* Ignore TAILCALL_FRAME type frames, they were executed already before
-     entering THISFRAME.  */
-  while (get_frame_type (frame) == TAILCALL_FRAME)
-    frame = get_prev_frame (frame);
-

   /* Find the function we will return from.  */
 
   /* Find the function we will return from.  */
 

-  function = find_pc_function (get_frame_pc (get_selected_frame (NULL)));
+  sm->function = find_pc_function (get_frame_pc (get_selected_frame (NULL)));

 
   /* Print info on the selected frame, including level number but not
      source.  */
 
   /* Print info on the selected frame, including level number but not
      source.  */


@@ -1882,10 +2044,10 @@ finish_command (char *arg, int from_tty)
        printf_filtered (_("Run back to call of "));
       else
        {
        printf_filtered (_("Run back to call of "));
       else
        {

-         if (function != NULL && TYPE_NO_RETURN (function->type)
+         if (sm->function != NULL && TYPE_NO_RETURN (sm->function->type)

              && !query (_("warning: Function %s does not return normally.\n"
                           "Try to finish anyway? "),
              && !query (_("warning: Function %s does not return normally.\n"
                           "Try to finish anyway? "),

-                        SYMBOL_PRINT_NAME (function)))
+                        SYMBOL_PRINT_NAME (sm->function)))

            error (_("Not confirmed."));
          printf_filtered (_("Run till exit from "));
        }
            error (_("Not confirmed."));
          printf_filtered (_("Run till exit from "));
        }


@@ -1894,18 +2056,24 @@ finish_command (char *arg, int from_tty)
     }
 
   if (execution_direction == EXEC_REVERSE)
     }
 
   if (execution_direction == EXEC_REVERSE)

-    finish_backward (function);
+    finish_backward (sm);

   else
   else

-    finish_forward (function, frame);
+    {
+      frame = skip_finish_frames (frame);
+
+      if (frame == NULL)
+       error (_("Cannot find the caller frame."));
+
+      finish_forward (sm, frame);
+    }

 }
 \f
 
 static void
 }
 \f
 
 static void

-program_info (char *args, int from_tty)
+info_program_command (const char *args, int from_tty)

 {
   bpstat bs;
   int num, stat;
 {
   bpstat bs;
   int num, stat;

-  struct thread_info *tp;

   ptid_t ptid;
 
   if (!target_has_execution)
   ptid_t ptid;
 
   if (!target_has_execution)


@@ -1923,18 +2091,22 @@ program_info (char *args, int from_tty)
       get_last_target_status (&ptid, &ws);
     }
 
       get_last_target_status (&ptid, &ws);
     }
 

-  if (ptid_equal (ptid, null_ptid) || is_exited (ptid))
+  if (ptid == null_ptid)
+    error (_("No selected thread."));
+
+  thread_info *tp = find_thread_ptid (ptid);
+
+  if (tp->state == THREAD_EXITED)

     error (_("Invalid selected thread."));
     error (_("Invalid selected thread."));

-  else if (is_running (ptid))
+  else if (tp->state == THREAD_RUNNING)

     error (_("Selected thread is running."));
 
     error (_("Selected thread is running."));
 

-  tp = find_thread_ptid (ptid);

   bs = tp->control.stop_bpstat;
   stat = bpstat_num (&bs, &num);
 
   target_files_info ();
   printf_filtered (_("Program stopped at %s.\n"),
   bs = tp->control.stop_bpstat;
   stat = bpstat_num (&bs, &num);
 
   target_files_info ();
   printf_filtered (_("Program stopped at %s.\n"),

-                  paddress (target_gdbarch (), stop_pc));
+                  paddress (target_gdbarch (), tp->suspend.stop_pc));

   if (tp->control.stop_step)
     printf_filtered (_("It stopped after being stepped.\n"));
   else if (stat != 0)
   if (tp->control.stop_step)
     printf_filtered (_("It stopped after being stepped.\n"));
   else if (stat != 0)


@@ -1968,11 +2140,11 @@ program_info (char *args, int from_tty)
 }
 \f
 static void
 }
 \f
 static void

-environment_info (char *var, int from_tty)
+environment_info (const char *var, int from_tty)

 {
   if (var)
     {
 {
   if (var)
     {

-      char *val = get_in_environ (current_inferior ()->environment, var);
+      const char *val = current_inferior ()->environment.get (var);

 
       if (val)
        {
 
       if (val)
        {


@@ -1990,20 +2162,20 @@ environment_info (char *var, int from_tty)
     }
   else
     {
     }
   else
     {

-      char **vector = environ_vector (current_inferior ()->environment);
+      char **envp = current_inferior ()->environment.envp ();

 
 

-      while (*vector)
+      for (int idx = 0; envp[idx] != NULL; ++idx)

        {
        {

-         puts_filtered (*vector++);
+         puts_filtered (envp[idx]);

          puts_filtered ("\n");
        }
     }
 }
 
 static void
          puts_filtered ("\n");
        }
     }
 }
 
 static void

-set_environment_command (char *arg, int from_tty)
+set_environment_command (const char *arg, int from_tty)

 {
 {

-  char *p, *val, *var;
+  const char *p, *val;

   int nullset = 0;
 
   if (arg == 0)
   int nullset = 0;
 
   if (arg == 0)


@@ -2050,34 +2222,30 @@ set_environment_command (char *arg, int from_tty)
   while (p != arg && (p[-1] == ' ' || p[-1] == '\t'))
     p--;
 
   while (p != arg && (p[-1] == ' ' || p[-1] == '\t'))
     p--;
 

-  var = savestring (arg, p - arg);
+  std::string var (arg, p - arg);

   if (nullset)
     {
       printf_filtered (_("Setting environment variable "
                         "\"%s\" to null value.\n"),
   if (nullset)
     {
       printf_filtered (_("Setting environment variable "
                         "\"%s\" to null value.\n"),

-                      var);
-      set_in_environ (current_inferior ()->environment, var, "");
+                      var.c_str ());
+      current_inferior ()->environment.set (var.c_str (), "");

     }
   else
     }
   else

-    set_in_environ (current_inferior ()->environment, var, val);
-  xfree (var);
+    current_inferior ()->environment.set (var.c_str (), val);

 }
 
 static void
 }
 
 static void

-unset_environment_command (char *var, int from_tty)
+unset_environment_command (const char *var, int from_tty)

 {
   if (var == 0)
     {
       /* If there is no argument, delete all environment variables.
          Ask for confirmation if reading from the terminal.  */
       if (!from_tty || query (_("Delete all environment variables? ")))
 {
   if (var == 0)
     {
       /* If there is no argument, delete all environment variables.
          Ask for confirmation if reading from the terminal.  */
       if (!from_tty || query (_("Delete all environment variables? ")))

-       {
-         free_environ (current_inferior ()->environment);
-         current_inferior ()->environment = make_environ ();
-       }
+       current_inferior ()->environment.clear ();

     }
   else
     }
   else

-    unset_in_environ (current_inferior ()->environment, var);
+    current_inferior ()->environment.unset (var);

 }
 
 /* Handle the execution path (PATH variable).  */
 }
 
 /* Handle the execution path (PATH variable).  */


@@ -2085,36 +2253,45 @@ unset_environment_command (char *var, int from_tty)
 static const char path_var_name[] = "PATH";
 
 static void
 static const char path_var_name[] = "PATH";
 
 static void

-path_info (char *args, int from_tty)
+path_info (const char *args, int from_tty)

 {
   puts_filtered ("Executable and object file path: ");
 {
   puts_filtered ("Executable and object file path: ");

-  puts_filtered (get_in_environ (current_inferior ()->environment,
-                                path_var_name));
+  puts_filtered (current_inferior ()->environment.get (path_var_name));

   puts_filtered ("\n");
 }
 
 /* Add zero or more directories to the front of the execution path.  */
 
 static void
   puts_filtered ("\n");
 }
 
 /* Add zero or more directories to the front of the execution path.  */
 
 static void

-path_command (char *dirname, int from_tty)
+path_command (const char *dirname, int from_tty)

 {
   char *exec_path;
 {
   char *exec_path;

-  char *env;
+  const char *env;

 
   dont_repeat ();
 
   dont_repeat ();

-  env = get_in_environ (current_inferior ()->environment, path_var_name);
+  env = current_inferior ()->environment.get (path_var_name);

   /* Can be null if path is not set.  */
   if (!env)
     env = "";
   exec_path = xstrdup (env);
   mod_path (dirname, &exec_path);
   /* Can be null if path is not set.  */
   if (!env)
     env = "";
   exec_path = xstrdup (env);
   mod_path (dirname, &exec_path);

-  set_in_environ (current_inferior ()->environment, path_var_name, exec_path);
+  current_inferior ()->environment.set (path_var_name, exec_path);

   xfree (exec_path);
   if (from_tty)
     path_info ((char *) NULL, from_tty);
 }
 \f
 
   xfree (exec_path);
   if (from_tty)
     path_info ((char *) NULL, from_tty);
 }
 \f
 

+static void
+pad_to_column (string_file &stream, int col)
+{
+  /* At least one space must be printed to separate columns.  */
+  stream.putc (' ');
+  const int size = stream.size ();
+  if (size < col)
+    stream.puts (n_spaces (col - size));
+}
+

 /* Print out the register NAME with value VAL, to FILE, in the default
    fashion.  */
 
 /* Print out the register NAME with value VAL, to FILE, in the default
    fashion.  */
 


@@ -2125,9 +2302,17 @@ default_print_one_register_info (struct ui_file *file,
 {
   struct type *regtype = value_type (val);
   int print_raw_format;
 {
   struct type *regtype = value_type (val);
   int print_raw_format;

+  string_file format_stream;
+  enum tab_stops
+    {
+      value_column_1 = 15,
+      /* Give enough room for "0x", 16 hex digits and two spaces in
+         preceding column.  */
+      value_column_2 = value_column_1 + 2 + 16 + 2,
+    };

 
 

-  fputs_filtered (name, file);
-  print_spaces_filtered (15 - strlen (name), file);
+  format_stream.puts (name);
+  pad_to_column (format_stream, value_column_1);

 
   print_raw_format = (value_entirely_available (val)
                      && !value_optimized_out (val));
 
   print_raw_format = (value_entirely_available (val)
                      && !value_optimized_out (val));


@@ -2137,7 +2322,6 @@ default_print_one_register_info (struct ui_file *file,
   if (TYPE_CODE (regtype) == TYPE_CODE_FLT
       || TYPE_CODE (regtype) == TYPE_CODE_DECFLOAT)
     {
   if (TYPE_CODE (regtype) == TYPE_CODE_FLT
       || TYPE_CODE (regtype) == TYPE_CODE_DECFLOAT)
     {

-      int j;

       struct value_print_options opts;
       const gdb_byte *valaddr = value_contents_for_printing (val);
       enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (regtype));
       struct value_print_options opts;
       const gdb_byte *valaddr = value_contents_for_printing (val);
       enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (regtype));


@@ -2146,15 +2330,16 @@ default_print_one_register_info (struct ui_file *file,
       opts.deref_ref = 1;
 
       val_print (regtype,
       opts.deref_ref = 1;
 
       val_print (regtype,

-                value_contents_for_printing (val),

                 value_embedded_offset (val), 0,
                 value_embedded_offset (val), 0,

-                file, 0, val, &opts, current_language);
+                &format_stream, 0, val, &opts, current_language);

 
       if (print_raw_format)
        {
 
       if (print_raw_format)
        {

-         fprintf_filtered (file, "\t(raw ");
-         print_hex_chars (file, valaddr, TYPE_LENGTH (regtype), byte_order);
-         fprintf_filtered (file, ")");
+         pad_to_column (format_stream, value_column_2);
+         format_stream.puts ("(raw ");
+         print_hex_chars (&format_stream, valaddr, TYPE_LENGTH (regtype),
+                          byte_order, true);
+         format_stream.putc (')');

        }
     }
   else
        }
     }
   else


@@ -2165,23 +2350,22 @@ default_print_one_register_info (struct ui_file *file,
       get_formatted_print_options (&opts, 'x');
       opts.deref_ref = 1;
       val_print (regtype,
       get_formatted_print_options (&opts, 'x');
       opts.deref_ref = 1;
       val_print (regtype,

-                value_contents_for_printing (val),

                 value_embedded_offset (val), 0,
                 value_embedded_offset (val), 0,

-                file, 0, val, &opts, current_language);
+                &format_stream, 0, val, &opts, current_language);

       /* If not a vector register, print it also according to its
         natural format.  */
       if (print_raw_format && TYPE_VECTOR (regtype) == 0)
        {
       /* If not a vector register, print it also according to its
         natural format.  */
       if (print_raw_format && TYPE_VECTOR (regtype) == 0)
        {

+         pad_to_column (format_stream, value_column_2);

          get_user_print_options (&opts);
          opts.deref_ref = 1;
          get_user_print_options (&opts);
          opts.deref_ref = 1;

-         fprintf_filtered (file, "\t");

          val_print (regtype,
          val_print (regtype,

-                    value_contents_for_printing (val),

                     value_embedded_offset (val), 0,
                     value_embedded_offset (val), 0,

-                    file, 0, val, &opts, current_language);
+                    &format_stream, 0, val, &opts, current_language);

        }
     }
 
        }
     }
 

+  fputs_filtered (format_stream.c_str (), file);

   fprintf_filtered (file, "\n");
 }
 
   fprintf_filtered (file, "\n");
 }
 


@@ -2242,7 +2426,7 @@ default_print_registers_info (struct gdbarch *gdbarch,
 }
 
 void
 }
 
 void

-registers_info (char *addr_exp, int fpregs)
+registers_info (const char *addr_exp, int fpregs)

 {
   struct frame_info *frame;
   struct gdbarch *gdbarch;
 {
   struct frame_info *frame;
   struct gdbarch *gdbarch;


@@ -2261,7 +2445,7 @@ registers_info (char *addr_exp, int fpregs)
 
   while (*addr_exp != '\0')
     {
 
   while (*addr_exp != '\0')
     {

-      char *start;
+      const char *start;

       const char *end;
 
       /* Skip leading white space.  */
       const char *end;
 
       /* Skip leading white space.  */


@@ -2350,13 +2534,13 @@ registers_info (char *addr_exp, int fpregs)
 }
 
 static void
 }
 
 static void

-all_registers_info (char *addr_exp, int from_tty)
+info_all_registers_command (const char *addr_exp, int from_tty)

 {
   registers_info (addr_exp, 1);
 }
 
 static void
 {
   registers_info (addr_exp, 1);
 }
 
 static void

-nofp_registers_info (char *addr_exp, int from_tty)
+info_registers_command (const char *addr_exp, int from_tty)

 {
   registers_info (addr_exp, 0);
 }
 {
   registers_info (addr_exp, 0);
 }


@@ -2391,7 +2575,7 @@ print_vector_info (struct ui_file *file,
 }
 
 static void
 }
 
 static void

-vector_info (char *args, int from_tty)
+info_vector_command (const char *args, int from_tty)

 {
   if (!target_has_registers)
     error (_("The program has no registers now."));
 {
   if (!target_has_registers)
     error (_("The program has no registers now."));


@@ -2402,18 +2586,29 @@ vector_info (char *args, int from_tty)
 /* Kill the inferior process.  Make us have no inferior.  */
 
 static void
 /* Kill the inferior process.  Make us have no inferior.  */
 
 static void

-kill_command (char *arg, int from_tty)
+kill_command (const char *arg, int from_tty)

 {
   /* FIXME:  This should not really be inferior_ptid (or target_has_execution).
      It should be a distinct flag that indicates that a target is active, cuz
      some targets don't have processes!  */
 
 {
   /* FIXME:  This should not really be inferior_ptid (or target_has_execution).
      It should be a distinct flag that indicates that a target is active, cuz
      some targets don't have processes!  */
 

-  if (ptid_equal (inferior_ptid, null_ptid))
+  if (inferior_ptid == null_ptid)

     error (_("The program is not being run."));
   if (!query (_("Kill the program being debugged? ")))
     error (_("Not confirmed."));
     error (_("The program is not being run."));
   if (!query (_("Kill the program being debugged? ")))
     error (_("Not confirmed."));

+
+  int pid = current_inferior ()->pid;
+  /* Save the pid as a string before killing the inferior, since that
+     may unpush the current target, and we need the string after.  */
+  std::string pid_str = target_pid_to_str (ptid_t (pid));
+  int infnum = current_inferior ()->num;
+

   target_kill ();
 
   target_kill ();
 

+  if (print_inferior_events)
+    printf_unfiltered (_("[Inferior %d (%s) killed]\n"),
+                      infnum, pid_str.c_str ());
+

   /* If we still have other inferiors to debug, then don't mess with
      with their threads.  */
   if (!have_inferiors ())
   /* If we still have other inferiors to debug, then don't mess with
      with their threads.  */
   if (!have_inferiors ())


@@ -2443,15 +2638,15 @@ proceed_after_attach_callback (struct thread_info *thread,
 {
   int pid = * (int *) arg;
 
 {
   int pid = * (int *) arg;
 

-  if (ptid_get_pid (thread->ptid) == pid
-      && !is_exited (thread->ptid)
-      && !is_executing (thread->ptid)
+  if (thread->ptid.pid () == pid
+      && thread->state != THREAD_EXITED
+      && !thread->executing

       && !thread->stop_requested
       && thread->suspend.stop_signal == GDB_SIGNAL_0)
     {
       && !thread->stop_requested
       && thread->suspend.stop_signal == GDB_SIGNAL_0)
     {

-      switch_to_thread (thread->ptid);
+      switch_to_thread (thread);

       clear_proceed_status (0);
       clear_proceed_status (0);

-      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT, 0);
+      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);

     }
 
   return 0;
     }
 
   return 0;


@@ -2462,55 +2657,27 @@ proceed_after_attach (int pid)
 {
   /* Don't error out if the current thread is running, because
      there may be other stopped threads.  */
 {
   /* Don't error out if the current thread is running, because
      there may be other stopped threads.  */

-  struct cleanup *old_chain;

 
   /* Backup current thread and selected frame.  */
 
   /* Backup current thread and selected frame.  */

-  old_chain = make_cleanup_restore_current_thread ();
+  scoped_restore_current_thread restore_thread;

 
   iterate_over_threads (proceed_after_attach_callback, &pid);
 
   iterate_over_threads (proceed_after_attach_callback, &pid);

-
-  /* Restore selected ptid.  */
-  do_cleanups (old_chain);

 }
 
 }
 

-/* attach_command --
-   takes a program started up outside of gdb and ``attaches'' to it.
-   This stops it cold in its tracks and allows us to start debugging it.
-   and wait for the trace-trap that results from attaching.  */
+/* See inferior.h.  */

 
 

-static void
-attach_command_post_wait (char *args, int from_tty, int async_exec)
+void
+setup_inferior (int from_tty)

 {
 {

-  char *exec_file;
-  char *full_exec_path = NULL;

   struct inferior *inferior;
 
   inferior = current_inferior ();
   struct inferior *inferior;
 
   inferior = current_inferior ();

-  inferior->control.stop_soon = NO_STOP_QUIETLY;
+  inferior->needs_setup = 0;

 
   /* If no exec file is yet known, try to determine it from the
      process itself.  */
 
   /* If no exec file is yet known, try to determine it from the
      process itself.  */

-  exec_file = (char *) get_exec_file (0);
-  if (!exec_file)
-    {
-      exec_file = target_pid_to_exec_file (ptid_get_pid (inferior_ptid));
-      if (exec_file)
-       {
-         /* It's possible we don't have a full path, but rather just a
-            filename.  Some targets, such as HP-UX, don't provide the
-            full path, sigh.
-
-            Attempt to qualify the filename against the source path.
-            (If that fails, we'll just fall back on the original
-            filename.  Not much more we can do...)  */
-
-         if (!source_full_path_of (exec_file, &full_exec_path))
-           full_exec_path = xstrdup (exec_file);
-
-         exec_file_attach (full_exec_path, from_tty);
-         symbol_file_add_main (full_exec_path, from_tty);
-       }
-    }
+  if (get_exec_file (0) == NULL)
+    exec_file_locate_attach (inferior_ptid.pid (), 1, from_tty);

   else
     {
       reopen_exec_file ();
   else
     {
       reopen_exec_file ();


@@ -2518,11 +2685,40 @@ attach_command_post_wait (char *args, int from_tty, int async_exec)
     }
 
   /* Take any necessary post-attaching actions for this platform.  */
     }
 
   /* Take any necessary post-attaching actions for this platform.  */

-  target_post_attach (ptid_get_pid (inferior_ptid));
+  target_post_attach (inferior_ptid.pid ());
+
+  post_create_inferior (current_top_target (), from_tty);
+}
+
+/* What to do after the first program stops after attaching.  */
+enum attach_post_wait_mode
+{
+  /* Do nothing.  Leaves threads as they are.  */
+  ATTACH_POST_WAIT_NOTHING,
+
+  /* Re-resume threads that are marked running.  */
+  ATTACH_POST_WAIT_RESUME,
+
+  /* Stop all threads.  */
+  ATTACH_POST_WAIT_STOP,
+};

 
 

-  post_create_inferior (&current_target, from_tty);
+/* Called after we've attached to a process and we've seen it stop for
+   the first time.  If ASYNC_EXEC is true, re-resume threads that
+   should be running.  Else if ATTACH, */

 
 

-  if (async_exec)
+static void
+attach_post_wait (const char *args, int from_tty, enum attach_post_wait_mode mode)
+{
+  struct inferior *inferior;
+
+  inferior = current_inferior ();
+  inferior->control.stop_soon = NO_STOP_QUIETLY;
+
+  if (inferior->needs_setup)
+    setup_inferior (from_tty);
+
+  if (mode == ATTACH_POST_WAIT_RESUME)

     {
       /* The user requested an `attach&', so be sure to leave threads
         that didn't get a signal running.  */
     {
       /* The user requested an `attach&', so be sure to leave threads
         that didn't get a signal running.  */


@@ -2538,18 +2734,15 @@ attach_command_post_wait (char *args, int from_tty, int async_exec)
          if (inferior_thread ()->suspend.stop_signal == GDB_SIGNAL_0)
            {
              clear_proceed_status (0);
          if (inferior_thread ()->suspend.stop_signal == GDB_SIGNAL_0)
            {
              clear_proceed_status (0);

-             proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT, 0);
+             proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);

            }
        }
     }
            }
        }
     }

-  else
+  else if (mode == ATTACH_POST_WAIT_STOP)

     {
       /* The user requested a plain `attach', so be sure to leave
         the inferior stopped.  */
 
     {
       /* The user requested a plain `attach', so be sure to leave
         the inferior stopped.  */
 

-      if (target_can_async_p ())
-       async_enable_stdin ();
-

       /* At least the current thread is already stopped.  */
 
       /* In all-stop, by definition, all threads have to be already
       /* At least the current thread is already stopped.  */
 
       /* In all-stop, by definition, all threads have to be already


@@ -2558,7 +2751,31 @@ attach_command_post_wait (char *args, int from_tty, int async_exec)
         Be sure to explicitly stop all threads of the process.  This
         should have no effect on already stopped threads.  */
       if (non_stop)
         Be sure to explicitly stop all threads of the process.  This
         should have no effect on already stopped threads.  */
       if (non_stop)

-       target_stop (pid_to_ptid (inferior->pid));
+       target_stop (ptid_t (inferior->pid));
+      else if (target_is_non_stop_p ())
+       {
+         struct thread_info *thread;
+         struct thread_info *lowest = inferior_thread ();
+         int pid = current_inferior ()->pid;
+
+         stop_all_threads ();
+
+         /* It's not defined which thread will report the attach
+            stop.  For consistency, always select the thread with
+            lowest GDB number, which should be the main thread, if it
+            still exists.  */
+         ALL_NON_EXITED_THREADS (thread)
+           {
+             if (thread->ptid.pid () == pid)
+               {
+                 if (thread->inf->num < lowest->inf->num
+                     || thread->per_inf_num < lowest->per_inf_num)
+                   lowest = thread;
+               }
+           }
+
+         switch_to_thread (lowest);
+       }

 
       /* Tell the user/frontend where we're stopped.  */
       normal_stop ();
 
       /* Tell the user/frontend where we're stopped.  */
       normal_stop ();


@@ -2571,35 +2788,42 @@ struct attach_command_continuation_args
 {
   char *args;
   int from_tty;
 {
   char *args;
   int from_tty;

-  int async_exec;
+  enum attach_post_wait_mode mode;

 };
 
 static void
 attach_command_continuation (void *args, int err)
 {
 };
 
 static void
 attach_command_continuation (void *args, int err)
 {

-  struct attach_command_continuation_args *a = args;
+  struct attach_command_continuation_args *a
+    = (struct attach_command_continuation_args *) args;

 
   if (err)
     return;
 
 
   if (err)
     return;
 

-  attach_command_post_wait (a->args, a->from_tty, a->async_exec);
+  attach_post_wait (a->args, a->from_tty, a->mode);

 }
 
 static void
 attach_command_continuation_free_args (void *args)
 {
 }
 
 static void
 attach_command_continuation_free_args (void *args)
 {

-  struct attach_command_continuation_args *a = args;
+  struct attach_command_continuation_args *a
+    = (struct attach_command_continuation_args *) args;

 
   xfree (a->args);
   xfree (a);
 }
 
 
   xfree (a->args);
   xfree (a);
 }
 

+/* "attach" command entry point.  Takes a program started up outside
+   of gdb and ``attaches'' to it.  This stops it cold in its tracks
+   and allows us to start debugging it.  */
+

 void
 void

-attach_command (char *args, int from_tty)
+attach_command (const char *args, int from_tty)

 {
   int async_exec;
 {
   int async_exec;

-  struct cleanup *args_chain;

   struct target_ops *attach_target;
   struct target_ops *attach_target;

+  struct inferior *inferior = current_inferior ();
+  enum attach_post_wait_mode mode;

 
   dont_repeat ();              /* Not for the faint of heart */
 
 
   dont_repeat ();              /* Not for the faint of heart */
 


@@ -2619,27 +2843,24 @@ attach_command (char *args, int from_tty)
      this function should probably be moved into target_pre_inferior.  */
   target_pre_inferior (from_tty);
 
      this function should probably be moved into target_pre_inferior.  */
   target_pre_inferior (from_tty);
 

-  args = strip_bg_char (args, &async_exec);
-  args_chain = make_cleanup (xfree, args);
+  gdb::unique_xmalloc_ptr<char> stripped = strip_bg_char (args, &async_exec);
+  args = stripped.get ();

 
   attach_target = find_attach_target ();
 
   prepare_execution_command (attach_target, async_exec);
 
 
   attach_target = find_attach_target ();
 
   prepare_execution_command (attach_target, async_exec);
 

-  if (non_stop && !attach_target->to_supports_non_stop (attach_target))
+  if (non_stop && !attach_target->supports_non_stop ())

     error (_("Cannot attach to this target in non-stop mode"));
 
     error (_("Cannot attach to this target in non-stop mode"));
 

-  attach_target->to_attach (attach_target, args, from_tty);
+  attach_target->attach (args, from_tty);

   /* to_attach should push the target, so after this point we
      shouldn't refer to attach_target again.  */
   attach_target = NULL;
 
   /* to_attach should push the target, so after this point we
      shouldn't refer to attach_target again.  */
   attach_target = NULL;
 

-  /* Done with ARGS.  */
-  do_cleanups (args_chain);
-

   /* Set up the "saved terminal modes" of the inferior
      based on what modes we are starting it with.  */
   /* Set up the "saved terminal modes" of the inferior
      based on what modes we are starting it with.  */

-  target_terminal_init ();
+  target_terminal::init ();

 
   /* Install inferior's terminal modes.  This may look like a no-op,
      as we've just saved them above, however, this does more than
 
   /* Install inferior's terminal modes.  This may look like a no-op,
      as we've just saved them above, however, this does more than


@@ -2655,14 +2876,16 @@ attach_command (char *args, int from_tty)
        while we're in the event loop waiting for that stop.  That is,
        before the attach continuation runs and the command is really
        finished.  */
        while we're in the event loop waiting for that stop.  That is,
        before the attach continuation runs and the command is really
        finished.  */

-  target_terminal_inferior ();
+  target_terminal::inferior ();

 
   /* Set up execution context to know that we should return from
      wait_for_inferior as soon as the target reports a stop.  */
   init_wait_for_inferior ();
   clear_proceed_status (0);
 
 
   /* Set up execution context to know that we should return from
      wait_for_inferior as soon as the target reports a stop.  */
   init_wait_for_inferior ();
   clear_proceed_status (0);
 

-  if (non_stop)
+  inferior->needs_setup = 1;
+
+  if (target_is_non_stop_p ())

     {
       /* If we find that the current thread isn't stopped, explicitly
         do so now, because we're going to install breakpoints and
     {
       /* If we find that the current thread isn't stopped, explicitly
         do so now, because we're going to install breakpoints and


@@ -2674,14 +2897,16 @@ attach_command (char *args, int from_tty)
       else
        /* The user requested an `attach', so stop all threads of this
           inferior.  */
       else
        /* The user requested an `attach', so stop all threads of this
           inferior.  */

-       target_stop (pid_to_ptid (ptid_get_pid (inferior_ptid)));
+       target_stop (ptid_t (inferior_ptid.pid ()));

     }
 
     }
 

+  mode = async_exec ? ATTACH_POST_WAIT_RESUME : ATTACH_POST_WAIT_STOP;
+

   /* Some system don't generate traps when attaching to inferior.
      E.g. Mach 3 or GNU hurd.  */
   /* Some system don't generate traps when attaching to inferior.
      E.g. Mach 3 or GNU hurd.  */

-  if (!target_attach_no_wait)
+  if (!target_attach_no_wait ())

     {
     {

-      struct inferior *inferior = current_inferior ();
+      struct attach_command_continuation_args *a;

 
       /* Careful here.  See comments in inferior.h.  Basically some
         OSes don't ignore SIGSTOPs on continue requests anymore.  We
 
       /* Careful here.  See comments in inferior.h.  Basically some
         OSes don't ignore SIGSTOPs on continue requests anymore.  We


@@ -2690,24 +2915,20 @@ attach_command (char *args, int from_tty)
         STOP_QUIETLY_NO_SIGSTOP is for.  */
       inferior->control.stop_soon = STOP_QUIETLY_NO_SIGSTOP;
 
         STOP_QUIETLY_NO_SIGSTOP is for.  */
       inferior->control.stop_soon = STOP_QUIETLY_NO_SIGSTOP;
 

-      if (target_can_async_p ())
-       {
-         /* sync_execution mode.  Wait for stop.  */
-         struct attach_command_continuation_args *a;
-
-         a = xmalloc (sizeof (*a));
-         a->args = xstrdup (args);
-         a->from_tty = from_tty;
-         a->async_exec = async_exec;
-         add_inferior_continuation (attach_command_continuation, a,
-                                    attach_command_continuation_free_args);
-         return;
-       }
+      /* Wait for stop.  */
+      a = XNEW (struct attach_command_continuation_args);
+      a->args = xstrdup (args);
+      a->from_tty = from_tty;
+      a->mode = mode;
+      add_inferior_continuation (attach_command_continuation, a,
+                                attach_command_continuation_free_args);

 
 

-      wait_for_inferior ();
+      if (!target_is_async_p ())
+       mark_infrun_async_event_handler ();
+      return;

     }
 
     }
 

-  attach_command_post_wait (args, from_tty, async_exec);
+  attach_post_wait (args, from_tty, mode);

 }
 
 /* We had just found out that the target was already attached to an
 }
 
 /* We had just found out that the target was already attached to an


@@ -2719,29 +2940,26 @@ attach_command (char *args, int from_tty)
    as stopped.  */
 
 void
    as stopped.  */
 
 void

-notice_new_inferior (ptid_t ptid, int leave_running, int from_tty)
+notice_new_inferior (thread_info *thr, int leave_running, int from_tty)

 {
 {

-  struct cleanup* old_chain;
-  int async_exec;
-
-  old_chain = make_cleanup (null_cleanup, NULL);
+  enum attach_post_wait_mode mode
+    = leave_running ? ATTACH_POST_WAIT_RESUME : ATTACH_POST_WAIT_NOTHING;

 
 

-  /* If in non-stop, leave threads as running as they were.  If
-     they're stopped for some reason other than us telling it to, the
-     target reports a signal != GDB_SIGNAL_0.  We don't try to
-     resume threads with such a stop signal.  */
-  async_exec = non_stop;
+  gdb::optional<scoped_restore_current_thread> restore_thread;

 
 

-  if (!ptid_equal (inferior_ptid, null_ptid))
-    make_cleanup_restore_current_thread ();
+  if (inferior_ptid != null_ptid)
+    restore_thread.emplace ();

 
 

-  switch_to_thread (ptid);
+  /* Avoid reading registers -- we haven't fetched the target
+     description yet.  */
+  switch_to_thread_no_regs (thr);

 
   /* When we "notice" a new inferior we need to do all the things we
      would normally do if we had just attached to it.  */
 
 
   /* When we "notice" a new inferior we need to do all the things we
      would normally do if we had just attached to it.  */
 

-  if (is_executing (inferior_ptid))
+  if (thr->executing)

     {
     {

+      struct attach_command_continuation_args *a;

       struct inferior *inferior = current_inferior ();
 
       /* We're going to install breakpoints, and poke at memory,
       struct inferior *inferior = current_inferior ();
 
       /* We're going to install breakpoints, and poke at memory,


@@ -2752,28 +2970,17 @@ notice_new_inferior (ptid_t ptid, int leave_running, int from_tty)
       inferior->control.stop_soon = STOP_QUIETLY_REMOTE;
 
       /* Wait for stop before proceeding.  */
       inferior->control.stop_soon = STOP_QUIETLY_REMOTE;
 
       /* Wait for stop before proceeding.  */

-      if (target_can_async_p ())
-       {
-         struct attach_command_continuation_args *a;
+      a = XNEW (struct attach_command_continuation_args);
+      a->args = xstrdup ("");
+      a->from_tty = from_tty;
+      a->mode = mode;
+      add_inferior_continuation (attach_command_continuation, a,
+                                attach_command_continuation_free_args);

 
 

-         a = xmalloc (sizeof (*a));
-         a->args = xstrdup ("");
-         a->from_tty = from_tty;
-         a->async_exec = async_exec;
-         add_inferior_continuation (attach_command_continuation, a,
-                                    attach_command_continuation_free_args);
-
-         do_cleanups (old_chain);
-         return;
-       }
-      else
-       wait_for_inferior ();
+      return;

     }
 
     }
 

-  async_exec = leave_running;
-  attach_command_post_wait ("" /* args */, from_tty, async_exec);
-
-  do_cleanups (old_chain);
+  attach_post_wait ("" /* args */, from_tty, mode);

 }
 
 /*
 }
 
 /*


@@ -2788,18 +2995,25 @@ notice_new_inferior (ptid_t ptid, int leave_running, int from_tty)
  */
 
 void
  */
 
 void

-detach_command (char *args, int from_tty)
+detach_command (const char *args, int from_tty)

 {
   dont_repeat ();              /* Not for the faint of heart.  */
 
 {
   dont_repeat ();              /* Not for the faint of heart.  */
 

-  if (ptid_equal (inferior_ptid, null_ptid))
+  if (inferior_ptid == null_ptid)

     error (_("The program is not being run."));
 
   query_if_trace_running (from_tty);
 
   disconnect_tracing ();
 
     error (_("The program is not being run."));
 
   query_if_trace_running (from_tty);
 
   disconnect_tracing ();
 

-  target_detach (args, from_tty);
+  target_detach (current_inferior (), from_tty);
+
+  /* The current inferior process was just detached successfully.  Get
+     rid of breakpoints that no longer make sense.  Note we don't do
+     this within target_detach because that is also used when
+     following child forks, and in that case we will want to transfer
+     breakpoints to the child, not delete them.  */
+  breakpoint_init_inferior (inf_exited);

 
   /* If the solist is global across inferiors, don't clear it when we
      detach from a single inferior.  */
 
   /* If the solist is global across inferiors, don't clear it when we
      detach from a single inferior.  */


@@ -2824,7 +3038,7 @@ detach_command (char *args, int from_tty)
    stopped processes on some native platforms (e.g. GNU/Linux).  */
 
 static void
    stopped processes on some native platforms (e.g. GNU/Linux).  */
 
 static void

-disconnect_command (char *args, int from_tty)
+disconnect_command (const char *args, int from_tty)

 {
   dont_repeat ();              /* Not for the faint of heart.  */
   query_if_trace_running (from_tty);
 {
   dont_repeat ();              /* Not for the faint of heart.  */
   query_if_trace_running (from_tty);


@@ -2845,7 +3059,11 @@ interrupt_target_1 (int all_threads)
     ptid = minus_one_ptid;
   else
     ptid = inferior_ptid;
     ptid = minus_one_ptid;
   else
     ptid = inferior_ptid;

-  target_stop (ptid);
+
+  if (non_stop)
+    target_stop (ptid);
+  else
+    target_interrupt ();

 
   /* Tag the thread as having been explicitly requested to stop, so
      other parts of gdb know not to resume this thread automatically,
 
   /* Tag the thread as having been explicitly requested to stop, so
      other parts of gdb know not to resume this thread automatically,


@@ -2859,12 +3077,12 @@ interrupt_target_1 (int all_threads)
 
 /* interrupt [-a]
    Stop the execution of the target while running in async mode, in
 
 /* interrupt [-a]
    Stop the execution of the target while running in async mode, in

-   the backgound.  In all-stop, stop the whole process.  In non-stop
+   the background.  In all-stop, stop the whole process.  In non-stop

    mode, stop the current thread only by default, or stop all threads
    if the `-a' switch is used.  */
 
 static void
    mode, stop the current thread only by default, or stop all threads
    if the `-a' switch is used.  */
 
 static void

-interrupt_command (char *args, int from_tty)
+interrupt_command (const char *args, int from_tty)

 {
   if (target_can_async_p ())
     {
 {
   if (target_can_async_p ())
     {


@@ -2909,7 +3127,7 @@ default_print_float_info (struct gdbarch *gdbarch, struct ui_file *file,
 }
 
 static void
 }
 
 static void

-float_info (char *args, int from_tty)
+info_float_command (const char *args, int from_tty)

 {
   struct frame_info *frame;
 
 {
   struct frame_info *frame;
 


@@ -2921,7 +3139,7 @@ float_info (char *args, int from_tty)
 }
 \f
 static void
 }
 \f
 static void

-unset_command (char *args, int from_tty)
+unset_command (const char *args, int from_tty)

 {
   printf_filtered (_("\"unset\" must be followed by the "
                     "name of an unset subcommand.\n"));
 {
   printf_filtered (_("\"unset\" must be followed by the "
                     "name of an unset subcommand.\n"));


@@ -2931,7 +3149,7 @@ unset_command (char *args, int from_tty)
 /* Implement `info proc' family of commands.  */
 
 static void
 /* Implement `info proc' family of commands.  */
 
 static void

-info_proc_cmd_1 (char *args, enum info_proc_what what, int from_tty)
+info_proc_cmd_1 (const char *args, enum info_proc_what what, int from_tty)

 {
   struct gdbarch *gdbarch = get_current_arch ();
 
 {
   struct gdbarch *gdbarch = get_current_arch ();
 


@@ -2947,7 +3165,7 @@ info_proc_cmd_1 (char *args, enum info_proc_what what, int from_tty)
 /* Implement `info proc' when given without any futher parameters.  */
 
 static void
 /* Implement `info proc' when given without any futher parameters.  */
 
 static void

-info_proc_cmd (char *args, int from_tty)
+info_proc_cmd (const char *args, int from_tty)

 {
   info_proc_cmd_1 (args, IP_MINIMAL, from_tty);
 }
 {
   info_proc_cmd_1 (args, IP_MINIMAL, from_tty);
 }


@@ -2955,7 +3173,7 @@ info_proc_cmd (char *args, int from_tty)
 /* Implement `info proc mappings'.  */
 
 static void
 /* Implement `info proc mappings'.  */
 
 static void

-info_proc_cmd_mappings (char *args, int from_tty)
+info_proc_cmd_mappings (const char *args, int from_tty)

 {
   info_proc_cmd_1 (args, IP_MAPPINGS, from_tty);
 }
 {
   info_proc_cmd_1 (args, IP_MAPPINGS, from_tty);
 }


@@ -2963,7 +3181,7 @@ info_proc_cmd_mappings (char *args, int from_tty)
 /* Implement `info proc stat'.  */
 
 static void
 /* Implement `info proc stat'.  */
 
 static void

-info_proc_cmd_stat (char *args, int from_tty)
+info_proc_cmd_stat (const char *args, int from_tty)

 {
   info_proc_cmd_1 (args, IP_STAT, from_tty);
 }
 {
   info_proc_cmd_1 (args, IP_STAT, from_tty);
 }


@@ -2971,7 +3189,7 @@ info_proc_cmd_stat (char *args, int from_tty)
 /* Implement `info proc status'.  */
 
 static void
 /* Implement `info proc status'.  */
 
 static void

-info_proc_cmd_status (char *args, int from_tty)
+info_proc_cmd_status (const char *args, int from_tty)

 {
   info_proc_cmd_1 (args, IP_STATUS, from_tty);
 }
 {
   info_proc_cmd_1 (args, IP_STATUS, from_tty);
 }


@@ -2979,7 +3197,7 @@ info_proc_cmd_status (char *args, int from_tty)
 /* Implement `info proc cwd'.  */
 
 static void
 /* Implement `info proc cwd'.  */
 
 static void

-info_proc_cmd_cwd (char *args, int from_tty)
+info_proc_cmd_cwd (const char *args, int from_tty)

 {
   info_proc_cmd_1 (args, IP_CWD, from_tty);
 }
 {
   info_proc_cmd_1 (args, IP_CWD, from_tty);
 }


@@ -2987,7 +3205,7 @@ info_proc_cmd_cwd (char *args, int from_tty)
 /* Implement `info proc cmdline'.  */
 
 static void
 /* Implement `info proc cmdline'.  */
 
 static void

-info_proc_cmd_cmdline (char *args, int from_tty)
+info_proc_cmd_cmdline (const char *args, int from_tty)

 {
   info_proc_cmd_1 (args, IP_CMDLINE, from_tty);
 }
 {
   info_proc_cmd_1 (args, IP_CMDLINE, from_tty);
 }


@@ -2995,7 +3213,7 @@ info_proc_cmd_cmdline (char *args, int from_tty)
 /* Implement `info proc exe'.  */
 
 static void
 /* Implement `info proc exe'.  */
 
 static void

-info_proc_cmd_exe (char *args, int from_tty)
+info_proc_cmd_exe (const char *args, int from_tty)

 {
   info_proc_cmd_1 (args, IP_EXE, from_tty);
 }
 {
   info_proc_cmd_1 (args, IP_EXE, from_tty);
 }


@@ -3003,11 +3221,27 @@ info_proc_cmd_exe (char *args, int from_tty)
 /* Implement `info proc all'.  */
 
 static void
 /* Implement `info proc all'.  */
 
 static void

-info_proc_cmd_all (char *args, int from_tty)
+info_proc_cmd_all (const char *args, int from_tty)

 {
   info_proc_cmd_1 (args, IP_ALL, from_tty);
 }
 
 {
   info_proc_cmd_1 (args, IP_ALL, from_tty);
 }
 

+/* This help string is used for the run, start, and starti commands.
+   It is defined as a macro to prevent duplication.  */
+
+#define RUN_ARGS_HELP \
+"You may specify arguments to give it.\n\
+Args may include \"*\", or \"[...]\"; they are expanded using the\n\
+shell that will start the program (specified by the \"$SHELL\" environment\n\
+variable).  Input and output redirection with \">\", \"<\", or \">>\"\n\
+are also allowed.\n\
+\n\
+With no arguments, uses arguments last specified (with \"run\" or \n\
+\"set args\").  To cancel previous arguments and run with no arguments,\n\
+use \"set args\" without arguments.\n\
+\n\
+To start the inferior without using a shell, use \"set startup-with-shell off\"."
+

 void
 _initialize_infcmd (void)
 {
 void
 _initialize_infcmd (void)
 {


@@ -3016,15 +3250,20 @@ _initialize_infcmd (void)
   const char *cmd_name;
 
   /* Add the filename of the terminal connected to inferior I/O.  */
   const char *cmd_name;
 
   /* Add the filename of the terminal connected to inferior I/O.  */

-  add_setshow_filename_cmd ("inferior-tty", class_run,
-                           &inferior_io_terminal_scratch, _("\
+  add_setshow_optional_filename_cmd ("inferior-tty", class_run,
+                                    &inferior_io_terminal_scratch, _("\

 Set terminal for future runs of program being debugged."), _("\
 Show terminal for future runs of program being debugged."), _("\
 Set terminal for future runs of program being debugged."), _("\
 Show terminal for future runs of program being debugged."), _("\

-Usage: set inferior-tty /dev/pts/1"),
-                           set_inferior_tty_command,
-                           show_inferior_tty_command,
-                           &setlist, &showlist);
-  add_com_alias ("tty", "set inferior-tty", class_alias, 0);
+Usage: set inferior-tty [TTY]\n\n\
+If TTY is omitted, the default behavior of using the same terminal as GDB\n\
+is restored."),
+                                    set_inferior_tty_command,
+                                    show_inferior_tty_command,
+                                    &setlist, &showlist);
+  cmd_name = "inferior-tty";
+  c = lookup_cmd (&cmd_name, setlist, "", -1, 1);
+  gdb_assert (c != NULL);
+  add_alias_cmd ("tty", c, class_alias, 0, &cmdlist);

 
   cmd_name = "args";
   add_setshow_string_noescape_cmd (cmd_name, class_run,
 
   cmd_name = "args";
   add_setshow_string_noescape_cmd (cmd_name, class_run,


@@ -3039,6 +3278,25 @@ Follow this command with any number of args, to be passed to the program."),
   gdb_assert (c != NULL);
   set_cmd_completer (c, filename_completer);
 
   gdb_assert (c != NULL);
   set_cmd_completer (c, filename_completer);
 

+  cmd_name = "cwd";
+  add_setshow_string_noescape_cmd (cmd_name, class_run,
+                                  &inferior_cwd_scratch, _("\
+Set the current working directory to be used when the inferior is started.\n\
+Changing this setting does not have any effect on inferiors that are\n\
+already running."),
+                                  _("\
+Show the current working directory that is used when the inferior is started."),
+                                  _("\
+Use this command to change the current working directory that will be used\n\
+when the inferior is started.  This setting does not affect GDB's current\n\
+working directory."),
+                                  set_cwd_command,
+                                  show_cwd_command,
+                                  &setlist, &showlist);
+  c = lookup_cmd (&cmd_name, setlist, "", -1, 1);
+  gdb_assert (c != NULL);
+  set_cmd_completer (c, filename_completer);
+

   c = add_cmd ("environment", no_class, environment_info, _("\
 The environment to give the program, or one variable's value.\n\
 With an argument VAR, prints the value of environment variable VAR to\n\
   c = add_cmd ("environment", no_class, environment_info, _("\
 The environment to give the program, or one variable's value.\n\
 With an argument VAR, prints the value of environment variable VAR to\n\


@@ -3165,8 +3423,6 @@ Unlike \"step\", if the current source line calls a subroutine,\n\
 this command does not enter the subroutine, but instead steps over\n\
 the call, in effect treating it as a single source line."));
   add_com_alias ("n", "next", class_run, 1);
 this command does not enter the subroutine, but instead steps over\n\
 the call, in effect treating it as a single source line."));
   add_com_alias ("n", "next", class_run, 1);

-  if (xdb_commands)
-    add_com_alias ("S", "next", class_run, 1);

 
   add_com ("step", class_run, step_command, _("\
 Step program until it reaches a different source line.\n\
 
   add_com ("step", class_run, step_command, _("\
 Step program until it reaches a different source line.\n\


@@ -3190,27 +3446,12 @@ Execution will also stop upon exit from the current stack frame."));
 
   c = add_com ("jump", class_run, jump_command, _("\
 Continue program being debugged at specified line or address.\n\
 
   c = add_com ("jump", class_run, jump_command, _("\
 Continue program being debugged at specified line or address.\n\

-Usage: jump <location>\n\
+Usage: jump LOCATION\n\

 Give as argument either LINENUM or *ADDR, where ADDR is an expression\n\
 for an address to start at."));
   set_cmd_completer (c, location_completer);
   add_com_alias ("j", "jump", class_run, 1);
 
 Give as argument either LINENUM or *ADDR, where ADDR is an expression\n\
 for an address to start at."));
   set_cmd_completer (c, location_completer);
   add_com_alias ("j", "jump", class_run, 1);
 

-  if (xdb_commands)
-    {
-      c = add_com ("go", class_run, go_command, _("\
-Usage: go <location>\n\
-Continue program being debugged, stopping at specified line or \n\
-address.\n\
-Give as argument either LINENUM or *ADDR, where ADDR is an \n\
-expression for an address to start at.\n\
-This command is a combination of tbreak and jump."));
-      set_cmd_completer (c, location_completer);
-    }
-
-  if (xdb_commands)
-    add_com_alias ("g", "go", class_run, 1);
-

   add_com ("continue", class_run, continue_command, _("\
 Continue program being debugged, after signal or breakpoint.\n\
 Usage: continue [N]\n\
   add_com ("continue", class_run, continue_command, _("\
 Continue program being debugged, after signal or breakpoint.\n\
 Usage: continue [N]\n\


@@ -3226,24 +3467,19 @@ Specifying -a and an ignore count simultaneously is an error."));
   add_com_alias ("fg", "cont", class_run, 1);
 
   c = add_com ("run", class_run, run_command, _("\
   add_com_alias ("fg", "cont", class_run, 1);
 
   c = add_com ("run", class_run, run_command, _("\

-Start debugged program.  You may specify arguments to give it.\n\
-Args may include \"*\", or \"[...]\"; they are expanded using \"sh\".\n\
-Input and output redirection with \">\", \"<\", or \">>\" are also \
-allowed.\n\n\
-With no arguments, uses arguments last specified (with \"run\" \
-or \"set args\").\n\
-To cancel previous arguments and run with no arguments,\n\
-use \"set args\" without arguments."));
+Start debugged program.\n"
+RUN_ARGS_HELP));

   set_cmd_completer (c, filename_completer);
   add_com_alias ("r", "run", class_run, 1);
   set_cmd_completer (c, filename_completer);
   add_com_alias ("r", "run", class_run, 1);

-  if (xdb_commands)
-    add_com ("R", class_run, run_no_args_command,
-            _("Start debugged program with no arguments."));

 
   c = add_com ("start", class_run, start_command, _("\
 
   c = add_com ("start", class_run, start_command, _("\

-Run the debugged program until the beginning of the main procedure.\n\
-You may specify arguments to give to your program, just as with the\n\
-\"run\" command."));
+Start the debugged program stopping at the beginning of the main procedure.\n"
+RUN_ARGS_HELP));
+  set_cmd_completer (c, filename_completer);
+
+  c = add_com ("starti", class_run, starti_command, _("\
+Start the debugged program stopping at the first instruction.\n"
+RUN_ARGS_HELP));

   set_cmd_completer (c, filename_completer);
 
   add_com ("interrupt", class_run, interrupt_command,
   set_cmd_completer (c, filename_completer);
 
   add_com ("interrupt", class_run, interrupt_command,


@@ -3252,32 +3488,28 @@ 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."));
 
 otherwise all the threads in the program are stopped.  To \n\
 interrupt all running threads in non-stop mode, use the -a option."));
 

-  c = add_info ("registers", nofp_registers_info, _("\
+  c = add_info ("registers", info_registers_command, _("\

 List of integer registers and their contents, for selected stack frame.\n\
 List of integer registers and their contents, for selected stack frame.\n\

-Register name as argument means describe only that register."));
+One or more register names as argument means describe the given registers.\n\
+One or more register group names as argument means describe the registers\n\
+in the named register groups."));

   add_info_alias ("r", "registers", 1);
   set_cmd_completer (c, reg_or_group_completer);
 
   add_info_alias ("r", "registers", 1);
   set_cmd_completer (c, reg_or_group_completer);
 

-  if (xdb_commands)
-    {
-      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."));
-      set_cmd_completer (c, reg_or_group_completer);
-    }
-
-  c = add_info ("all-registers", all_registers_info, _("\
+  c = add_info ("all-registers", info_all_registers_command, _("\

 List of all registers and their contents, for selected stack frame.\n\
 List of all registers and their contents, for selected stack frame.\n\

-Register name as argument means describe only that register."));
+One or more register names as argument means describe the given registers.\n\
+One or more register group names as argument means describe the registers\n\
+in the named register groups."));

   set_cmd_completer (c, reg_or_group_completer);
 
   set_cmd_completer (c, reg_or_group_completer);
 

-  add_info ("program", program_info,
+  add_info ("program", info_program_command,

            _("Execution status of the program."));
 
            _("Execution status of the program."));
 

-  add_info ("float", float_info,
+  add_info ("float", info_float_command,

            _("Print the status of the floating point unit\n"));
 
            _("Print the status of the floating point unit\n"));
 

-  add_info ("vector", vector_info,
+  add_info ("vector", info_vector_command,

            _("Print the status of the vector unit\n"));
 
   add_prefix_cmd ("proc", class_info, info_proc_cmd,
            _("Print the status of the vector unit\n"));
 
   add_prefix_cmd ("proc", class_info, info_proc_cmd,