Class-ify ui_out

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

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index eddbbff5910baaccd7b3ddb4efdaddab982699ac..a537b0ad82952512a9f1fe57b6169faeecffa007 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-2016 Free Software Foundation, Inc.

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


@@ -54,14 +54,15 @@
 #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"

 
 /* Local functions: */
 
 static void nofp_registers_info (char *, int);
 
 
 /* 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_command (char *, int);
 static void until_next_command (int);
 
 static void until_command (char *, int);


@@ -91,8 +92,6 @@ static void signal_command (char *, int);
 static void jump_command (char *, int);
 
 static void step_1 (int, int, char *);
 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 next_command (char *, int);
 


@@ -100,10 +99,6 @@ static void step_command (char *, int);
 
 static void run_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);
 
 #define ERROR_NO_INFERIOR \
 void _initialize_infcmd (void);
 
 #define ERROR_NO_INFERIOR \


@@ -156,7 +151,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 *


@@ -413,7 +412,7 @@ post_create_inferior (struct target_ops *target, int from_tty)
 {
 
   /* 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,


@@ -510,14 +509,13 @@ prepare_execution_command (struct target_ops *target, int background)
   if (background && !target->to_can_async_p (target))
     error (_("Asynchronous execution not supported on this target."));
 
   if (background && !target->to_can_async_p (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 ();

     }
 }
 
     }
 }
 


@@ -592,16 +590,16 @@ 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.  */
     }
 
   /* Done with ARGS.  */


@@ -634,7 +632,7 @@ run_command_1 (char *args, int from_tty, int tbreak_at_main)
 
   /* 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.  */


@@ -647,13 +645,6 @@ run_command (char *args, int from_tty)
   run_command_1 (args, from_tty, 0);
 }
 
   run_command_1 (args, from_tty, 0);
 }
 

-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.  */
 
 /* Start the execution of the program up until the beginning of the main
    program.  */
 


@@ -687,7 +678,7 @@ proceed_thread_callback (struct thread_info *thread, void *arg)
 
   switch_to_thread (thread->ptid);
   clear_proceed_status (0);
 
   switch_to_thread (thread->ptid);
   clear_proceed_status (0);

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

   return 0;
 }
 
   return 0;
 }
 


@@ -745,7 +736,7 @@ continue_1 (int all_threads)
 
       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,


@@ -771,7 +762,7 @@ continue_1 (int all_threads)
       ensure_valid_thread ();
       ensure_not_running ();
       clear_proceed_status (0);
       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);

     }
 }
 
     }
 }
 


@@ -790,8 +781,6 @@ continue_command (char *args, int from_tty)
   args = strip_bg_char (args, &async_exec);
   args_chain = make_cleanup (xfree, args);
 
   args = strip_bg_char (args, &async_exec);
   args_chain = make_cleanup (xfree, args);
 

-  prepare_execution_command (&current_target, async_exec);
-

   if (args != NULL)
     {
       if (startswith (args, "-a"))
   if (args != NULL)
     {
       if (startswith (args, "-a"))


@@ -855,6 +844,17 @@ continue_command (char *args, int from_tty)
   /* Done with ARGS.  */
   do_cleanups (args_chain);
 
   /* 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_target, async_exec);
+

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


@@ -867,9 +867,14 @@ static void
 set_step_frame (void)
 {
   struct symtab_and_line sal;
 set_step_frame (void)
 {
   struct symtab_and_line sal;

+  CORE_ADDR pc;
+  struct frame_info *frame = get_current_frame ();
+  struct thread_info *tp = inferior_thread ();

 
 

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

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


@@ -909,14 +914,84 @@ 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
 step_1 (int skip_subroutines, int single_inst, char *count_string)
 {
 static void
 step_1 (int skip_subroutines, int single_inst, 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 cleanup *args_chain;

+  struct thread_info *thr;
+  struct step_command_fsm *step_sm;

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


@@ -933,129 +1008,107 @@ step_1 (int skip_subroutines, int single_inst, char *count_string)
   /* Done with ARGS.  */
   do_cleanups (args_chain);
 
   /* Done with ARGS.  */
   do_cleanups (args_chain);
 

-  if (!single_inst || skip_subroutines)                /* Leave si command alone.  */
-    {
-      struct thread_info *tp = inferior_thread ();
-
-      if (in_thread_list (inferior_ptid))
-       thread = pid_to_thread_id (inferior_ptid);
-
-      set_longjmp_breakpoint (tp, get_frame_id (get_current_frame ()));
+  clear_proceed_status (1);

 
 

-      make_cleanup (delete_longjmp_breakpoint_cleanup, &thread);
-    }
-
-  /* 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);
-
-         if (!target_has_execution)
-           break;
-         else
-           {
-             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 (!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;
-               }
-           }
-       }
+  step_command_fsm_prepare (step_sm, skip_subroutines,
+                           single_inst, count, thr);

 
 

-      do_cleanups (cleanups);
-    }
+  /* 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
     {
   else
     {

-      /* 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);
+      int proceeded;

 
 

-      /* We are running, and the continuation is installed.  It will
-        disable the longjmp breakpoint as appropriate.  */
-      discard_cleanups (cleanups);
+      /* 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 ();

     }
 }
 
     }
 }
 

-struct step_1_continuation_args
-{
-  int count;
-  int skip_subroutines;
-  int single_inst;
-  int thread;
-};
-
-/* 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 '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.  */

 
 

-static void
-step_1_continuation (void *args, int err)
+static int
+step_command_fsm_should_stop (struct thread_fsm *self, struct thread_info *tp)

 {
 {

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

 
 

-  if (target_has_execution)
+  if (tp->control.stop_step)

     {
     {

-      struct thread_info *tp;
+      /* 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);

 
 

-      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;
+      thread_fsm_set_finished (self);

     }
 
     }
 

-  /* 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);
+  return 1;

 }
 
 }
 

-/* 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.  */
+/* Implementation of the 'clean_up' FSM method for stepping commands.  */

 
 static void
 
 static void

-step_once (int skip_subroutines, int single_inst, int count, int thread)
+step_command_fsm_clean_up (struct thread_fsm *self, struct thread_info *thread)

 {
 {

-  struct frame_info *frame = get_current_frame ();
+  struct step_command_fsm *sm = (struct step_command_fsm *) self;
+
+  if (!sm->single_inst || sm->skip_subroutines)
+    delete_longjmp_breakpoint (thread->global_num);
+}
+
+/* Implementation of the 'async_reply_reason' FSM method for stepping
+   commands.  */
+
+static enum async_reply_reason
+step_command_fsm_async_reply_reason (struct thread_fsm *self)
+{
+  return EXEC_ASYNC_END_STEPPING_RANGE;
+}
+
+/* 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.  */

 
 

-  if (count > 0)
+static int
+prepare_one_step (struct step_command_fsm *sm)
+{
+  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 (1);

       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
+         if (!sm->skip_subroutines

              && inline_skipped_frames (inferior_ptid))
            {
              ptid_t resume_ptid;
              && inline_skipped_frames (inferior_ptid))
            {
              ptid_t resume_ptid;


@@ -1065,17 +1118,8 @@ step_once (int skip_subroutines, int single_inst, int count, int thread)
              set_running (resume_ptid, 1);
 
              step_into_inline_frame (inferior_ptid);
              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;
+             sm->count--;
+             return prepare_one_step (sm);

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


@@ -1100,7 +1144,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,36 +1154,22 @@ 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);
-      tp->control.stepping_command = 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
 }
 
 \f


@@ -1229,25 +1259,9 @@ jump_command (char *arg, int from_tty)
     }
 
   clear_proceed_status (0);
     }
 
   clear_proceed_status (0);

-  proceed (addr, GDB_SIGNAL_0, 0);
-}
-\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);
-    }
+  proceed (addr, GDB_SIGNAL_0);

 }
 \f
 }
 \f

-

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


@@ -1288,6 +1302,8 @@ signal_command (char *signum_exp, int from_tty)
        oursig = gdb_signal_from_command (num);
     }
 
        oursig = gdb_signal_from_command (num);
     }
 

+  do_cleanups (args_chain);
+

   /* Look for threads other than the current that this command ends up
      resuming too (due to schedlock off), and warn if they'll get a
      signal delivered.  "signal 0" is used to suppress a previous
   /* Look for threads other than the current that this command ends up
      resuming too (due to schedlock off), and warn if they'll get a
      signal delivered.  "signal 0" is used to suppress a previous


@@ -1316,8 +1332,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;


@@ -1325,10 +1341,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."));
     }
 


@@ -1342,7 +1358,7 @@ 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.  */
 }
 
 /* Queue a signal to be delivered to the current thread.  */


@@ -1385,22 +1401,82 @@ 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;
+  struct until_next_fsm *sm = (struct until_next_fsm *) self;

 
 

-  delete_longjmp_breakpoint (a->thread);
+  delete_longjmp_breakpoint (thread->global_num);
+}
+
+/* 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


@@ -1419,8 +1495,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 ();


@@ -1457,25 +1534,14 @@ 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


@@ -1531,26 +1597,23 @@ advance_command (char *arg, int from_tty)
 }
 \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 regcache *stop_regs;

   struct gdbarch *gdbarch;
   struct value *value;
   struct gdbarch *gdbarch;
   struct value *value;

-  struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
+  struct cleanup *cleanup;

 
 

-  /* 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);
-    }
+  stop_regs = regcache_dup (get_current_regcache ());
+  cleanup = make_cleanup_regcache_xfree (stop_regs);

 
   gdbarch = get_regcache_arch (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


@@ -1582,15 +1645,29 @@ get_return_value (struct value *function, struct type *value_type)
   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;
+
+  /* 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.  */

 
 

-  if (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 ui_file *stb;
     {
       struct value_print_options opts;
       struct ui_file *stb;


@@ -1599,116 +1676,191 @@ print_return_value (struct value *function, struct type *value_type)
       /* Print it.  */
       stb = mem_fileopen ();
       old_chain = make_cleanup_ui_file_delete (stb);
       /* 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, " = ");
+      uiout->text ("Value returned is ");
+      uiout->field_fmt ("gdb-result-var", "$%d",
+                       rv->value_history_index);
+      uiout->text (" = ");

       get_no_prettyformat_print_options (&opts);
       get_no_prettyformat_print_options (&opts);

-      value_print (value, stb, &opts);
-      ui_out_field_stream (uiout, "return-value", stb);
-      ui_out_text (uiout, "\n");
+      value_print (rv->value, stb, &opts);
+      uiout->field_stream ("return-value", stb);
+      uiout->text ("\n");

       do_cleanups (old_chain);
     }
   else
     {
       do_cleanups (old_chain);
     }
   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)
-           {
-             struct value *func;
+  return 1;
+}

 
 

-             func = read_var_value (a->function, get_current_frame ());
-             TRY
-               {
-                 /* 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);
-               }
-             CATCH (ex, RETURN_MASK_ALL)
-               {
-                 exception_print (gdb_stdout, ex);
-               }
-             END_CATCH
-           }
-       }
+/* Implementation of the 'clean_up' FSM method for the finish
+   commands.  */

 
 

-      /* 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 */);
+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;
+
+  if (f->breakpoint != NULL)
+    {
+      delete_breakpoint (f->breakpoint);
+      f->breakpoint = NULL;

     }
     }

+  delete_longjmp_breakpoint (thread->global_num);
+}

 
 

-  delete_breakpoint (a->breakpoint);
-  delete_longjmp_breakpoint (a->thread);
+/* Implementation of the 'return_value' FSM method for the finish
+   commands.  */
+
+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 ();


@@ -1746,60 +1898,68 @@ finish_backward (struct symbol *function)
       insert_step_resume_breakpoint_at_sal (gdbarch,
                                            sr_sal, null_frame_id);
 
       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);

 
   /* 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
 }
 
 /* "finish": Set a temporary breakpoint at the place the selected


@@ -1809,9 +1969,10 @@ static void
 finish_command (char *arg, int from_tty)
 {
   struct frame_info *frame;
 finish_command (char *arg, int from_tty)
 {
   struct frame_info *frame;

-  struct symbol *function;

   int async_exec;
   struct cleanup *args_chain;
   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 ();


@@ -1836,9 +1997,14 @@ finish_command (char *arg, int from_tty)
 
   clear_proceed_status (0);
 
 
   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)
     {


@@ -1847,7 +2013,6 @@ 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);
       struct symtab_and_line empty_sal;
 
       init_sal (&empty_sal);


@@ -1864,18 +2029,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.  */


@@ -1885,10 +2045,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 "));
        }


@@ -1897,9 +2057,16 @@ 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
 
 }
 \f
 


@@ -2140,7 +2307,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));


@@ -2149,7 +2315,6 @@ 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,
                 file, 0, val, &opts, current_language);
 
                 value_embedded_offset (val), 0,
                 file, 0, val, &opts, current_language);
 


@@ -2168,7 +2333,6 @@ 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,
                 file, 0, val, &opts, current_language);
       /* If not a vector register, print it also according to its
                 value_embedded_offset (val), 0,
                 file, 0, val, &opts, current_language);
       /* If not a vector register, print it also according to its


@@ -2179,7 +2343,6 @@ default_print_one_register_info (struct ui_file *file,
          opts.deref_ref = 1;
          fprintf_filtered (file, "\t");
          val_print (regtype,
          opts.deref_ref = 1;
          fprintf_filtered (file, "\t");
          val_print (regtype,

-                    value_contents_for_printing (val),

                     value_embedded_offset (val), 0,
                     file, 0, val, &opts, current_language);
        }
                     value_embedded_offset (val), 0,
                     file, 0, val, &opts, current_language);
        }


@@ -2454,7 +2617,7 @@ proceed_after_attach_callback (struct thread_info *thread,
     {
       switch_to_thread (thread->ptid);
       clear_proceed_status (0);
     {
       switch_to_thread (thread->ptid);
       clear_proceed_status (0);

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

     }
 
   return 0;
     }
 
   return 0;


@@ -2476,44 +2639,20 @@ proceed_after_attach (int pid)
   do_cleanups (old_chain);
 }
 
   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 (ptid_get_pid (inferior_ptid), 1, from_tty);

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


@@ -2524,8 +2663,37 @@ attach_command_post_wait (char *args, int from_tty, int async_exec)
   target_post_attach (ptid_get_pid (inferior_ptid));
 
   post_create_inferior (&current_target, from_tty);
   target_post_attach (ptid_get_pid (inferior_ptid));
 
   post_create_inferior (&current_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,

 
 

-  if (async_exec)
+  /* Re-resume threads that are marked running.  */
+  ATTACH_POST_WAIT_RESUME,
+
+  /* Stop all threads.  */
+  ATTACH_POST_WAIT_STOP,
+};
+
+/* 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, */
+
+static void
+attach_post_wait (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.  */


@@ -2541,18 +2709,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


@@ -2562,6 +2727,30 @@ attach_command_post_wait (char *args, int from_tty, int async_exec)
         should have no effect on already stopped threads.  */
       if (non_stop)
        target_stop (pid_to_ptid (inferior->pid));
         should have no effect on already stopped threads.  */
       if (non_stop)
        target_stop (pid_to_ptid (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 (ptid_get_pid (thread->ptid) == pid)
+               {
+                 if (thread->inf->num < lowest->inf->num
+                     || thread->per_inf_num < lowest->per_inf_num)
+                   lowest = thread;
+               }
+           }
+
+         switch_to_thread (lowest->ptid);
+       }

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


@@ -2574,35 +2763,43 @@ 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
 attach_command (char *args, int from_tty)
 {
   int async_exec;
   struct cleanup *args_chain;
   struct target_ops *attach_target;
 void
 attach_command (char *args, int from_tty)
 {
   int async_exec;
   struct cleanup *args_chain;
   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 */
 


@@ -2637,9 +2834,6 @@ attach_command (char *args, int from_tty)
      shouldn't refer to attach_target again.  */
   attach_target = NULL;
 
      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.  */
   target_terminal_init ();
   /* Set up the "saved terminal modes" of the inferior
      based on what modes we are starting it with.  */
   target_terminal_init ();


@@ -2665,7 +2859,9 @@ attach_command (char *args, int from_tty)
   init_wait_for_inferior ();
   clear_proceed_status (0);
 
   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


@@ -2680,11 +2876,13 @@ attach_command (char *args, int from_tty)
        target_stop (pid_to_ptid (ptid_get_pid (inferior_ptid)));
     }
 
        target_stop (pid_to_ptid (ptid_get_pid (inferior_ptid)));
     }
 

+  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.  */
   if (!target_attach_no_wait)
     {
   /* Some system don't generate traps when attaching to inferior.
      E.g. Mach 3 or GNU hurd.  */
   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


@@ -2693,24 +2891,25 @@ 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_inferior ();
+      /* 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);
+      /* Done with ARGS.  */
+      do_cleanups (args_chain);
+
+      if (!target_is_async_p ())
+       mark_infrun_async_event_handler ();
+      return;

     }
 
     }
 

-  attach_command_post_wait (args, from_tty, async_exec);
+  /* Done with ARGS.  */
+  do_cleanups (args_chain);
+
+  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


@@ -2725,26 +2924,25 @@ void
 notice_new_inferior (ptid_t ptid, int leave_running, int from_tty)
 {
   struct cleanup* old_chain;
 notice_new_inferior (ptid_t ptid, int leave_running, int from_tty)
 {
   struct cleanup* old_chain;

-  int async_exec;
+  enum attach_post_wait_mode mode;

 
   old_chain = make_cleanup (null_cleanup, NULL);
 
 
   old_chain = make_cleanup (null_cleanup, NULL);
 

-  /* 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;
+  mode = leave_running ? ATTACH_POST_WAIT_RESUME : ATTACH_POST_WAIT_NOTHING;

 
   if (!ptid_equal (inferior_ptid, null_ptid))
     make_cleanup_restore_current_thread ();
 
 
   if (!ptid_equal (inferior_ptid, null_ptid))
     make_cleanup_restore_current_thread ();
 

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

 
   /* 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))
     {
 
   /* 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))
     {

+      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,


@@ -2755,26 +2953,18 @@ 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 = 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);
+      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);

 
 

-         do_cleanups (old_chain);
-         return;
-       }
-      else
-       wait_for_inferior ();
+      do_cleanups (old_chain);
+      return;

     }
 
     }
 

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

 
   do_cleanups (old_chain);
 }
 
   do_cleanups (old_chain);
 }


@@ -2804,6 +2994,13 @@ detach_command (char *args, int from_tty)
 
   target_detach (args, from_tty);
 
 
   target_detach (args, 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 (!gdbarch_has_global_solist (target_gdbarch ()))
   /* If the solist is global across inferiors, don't clear it when we
      detach from a single inferior.  */
   if (!gdbarch_has_global_solist (target_gdbarch ()))


@@ -2848,7 +3045,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 (ptid);

 
   /* 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,


@@ -2862,7 +3063,7 @@ 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.  */
 
    mode, stop the current thread only by default, or stop all threads
    if the `-a' switch is used.  */
 


@@ -3019,14 +3220,16 @@ _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);
+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);

   add_com_alias ("tty", "set inferior-tty", class_alias, 0);
 
   cmd_name = "args";
   add_com_alias ("tty", "set inferior-tty", class_alias, 0);
 
   cmd_name = "args";


@@ -3168,8 +3371,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\


@@ -3199,21 +3400,6 @@ for an address to start at."));
   set_cmd_completer (c, location_completer);
   add_com_alias ("j", "jump", class_run, 1);
 
   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\


@@ -3239,9 +3425,6 @@ To cancel previous arguments and run with no arguments,\n\
 use \"set args\" without arguments."));
   set_cmd_completer (c, filename_completer);
   add_com_alias ("r", "run", class_run, 1);
 use \"set args\" without arguments."));
   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, _("\
 Run the debugged program until the beginning of the main procedure.\n\
 
   c = add_com ("start", class_run, start_command, _("\
 Run the debugged program until the beginning of the main procedure.\n\


@@ -3261,14 +3444,6 @@ Register name as argument means describe only that register."));
   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, _("\
 List of all registers and their contents, for selected stack frame.\n\
 Register name as argument means describe only that register."));
   c = add_info ("all-registers", all_registers_info, _("\
 List of all registers and their contents, for selected stack frame.\n\
 Register name as argument means describe only that register."));