import gdb-1999-07-07 post reformat

1 files changed, 1602 insertions, 1599 deletions

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 80cc891..8fa98ae 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1,21 +1,22 @@
 /* Target-struct-independent code to start (run) and stop an inferior process.
    Copyright 1986-1989, 1991-1999 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   This file is part of GDB.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "gdb_string.h"
@@ -51,7 +52,7 @@ static int hook_stop_stub PARAMS ((PTR));
 
 static void delete_breakpoint_current_contents PARAMS ((PTR));
 
-static void set_follow_fork_mode_command PARAMS ((char *arg, int from_tty, struct cmd_list_element *c));
+static void set_follow_fork_mode_command PARAMS ((char *arg, int from_tty, struct cmd_list_element * c));
 
 static void complete_execution PARAMS ((void));
 
@@ -119,19 +120,19 @@ static void follow_fork PARAMS ((int parent_pid, int child_pid));
 static void follow_vfork PARAMS ((int parent_pid, int child_pid));
 
 static void set_schedlock_func PARAMS ((char *args, int from_tty,
-					struct cmd_list_element *c));
+					struct cmd_list_element * c));
 
-static int is_internal_shlib_eventpoint PARAMS ((struct breakpoint *ep));
+static int is_internal_shlib_eventpoint PARAMS ((struct breakpoint * ep));
 
 static int stopped_for_internal_shlib_event PARAMS ((bpstat bs));
 
 static int stopped_for_shlib_catchpoint PARAMS ((bpstat bs,
-						 struct breakpoint **cp_p));
+						 struct breakpoint ** cp_p));
 
 #if __STDC__
 struct execution_control_state;
 #endif
-static int currently_stepping PARAMS ((struct execution_control_state *ecs));
+static int currently_stepping PARAMS ((struct execution_control_state * ecs));
 
 static void xdb_handle_command PARAMS ((char *args, int from_tty));
 
@@ -384,8 +385,8 @@ static char *follow_fork_mode_kind_names[] =
    kernel problem.  It's also not terribly useful without a GUI to
    help the user drive two debuggers.  So for now, I'm disabling
    the "both" option.
-  "parent", "child", "both", "ask" };
-  */
+   "parent", "child", "both", "ask" };
+ */
   "parent", "child", "ask"};
 
 static char *follow_fork_mode_string = NULL;
@@ -511,7 +512,7 @@ follow_inferior_fork (parent_pid, child_pid, has_forked, has_vforked)
       char pid_suffix[100];	/* Arbitrary length. */
 
       /* Clone ourselves to follow the child.  This is the end of our
-       involvement with child_pid; our clone will take it from here... */
+         involvement with child_pid; our clone will take it from here... */
       dont_repeat ();
       target_clone_and_follow_inferior (child_pid, &followed_child);
       followed_parent = !followed_child;
@@ -546,12 +547,12 @@ follow_inferior_fork (parent_pid, child_pid, has_forked, has_vforked)
 
      Sequence of events, as reported to gdb from HPUX:
 
-           Parent        Child           Action for gdb to take
-         -------------------------------------------------------
-        1                VFORK               Continue child
-        2                EXEC
-        3                EXEC or EXIT
-        4  VFORK */
+     Parent        Child           Action for gdb to take
+     -------------------------------------------------------
+     1                VFORK               Continue child
+     2                EXEC
+     3                EXEC or EXIT
+     4  VFORK */
   if (has_vforked)
     {
       target_post_follow_vfork (parent_pid,
@@ -667,7 +668,7 @@ follow_exec (pid, execd_pathname)
 
   gdb_flush (gdb_stdout);
   target_mourn_inferior ();
-  inferior_pid = saved_pid;   /* Because mourn_inferior resets inferior_pid. */
+  inferior_pid = saved_pid;	/* Because mourn_inferior resets inferior_pid. */
   push_target (tgt);
 
   /* That a.out is now the one to use. */
@@ -764,7 +765,7 @@ resume (step, sig)
   if (SOFTWARE_SINGLE_STEP_P && step)
     {
       /* Do it the hard way, w/temp breakpoints */
-      SOFTWARE_SINGLE_STEP (sig, 1 /*insert-breakpoints*/ );
+      SOFTWARE_SINGLE_STEP (sig, 1 /*insert-breakpoints */ );
       /* ...and don't ask hardware to do it.  */
       step = 0;
       /* and do not pull these breakpoints until after a `wait' in
@@ -794,9 +795,9 @@ resume (step, sig)
 	follow_vfork (inferior_pid, pending_follow.fork_event.child_pid);
 
 	/* Did we follow the child, but not yet see the child's exec event?
-             If so, then it actually ought to be waiting for us; we respond to
-             parent vfork events.  We don't actually want to resume the child
-             in this situation; we want to just get its exec event. */
+	   If so, then it actually ought to be waiting for us; we respond to
+	   parent vfork events.  We don't actually want to resume the child
+	   in this situation; we want to just get its exec event. */
 	if (!saw_child_exec &&
 	    (inferior_pid == pending_follow.fork_event.child_pid))
 	  should_resume = 0;
@@ -805,7 +806,7 @@ resume (step, sig)
 
     case (TARGET_WAITKIND_EXECD):
       /* If we saw a vfork event but couldn't follow it until we saw
-           an exec, then now might be the time! */
+         an exec, then now might be the time! */
       pending_follow.kind = TARGET_WAITKIND_SPURIOUS;
       /* follow_exec is called as soon as the exec event is seen. */
       break;
@@ -829,7 +830,7 @@ resume (step, sig)
 	  if (!breakpoint_here_p (read_pc ()))
 	    {
 	      /* Breakpoint deleted: ok to do regular resume
-		 where all the threads either step or continue. */
+	         where all the threads either step or continue. */
 	      target_resume (-1, step, sig);
 	    }
 	  else
@@ -886,11 +887,11 @@ clear_proceed_status ()
 
    ADDR is the address to resume at, or -1 for resume where stopped.
    SIGGNAL is the signal to give it, or 0 for none,
-     or -1 for act according to how it stopped.
+   or -1 for act according to how it stopped.
    STEP is nonzero if should trap after one instruction.
-     -1 means return after that and print nothing.
-     You should probably set various step_... variables
-     before calling here, if you are stepping.
+   -1 means return after that and print nothing.
+   You should probably set various step_... variables
+   before calling here, if you are stepping.
 
    You should call clear_proceed_status before calling proceed.  */
 
@@ -910,8 +911,8 @@ proceed (addr, siggnal, step)
   if (addr == (CORE_ADDR) - 1)
     {
       /* If there is a breakpoint at the address we will resume at,
-	 step one instruction before inserting breakpoints
-	 so that we do not stop right away (and report a second
+         step one instruction before inserting breakpoints
+         so that we do not stop right away (and report a second
          hit at this breakpoint).  */
 
       if (read_pc () == stop_pc && breakpoint_here_p (read_pc ()))
@@ -922,8 +923,8 @@ proceed (addr, siggnal, step)
 #define STEP_SKIPS_DELAY_P (0)
 #endif
       /* Check breakpoint_here_p first, because breakpoint_here_p is fast
-	 (it just checks internal GDB data structures) and STEP_SKIPS_DELAY
-	 is slow (it needs to read memory from the target).  */
+         (it just checks internal GDB data structures) and STEP_SKIPS_DELAY
+         is slow (it needs to read memory from the target).  */
       if (STEP_SKIPS_DELAY_P
 	  && breakpoint_here_p (read_pc () + 4)
 	  && STEP_SKIPS_DELAY (read_pc ()))
@@ -934,13 +935,13 @@ proceed (addr, siggnal, step)
       write_pc (addr);
 
       /* New address; we don't need to single-step a thread
-	 over a breakpoint we just hit, 'cause we aren't
-	 continuing from there.
+         over a breakpoint we just hit, 'cause we aren't
+         continuing from there.
 
-	 It's not worth worrying about the case where a user
-	 asks for a "jump" at the current PC--if they get the
-	 hiccup of re-hiting a hit breakpoint, what else do
-	 they expect? */
+         It's not worth worrying about the case where a user
+         asks for a "jump" at the current PC--if they get the
+         hiccup of re-hiting a hit breakpoint, what else do
+         they expect? */
       thread_step_needed = 0;
     }
 
@@ -968,9 +969,9 @@ proceed (addr, siggnal, step)
   if (trap_expected_after_continue)
     {
       /* If (step == 0), a trap will be automatically generated after
-	 the first instruction is executed.  Force step one
-	 instruction to clear this condition.  This should not occur
-	 if step is nonzero, but it is harmless in that case.  */
+         the first instruction is executed.  Force step one
+         instruction to clear this condition.  This should not occur
+         if step is nonzero, but it is harmless in that case.  */
       oneproc = 1;
       trap_expected_after_continue = 0;
     }
@@ -1048,8 +1049,8 @@ start_remote ()
   else
     {
       /* The 'tar rem' command should always look synchronous,
-	 i.e. display the prompt only once it has connected and
-	 started the target. */
+         i.e. display the prompt only once it has connected and
+         started the target. */
       sync_execution = 1;
       push_prompt ("", "", "");
       delete_file_handler (input_fd);
@@ -1104,7 +1105,8 @@ delete_breakpoint_current_contents (arg)
    wfi can call target_wait in one place.  (Ultimately the call will be
    moved out of the infinite loop entirely.) */
 
-enum infwait_states {
+enum infwait_states
+{
   infwait_normal_state,
   infwait_thread_hop_state,
   infwait_nullified_state,
@@ -1115,36 +1117,37 @@ enum infwait_states {
    wait_for_inferior.  Probably many of them can return to being
    locals in handle_inferior_event.  */
 
-struct execution_control_state {
-  struct target_waitstatus ws;
-  struct target_waitstatus *wp;
-  int another_trap;
-  int random_signal;
-  CORE_ADDR stop_func_start;
-  CORE_ADDR stop_func_end;
-  char *stop_func_name;
-  struct symtab_and_line sal;
-  int remove_breakpoints_on_following_step;
-  int current_line;
-  struct symtab *current_symtab;
-  int handling_longjmp;	/* FIXME */
-  int pid;
-  int saved_inferior_pid;
-  int update_step_sp;
-  int stepping_through_solib_after_catch;
-  bpstat stepping_through_solib_catchpoints;
-  int enable_hw_watchpoints_after_wait;
-  int stepping_through_sigtramp;
-  int new_thread_event;
-  struct target_waitstatus tmpstatus;
-  enum infwait_states infwait_state;
-  int waiton_pid;
-  int wait_some_more;
-};
-
-void init_execution_control_state PARAMS ((struct execution_control_state *ecs));
-
-void handle_inferior_event PARAMS ((struct execution_control_state *ecs));
+struct execution_control_state
+  {
+    struct target_waitstatus ws;
+    struct target_waitstatus *wp;
+    int another_trap;
+    int random_signal;
+    CORE_ADDR stop_func_start;
+    CORE_ADDR stop_func_end;
+    char *stop_func_name;
+    struct symtab_and_line sal;
+    int remove_breakpoints_on_following_step;
+    int current_line;
+    struct symtab *current_symtab;
+    int handling_longjmp;	/* FIXME */
+    int pid;
+    int saved_inferior_pid;
+    int update_step_sp;
+    int stepping_through_solib_after_catch;
+    bpstat stepping_through_solib_catchpoints;
+    int enable_hw_watchpoints_after_wait;
+    int stepping_through_sigtramp;
+    int new_thread_event;
+    struct target_waitstatus tmpstatus;
+    enum infwait_states infwait_state;
+    int waiton_pid;
+    int wait_some_more;
+  };
+
+void init_execution_control_state PARAMS ((struct execution_control_state * ecs));
+
+void handle_inferior_event PARAMS ((struct execution_control_state * ecs));
 
 /* Wait for control to return from inferior to debugger.
    If inferior gets a signal, we may decide to start it up again
@@ -1220,14 +1223,14 @@ fetch_inferior_event ()
 {
   static struct cleanup *old_cleanups;
 
-  async_ecs = &async_ecss;  
+  async_ecs = &async_ecss;
 
   if (!async_ecs->wait_some_more)
     {
       old_cleanups = make_exec_cleanup (delete_breakpoint_current_contents,
-				   &step_resume_breakpoint);
+					&step_resume_breakpoint);
       make_exec_cleanup (delete_breakpoint_current_contents,
-		    &through_sigtramp_breakpoint);
+			 &through_sigtramp_breakpoint);
 
       /* Fill in with reasonable starting values.  */
       init_execution_control_state (async_ecs);
@@ -1241,10 +1244,10 @@ fetch_inferior_event ()
       overlay_cache_invalid = 1;
 
       /* We have to invalidate the registers BEFORE calling target_wait
-	 because they can be loaded from the target while in target_wait.
-	 This makes remote debugging a bit more efficient for those
-	 targets that provide critical registers as part of their normal
-	 status mechanism. */
+         because they can be loaded from the target while in target_wait.
+         This makes remote debugging a bit more efficient for those
+         targets that provide critical registers as part of their normal
+         status mechanism. */
 
       registers_changed ();
     }
@@ -1305,362 +1308,362 @@ handle_inferior_event (ecs)
 
   /* Keep this extra brace for now, minimizes diffs.  */
   {
-      switch (ecs->infwait_state)
-	{
-	case infwait_normal_state:
-	  /* Since we've done a wait, we have a new event.  Don't
-	     carry over any expectations about needing to step over a
-	     breakpoint. */
-	  thread_step_needed = 0;
-
-	  /* See comments where a TARGET_WAITKIND_SYSCALL_RETURN event
-	     is serviced in this loop, below. */
-	  if (ecs->enable_hw_watchpoints_after_wait)
-	    {
-	      TARGET_ENABLE_HW_WATCHPOINTS (inferior_pid);
-	      ecs->enable_hw_watchpoints_after_wait = 0;
-	    }
-	  stepped_after_stopped_by_watchpoint = 0;
-	  break;
+    switch (ecs->infwait_state)
+      {
+      case infwait_normal_state:
+	/* Since we've done a wait, we have a new event.  Don't
+	   carry over any expectations about needing to step over a
+	   breakpoint. */
+	thread_step_needed = 0;
+
+	/* See comments where a TARGET_WAITKIND_SYSCALL_RETURN event
+	   is serviced in this loop, below. */
+	if (ecs->enable_hw_watchpoints_after_wait)
+	  {
+	    TARGET_ENABLE_HW_WATCHPOINTS (inferior_pid);
+	    ecs->enable_hw_watchpoints_after_wait = 0;
+	  }
+	stepped_after_stopped_by_watchpoint = 0;
+	break;
 
-	case infwait_thread_hop_state:
-	  insert_breakpoints ();
+      case infwait_thread_hop_state:
+	insert_breakpoints ();
 
-	  /* We need to restart all the threads now,
-	   * unles we're running in scheduler-locked mode. 
-	   * FIXME: shouldn't we look at currently_stepping ()?
-	   */
-	  if (scheduler_mode == schedlock_on)
-	    target_resume (ecs->pid, 0, TARGET_SIGNAL_0);
-	  else
-	    target_resume (-1, 0, TARGET_SIGNAL_0);
-	  ecs->infwait_state = infwait_normal_state;
-	  goto wfi_continue;
+	/* We need to restart all the threads now,
+	 * unles we're running in scheduler-locked mode. 
+	 * FIXME: shouldn't we look at currently_stepping ()?
+	 */
+	if (scheduler_mode == schedlock_on)
+	  target_resume (ecs->pid, 0, TARGET_SIGNAL_0);
+	else
+	  target_resume (-1, 0, TARGET_SIGNAL_0);
+	ecs->infwait_state = infwait_normal_state;
+	goto wfi_continue;
 
-	case infwait_nullified_state:
-	  break;
+      case infwait_nullified_state:
+	break;
 
-	case infwait_nonstep_watch_state:
-	  insert_breakpoints ();
+      case infwait_nonstep_watch_state:
+	insert_breakpoints ();
 
-	  /* FIXME-maybe: is this cleaner than setting a flag?  Does it
-	     handle things like signals arriving and other things happening
-	     in combination correctly?  */
-	  stepped_after_stopped_by_watchpoint = 1;
-	  break;
-	}
-      ecs->infwait_state = infwait_normal_state;
+	/* FIXME-maybe: is this cleaner than setting a flag?  Does it
+	   handle things like signals arriving and other things happening
+	   in combination correctly?  */
+	stepped_after_stopped_by_watchpoint = 1;
+	break;
+      }
+    ecs->infwait_state = infwait_normal_state;
 
-      flush_cached_frames ();
+    flush_cached_frames ();
 
-      /* If it's a new process, add it to the thread database */
+    /* If it's a new process, add it to the thread database */
 
-      ecs->new_thread_event = ((ecs->pid != inferior_pid) && !in_thread_list (ecs->pid));
+    ecs->new_thread_event = ((ecs->pid != inferior_pid) && !in_thread_list (ecs->pid));
 
-      if (ecs->ws.kind != TARGET_WAITKIND_EXITED
-	  && ecs->ws.kind != TARGET_WAITKIND_SIGNALLED
-	  && ecs->new_thread_event)
-	{
-	  add_thread (ecs->pid);
+    if (ecs->ws.kind != TARGET_WAITKIND_EXITED
+	&& ecs->ws.kind != TARGET_WAITKIND_SIGNALLED
+	&& ecs->new_thread_event)
+      {
+	add_thread (ecs->pid);
 
-	  printf_filtered ("[New %s]\n", target_pid_or_tid_to_str (ecs->pid));
+	printf_filtered ("[New %s]\n", target_pid_or_tid_to_str (ecs->pid));
 
 #if 0
-	  /* NOTE: This block is ONLY meant to be invoked in case of a
-	     "thread creation event"!  If it is invoked for any other
-	     sort of event (such as a new thread landing on a breakpoint),
-	     the event will be discarded, which is almost certainly
-	     a bad thing!
-	
-	     To avoid this, the low-level module (eg. target_wait)
-	     should call in_thread_list and add_thread, so that the
-	     new thread is known by the time we get here.  */
-
-	  /* We may want to consider not doing a resume here in order
-	     to give the user a chance to play with the new thread.
-	     It might be good to make that a user-settable option.  */
-
-	  /* At this point, all threads are stopped (happens
-	     automatically in either the OS or the native code).
-	     Therefore we need to continue all threads in order to
-	     make progress.  */
-
-	  target_resume (-1, 0, TARGET_SIGNAL_0);
-	  goto wfi_continue;
+	/* NOTE: This block is ONLY meant to be invoked in case of a
+	   "thread creation event"!  If it is invoked for any other
+	   sort of event (such as a new thread landing on a breakpoint),
+	   the event will be discarded, which is almost certainly
+	   a bad thing!
+
+	   To avoid this, the low-level module (eg. target_wait)
+	   should call in_thread_list and add_thread, so that the
+	   new thread is known by the time we get here.  */
+
+	/* We may want to consider not doing a resume here in order
+	   to give the user a chance to play with the new thread.
+	   It might be good to make that a user-settable option.  */
+
+	/* At this point, all threads are stopped (happens
+	   automatically in either the OS or the native code).
+	   Therefore we need to continue all threads in order to
+	   make progress.  */
+
+	target_resume (-1, 0, TARGET_SIGNAL_0);
+	goto wfi_continue;
 #endif
-	}
+      }
 
-      switch (ecs->ws.kind)
-	{
-	case TARGET_WAITKIND_LOADED:
-	  /* Ignore gracefully during startup of the inferior, as it
-	     might be the shell which has just loaded some objects,
-	     otherwise add the symbols for the newly loaded objects.  */
+    switch (ecs->ws.kind)
+      {
+      case TARGET_WAITKIND_LOADED:
+	/* Ignore gracefully during startup of the inferior, as it
+	   might be the shell which has just loaded some objects,
+	   otherwise add the symbols for the newly loaded objects.  */
 #ifdef SOLIB_ADD
-	  if (!stop_soon_quietly)
-	    {
-	      /* Remove breakpoints, SOLIB_ADD might adjust
-		 breakpoint addresses via breakpoint_re_set.  */
-	      if (breakpoints_inserted)
-		remove_breakpoints ();
+	if (!stop_soon_quietly)
+	  {
+	    /* Remove breakpoints, SOLIB_ADD might adjust
+	       breakpoint addresses via breakpoint_re_set.  */
+	    if (breakpoints_inserted)
+	      remove_breakpoints ();
 
-	      /* Check for any newly added shared libraries if we're
-		 supposed to be adding them automatically.  */
-	      if (auto_solib_add)
-		{
-		  /* Switch terminal for any messages produced by
-		     breakpoint_re_set.  */
-		  target_terminal_ours_for_output ();
-		  SOLIB_ADD (NULL, 0, NULL);
-		  target_terminal_inferior ();
-		}
+	    /* Check for any newly added shared libraries if we're
+	       supposed to be adding them automatically.  */
+	    if (auto_solib_add)
+	      {
+		/* Switch terminal for any messages produced by
+		   breakpoint_re_set.  */
+		target_terminal_ours_for_output ();
+		SOLIB_ADD (NULL, 0, NULL);
+		target_terminal_inferior ();
+	      }
 
-	      /* Reinsert breakpoints and continue.  */
-	      if (breakpoints_inserted)
-		insert_breakpoints ();
-	    }
+	    /* Reinsert breakpoints and continue.  */
+	    if (breakpoints_inserted)
+	      insert_breakpoints ();
+	  }
 #endif
-	  resume (0, TARGET_SIGNAL_0);
-	  goto wfi_continue;
-
-	case TARGET_WAITKIND_SPURIOUS:
-	  resume (0, TARGET_SIGNAL_0);
-	  goto wfi_continue;
-
-	case TARGET_WAITKIND_EXITED:
-	  target_terminal_ours ();	/* Must do this before mourn anyway */
-	  annotate_exited (ecs->ws.value.integer);
-	  if (ecs->ws.value.integer)
-	    printf_filtered ("\nProgram exited with code 0%o.\n",
-			     (unsigned int) ecs->ws.value.integer);
-	  else
-	    printf_filtered ("\nProgram exited normally.\n");
-
-	  /* Record the exit code in the convenience variable $_exitcode, so
-	     that the user can inspect this again later.  */
-	  set_internalvar (lookup_internalvar ("_exitcode"),
-			   value_from_longest (builtin_type_int,
-					       (LONGEST) ecs->ws.value.integer));
-	  gdb_flush (gdb_stdout);
-	  target_mourn_inferior ();
-	  singlestep_breakpoints_inserted_p = 0;	/*SOFTWARE_SINGLE_STEP_P*/
-	  stop_print_frame = 0;
-	  goto stop_stepping;
-
-	case TARGET_WAITKIND_SIGNALLED:
-	  stop_print_frame = 0;
-	  stop_signal = ecs->ws.value.sig;
-	  target_terminal_ours ();	/* Must do this before mourn anyway */
-	  annotate_signalled ();
-
-	  /* This looks pretty bogus to me.  Doesn't TARGET_WAITKIND_SIGNALLED
-	     mean it is already dead?  This has been here since GDB 2.8, so
-	     perhaps it means rms didn't understand unix waitstatuses?
-	     For the moment I'm just kludging around this in remote.c
-	     rather than trying to change it here --kingdon, 5 Dec 1994.  */
-	  target_kill ();	/* kill mourns as well */
-
-	  printf_filtered ("\nProgram terminated with signal ");
-	  annotate_signal_name ();
-	  printf_filtered ("%s", target_signal_to_name (stop_signal));
-	  annotate_signal_name_end ();
-	  printf_filtered (", ");
-	  annotate_signal_string ();
-	  printf_filtered ("%s", target_signal_to_string (stop_signal));
-	  annotate_signal_string_end ();
-	  printf_filtered (".\n");
-
-	  printf_filtered ("The program no longer exists.\n");
-	  gdb_flush (gdb_stdout);
-	  singlestep_breakpoints_inserted_p = 0;	/*SOFTWARE_SINGLE_STEP_P*/
-	  goto stop_stepping;
-
-	  /* The following are the only cases in which we keep going;
-           the above cases end in a continue or goto. */
-	case TARGET_WAITKIND_FORKED:
-	  stop_signal = TARGET_SIGNAL_TRAP;
-	  pending_follow.kind = ecs->ws.kind;
-
-	  /* Ignore fork events reported for the parent; we're only
-             interested in reacting to forks of the child.  Note that
-             we expect the child's fork event to be available if we
-             waited for it now. */
-	  if (inferior_pid == ecs->pid)
-	    {
-	      pending_follow.fork_event.saw_parent_fork = 1;
-	      pending_follow.fork_event.parent_pid = ecs->pid;
-	      pending_follow.fork_event.child_pid = ecs->ws.value.related_pid;
-	      goto wfi_continue;
-	    }
-	  else
-	    {
-	      pending_follow.fork_event.saw_child_fork = 1;
-	      pending_follow.fork_event.child_pid = ecs->pid;
-	      pending_follow.fork_event.parent_pid = ecs->ws.value.related_pid;
-	    }
+	resume (0, TARGET_SIGNAL_0);
+	goto wfi_continue;
+
+      case TARGET_WAITKIND_SPURIOUS:
+	resume (0, TARGET_SIGNAL_0);
+	goto wfi_continue;
+
+      case TARGET_WAITKIND_EXITED:
+	target_terminal_ours ();	/* Must do this before mourn anyway */
+	annotate_exited (ecs->ws.value.integer);
+	if (ecs->ws.value.integer)
+	  printf_filtered ("\nProgram exited with code 0%o.\n",
+			   (unsigned int) ecs->ws.value.integer);
+	else
+	  printf_filtered ("\nProgram exited normally.\n");
+
+	/* Record the exit code in the convenience variable $_exitcode, so
+	   that the user can inspect this again later.  */
+	set_internalvar (lookup_internalvar ("_exitcode"),
+			 value_from_longest (builtin_type_int,
+					  (LONGEST) ecs->ws.value.integer));
+	gdb_flush (gdb_stdout);
+	target_mourn_inferior ();
+	singlestep_breakpoints_inserted_p = 0;	/*SOFTWARE_SINGLE_STEP_P */
+	stop_print_frame = 0;
+	goto stop_stepping;
+
+      case TARGET_WAITKIND_SIGNALLED:
+	stop_print_frame = 0;
+	stop_signal = ecs->ws.value.sig;
+	target_terminal_ours ();	/* Must do this before mourn anyway */
+	annotate_signalled ();
+
+	/* This looks pretty bogus to me.  Doesn't TARGET_WAITKIND_SIGNALLED
+	   mean it is already dead?  This has been here since GDB 2.8, so
+	   perhaps it means rms didn't understand unix waitstatuses?
+	   For the moment I'm just kludging around this in remote.c
+	   rather than trying to change it here --kingdon, 5 Dec 1994.  */
+	target_kill ();		/* kill mourns as well */
+
+	printf_filtered ("\nProgram terminated with signal ");
+	annotate_signal_name ();
+	printf_filtered ("%s", target_signal_to_name (stop_signal));
+	annotate_signal_name_end ();
+	printf_filtered (", ");
+	annotate_signal_string ();
+	printf_filtered ("%s", target_signal_to_string (stop_signal));
+	annotate_signal_string_end ();
+	printf_filtered (".\n");
+
+	printf_filtered ("The program no longer exists.\n");
+	gdb_flush (gdb_stdout);
+	singlestep_breakpoints_inserted_p = 0;	/*SOFTWARE_SINGLE_STEP_P */
+	goto stop_stepping;
+
+	/* The following are the only cases in which we keep going;
+	   the above cases end in a continue or goto. */
+      case TARGET_WAITKIND_FORKED:
+	stop_signal = TARGET_SIGNAL_TRAP;
+	pending_follow.kind = ecs->ws.kind;
+
+	/* Ignore fork events reported for the parent; we're only
+	   interested in reacting to forks of the child.  Note that
+	   we expect the child's fork event to be available if we
+	   waited for it now. */
+	if (inferior_pid == ecs->pid)
+	  {
+	    pending_follow.fork_event.saw_parent_fork = 1;
+	    pending_follow.fork_event.parent_pid = ecs->pid;
+	    pending_follow.fork_event.child_pid = ecs->ws.value.related_pid;
+	    goto wfi_continue;
+	  }
+	else
+	  {
+	    pending_follow.fork_event.saw_child_fork = 1;
+	    pending_follow.fork_event.child_pid = ecs->pid;
+	    pending_follow.fork_event.parent_pid = ecs->ws.value.related_pid;
+	  }
 
-	  stop_pc = read_pc_pid (ecs->pid);
-	  ecs->saved_inferior_pid = inferior_pid;
-	  inferior_pid = ecs->pid;
-	  stop_bpstat = bpstat_stop_status
-	    (&stop_pc,
-	     (DECR_PC_AFTER_BREAK ? 
-	      (prev_pc != stop_pc - DECR_PC_AFTER_BREAK
-	       && currently_stepping (ecs))
-	      : 0)
-	    );
-	  ecs->random_signal = !bpstat_explains_signal (stop_bpstat);
-	  inferior_pid = ecs->saved_inferior_pid;
-	  goto process_event_stop_test;
-
-	  /* If this a platform which doesn't allow a debugger to touch a
-           vfork'd inferior until after it exec's, then we'd best keep
-           our fingers entirely off the inferior, other than continuing
-           it.  This has the unfortunate side-effect that catchpoints
-           of vforks will be ignored.  But since the platform doesn't
-           allow the inferior be touched at vfork time, there's really
-           little choice. */
-	case TARGET_WAITKIND_VFORKED:
-	  stop_signal = TARGET_SIGNAL_TRAP;
-	  pending_follow.kind = ecs->ws.kind;
-
-	  /* Is this a vfork of the parent?  If so, then give any
-             vfork catchpoints a chance to trigger now.  (It's
-             dangerous to do so if the child canot be touched until
-             it execs, and the child has not yet exec'd.  We probably
-             should warn the user to that effect when the catchpoint
-             triggers...) */
-	  if (ecs->pid == inferior_pid)
-	    {
-	      pending_follow.fork_event.saw_parent_fork = 1;
-	      pending_follow.fork_event.parent_pid = ecs->pid;
-	      pending_follow.fork_event.child_pid = ecs->ws.value.related_pid;
-	    }
+	stop_pc = read_pc_pid (ecs->pid);
+	ecs->saved_inferior_pid = inferior_pid;
+	inferior_pid = ecs->pid;
+	stop_bpstat = bpstat_stop_status
+	  (&stop_pc,
+	   (DECR_PC_AFTER_BREAK ?
+	    (prev_pc != stop_pc - DECR_PC_AFTER_BREAK
+	     && currently_stepping (ecs))
+	    : 0)
+	  );
+	ecs->random_signal = !bpstat_explains_signal (stop_bpstat);
+	inferior_pid = ecs->saved_inferior_pid;
+	goto process_event_stop_test;
+
+	/* If this a platform which doesn't allow a debugger to touch a
+	   vfork'd inferior until after it exec's, then we'd best keep
+	   our fingers entirely off the inferior, other than continuing
+	   it.  This has the unfortunate side-effect that catchpoints
+	   of vforks will be ignored.  But since the platform doesn't
+	   allow the inferior be touched at vfork time, there's really
+	   little choice. */
+      case TARGET_WAITKIND_VFORKED:
+	stop_signal = TARGET_SIGNAL_TRAP;
+	pending_follow.kind = ecs->ws.kind;
+
+	/* Is this a vfork of the parent?  If so, then give any
+	   vfork catchpoints a chance to trigger now.  (It's
+	   dangerous to do so if the child canot be touched until
+	   it execs, and the child has not yet exec'd.  We probably
+	   should warn the user to that effect when the catchpoint
+	   triggers...) */
+	if (ecs->pid == inferior_pid)
+	  {
+	    pending_follow.fork_event.saw_parent_fork = 1;
+	    pending_follow.fork_event.parent_pid = ecs->pid;
+	    pending_follow.fork_event.child_pid = ecs->ws.value.related_pid;
+	  }
 
-	  /* If we've seen the child's vfork event but cannot really touch
-             the child until it execs, then we must continue the child now.
-             Else, give any vfork catchpoints a chance to trigger now. */
-	  else
-	    {
-	      pending_follow.fork_event.saw_child_fork = 1;
-	      pending_follow.fork_event.child_pid = ecs->pid;
-	      pending_follow.fork_event.parent_pid = ecs->ws.value.related_pid;
-	      target_post_startup_inferior (pending_follow.fork_event.child_pid);
-	      follow_vfork_when_exec = !target_can_follow_vfork_prior_to_exec ();
-	      if (follow_vfork_when_exec)
-		{
-		  target_resume (ecs->pid, 0, TARGET_SIGNAL_0);
-		  goto wfi_continue;
-		}
-	    }
+	/* If we've seen the child's vfork event but cannot really touch
+	   the child until it execs, then we must continue the child now.
+	   Else, give any vfork catchpoints a chance to trigger now. */
+	else
+	  {
+	    pending_follow.fork_event.saw_child_fork = 1;
+	    pending_follow.fork_event.child_pid = ecs->pid;
+	    pending_follow.fork_event.parent_pid = ecs->ws.value.related_pid;
+	    target_post_startup_inferior (pending_follow.fork_event.child_pid);
+	    follow_vfork_when_exec = !target_can_follow_vfork_prior_to_exec ();
+	    if (follow_vfork_when_exec)
+	      {
+		target_resume (ecs->pid, 0, TARGET_SIGNAL_0);
+		goto wfi_continue;
+	      }
+	  }
 
-	  stop_pc = read_pc ();
-	  stop_bpstat = bpstat_stop_status
-	    (&stop_pc,
-	     (DECR_PC_AFTER_BREAK ? 
-	      (prev_pc != stop_pc - DECR_PC_AFTER_BREAK
-	       && currently_stepping (ecs))
-	      : 0)
-	     );
-	  ecs->random_signal = !bpstat_explains_signal (stop_bpstat);
-	  goto process_event_stop_test;
-
-	case TARGET_WAITKIND_EXECD:
-	  stop_signal = TARGET_SIGNAL_TRAP;
-
-	  /* Is this a target which reports multiple exec events per actual
-             call to exec()?  (HP-UX using ptrace does, for example.)  If so,
-             ignore all but the last one.  Just resume the exec'r, and wait
-             for the next exec event. */
-	  if (inferior_ignoring_leading_exec_events)
-	    {
-	      inferior_ignoring_leading_exec_events--;
-	      if (pending_follow.kind == TARGET_WAITKIND_VFORKED)
-		ENSURE_VFORKING_PARENT_REMAINS_STOPPED (pending_follow.fork_event.parent_pid);
-	      target_resume (ecs->pid, 0, TARGET_SIGNAL_0);
-	      goto wfi_continue;
-	    }
-	  inferior_ignoring_leading_exec_events =
-	    target_reported_exec_events_per_exec_call () - 1;
+	stop_pc = read_pc ();
+	stop_bpstat = bpstat_stop_status
+	  (&stop_pc,
+	   (DECR_PC_AFTER_BREAK ?
+	    (prev_pc != stop_pc - DECR_PC_AFTER_BREAK
+	     && currently_stepping (ecs))
+	    : 0)
+	  );
+	ecs->random_signal = !bpstat_explains_signal (stop_bpstat);
+	goto process_event_stop_test;
+
+      case TARGET_WAITKIND_EXECD:
+	stop_signal = TARGET_SIGNAL_TRAP;
+
+	/* Is this a target which reports multiple exec events per actual
+	   call to exec()?  (HP-UX using ptrace does, for example.)  If so,
+	   ignore all but the last one.  Just resume the exec'r, and wait
+	   for the next exec event. */
+	if (inferior_ignoring_leading_exec_events)
+	  {
+	    inferior_ignoring_leading_exec_events--;
+	    if (pending_follow.kind == TARGET_WAITKIND_VFORKED)
+	      ENSURE_VFORKING_PARENT_REMAINS_STOPPED (pending_follow.fork_event.parent_pid);
+	    target_resume (ecs->pid, 0, TARGET_SIGNAL_0);
+	    goto wfi_continue;
+	  }
+	inferior_ignoring_leading_exec_events =
+	  target_reported_exec_events_per_exec_call () - 1;
 
-	  pending_follow.execd_pathname = savestring (ecs->ws.value.execd_pathname,
-					   strlen (ecs->ws.value.execd_pathname));
+	pending_follow.execd_pathname = savestring (ecs->ws.value.execd_pathname,
+				     strlen (ecs->ws.value.execd_pathname));
 
-	  /* Did inferior_pid exec, or did a (possibly not-yet-followed)
-             child of a vfork exec?
+	/* Did inferior_pid exec, or did a (possibly not-yet-followed)
+	   child of a vfork exec?
 
-             ??rehrauer: This is unabashedly an HP-UX specific thing.  On
-             HP-UX, events associated with a vforking inferior come in
-             threes: a vfork event for the child (always first), followed
-             a vfork event for the parent and an exec event for the child.
-             The latter two can come in either order.
+	   ??rehrauer: This is unabashedly an HP-UX specific thing.  On
+	   HP-UX, events associated with a vforking inferior come in
+	   threes: a vfork event for the child (always first), followed
+	   a vfork event for the parent and an exec event for the child.
+	   The latter two can come in either order.
 
-             If we get the parent vfork event first, life's good: We follow
-             either the parent or child, and then the child's exec event is
-             a "don't care".
+	   If we get the parent vfork event first, life's good: We follow
+	   either the parent or child, and then the child's exec event is
+	   a "don't care".
 
-             But if we get the child's exec event first, then we delay
-             responding to it until we handle the parent's vfork.  Because,
-             otherwise we can't satisfy a "catch vfork". */
-	  if (pending_follow.kind == TARGET_WAITKIND_VFORKED)
-	    {
-	      pending_follow.fork_event.saw_child_exec = 1;
-
-	      /* On some targets, the child must be resumed before
-                 the parent vfork event is delivered.  A single-step
-                 suffices. */
-	      if (RESUME_EXECD_VFORKING_CHILD_TO_GET_PARENT_VFORK ())
-		target_resume (ecs->pid, 1, TARGET_SIGNAL_0);
-	      /* We expect the parent vfork event to be available now. */
-	      goto wfi_continue;
-	    }
+	   But if we get the child's exec event first, then we delay
+	   responding to it until we handle the parent's vfork.  Because,
+	   otherwise we can't satisfy a "catch vfork". */
+	if (pending_follow.kind == TARGET_WAITKIND_VFORKED)
+	  {
+	    pending_follow.fork_event.saw_child_exec = 1;
+
+	    /* On some targets, the child must be resumed before
+	       the parent vfork event is delivered.  A single-step
+	       suffices. */
+	    if (RESUME_EXECD_VFORKING_CHILD_TO_GET_PARENT_VFORK ())
+	      target_resume (ecs->pid, 1, TARGET_SIGNAL_0);
+	    /* We expect the parent vfork event to be available now. */
+	    goto wfi_continue;
+	  }
 
-	  /* This causes the eventpoints and symbol table to be reset.  Must
-             do this now, before trying to determine whether to stop. */
-	  follow_exec (inferior_pid, pending_follow.execd_pathname);
-	  free (pending_follow.execd_pathname);
-
-	  stop_pc = read_pc_pid (ecs->pid);
-	  ecs->saved_inferior_pid = inferior_pid;
-	  inferior_pid = ecs->pid;
-	  stop_bpstat = bpstat_stop_status
-	    (&stop_pc,
-	     (DECR_PC_AFTER_BREAK ? 
-	      (prev_pc != stop_pc - DECR_PC_AFTER_BREAK
-	       && currently_stepping (ecs))
-	      : 0)
-	     );
-	  ecs->random_signal = !bpstat_explains_signal (stop_bpstat);
-	  inferior_pid = ecs->saved_inferior_pid;
-	  goto process_event_stop_test;
-
-	  /* These syscall events are returned on HP-UX, as part of its
-           implementation of page-protection-based "hardware" watchpoints.
-           HP-UX has unfortunate interactions between page-protections and
-           some system calls.  Our solution is to disable hardware watches
-           when a system call is entered, and reenable them when the syscall
-           completes.  The downside of this is that we may miss the precise
-           point at which a watched piece of memory is modified.  "Oh well."
-
-           Note that we may have multiple threads running, which may each
-           enter syscalls at roughly the same time.  Since we don't have a
-           good notion currently of whether a watched piece of memory is
-           thread-private, we'd best not have any page-protections active
-           when any thread is in a syscall.  Thus, we only want to reenable
-           hardware watches when no threads are in a syscall.
-
-           Also, be careful not to try to gather much state about a thread
-           that's in a syscall.  It's frequently a losing proposition. */
-	case TARGET_WAITKIND_SYSCALL_ENTRY:
-	  number_of_threads_in_syscalls++;
-	  if (number_of_threads_in_syscalls == 1)
-	    {
-	      TARGET_DISABLE_HW_WATCHPOINTS (inferior_pid);
-	    }
-	  resume (0, TARGET_SIGNAL_0);
-	  goto wfi_continue;
+	/* This causes the eventpoints and symbol table to be reset.  Must
+	   do this now, before trying to determine whether to stop. */
+	follow_exec (inferior_pid, pending_follow.execd_pathname);
+	free (pending_follow.execd_pathname);
+
+	stop_pc = read_pc_pid (ecs->pid);
+	ecs->saved_inferior_pid = inferior_pid;
+	inferior_pid = ecs->pid;
+	stop_bpstat = bpstat_stop_status
+	  (&stop_pc,
+	   (DECR_PC_AFTER_BREAK ?
+	    (prev_pc != stop_pc - DECR_PC_AFTER_BREAK
+	     && currently_stepping (ecs))
+	    : 0)
+	  );
+	ecs->random_signal = !bpstat_explains_signal (stop_bpstat);
+	inferior_pid = ecs->saved_inferior_pid;
+	goto process_event_stop_test;
+
+	/* These syscall events are returned on HP-UX, as part of its
+	   implementation of page-protection-based "hardware" watchpoints.
+	   HP-UX has unfortunate interactions between page-protections and
+	   some system calls.  Our solution is to disable hardware watches
+	   when a system call is entered, and reenable them when the syscall
+	   completes.  The downside of this is that we may miss the precise
+	   point at which a watched piece of memory is modified.  "Oh well."
+
+	   Note that we may have multiple threads running, which may each
+	   enter syscalls at roughly the same time.  Since we don't have a
+	   good notion currently of whether a watched piece of memory is
+	   thread-private, we'd best not have any page-protections active
+	   when any thread is in a syscall.  Thus, we only want to reenable
+	   hardware watches when no threads are in a syscall.
+
+	   Also, be careful not to try to gather much state about a thread
+	   that's in a syscall.  It's frequently a losing proposition. */
+      case TARGET_WAITKIND_SYSCALL_ENTRY:
+	number_of_threads_in_syscalls++;
+	if (number_of_threads_in_syscalls == 1)
+	  {
+	    TARGET_DISABLE_HW_WATCHPOINTS (inferior_pid);
+	  }
+	resume (0, TARGET_SIGNAL_0);
+	goto wfi_continue;
 
-	  /* Before examining the threads further, step this thread to
+	/* Before examining the threads further, step this thread to
 	   get it entirely out of the syscall.  (We get notice of the
 	   event when the thread is just on the verge of exiting a
 	   syscall.  Stepping one instruction seems to get it back
@@ -1674,122 +1677,122 @@ handle_inferior_event (ecs)
 	   Thus, we simply set the flag ecs->enable_hw_watchpoints_after_wait
 	   here, which will be serviced immediately after the target
 	   is waited on. */
-	case TARGET_WAITKIND_SYSCALL_RETURN:
-	  target_resume (ecs->pid, 1, TARGET_SIGNAL_0);
+      case TARGET_WAITKIND_SYSCALL_RETURN:
+	target_resume (ecs->pid, 1, TARGET_SIGNAL_0);
 
-	  if (number_of_threads_in_syscalls > 0)
-	    {
-	      number_of_threads_in_syscalls--;
-	      ecs->enable_hw_watchpoints_after_wait =
-		(number_of_threads_in_syscalls == 0);
-	    }
-	  goto wfi_continue;
+	if (number_of_threads_in_syscalls > 0)
+	  {
+	    number_of_threads_in_syscalls--;
+	    ecs->enable_hw_watchpoints_after_wait =
+	      (number_of_threads_in_syscalls == 0);
+	  }
+	goto wfi_continue;
 
-	case TARGET_WAITKIND_STOPPED:
-	  stop_signal = ecs->ws.value.sig;
-	  break;
-	}
+      case TARGET_WAITKIND_STOPPED:
+	stop_signal = ecs->ws.value.sig;
+	break;
+      }
 
-      /* We may want to consider not doing a resume here in order to give
-         the user a chance to play with the new thread.  It might be good
-         to make that a user-settable option.  */
+    /* We may want to consider not doing a resume here in order to give
+       the user a chance to play with the new thread.  It might be good
+       to make that a user-settable option.  */
 
-      /* At this point, all threads are stopped (happens automatically in
-         either the OS or the native code).  Therefore we need to continue
-         all threads in order to make progress.  */
-      if (ecs->new_thread_event)
-	{
-	  target_resume (-1, 0, TARGET_SIGNAL_0);
-	  goto wfi_continue;
-	}
+    /* At this point, all threads are stopped (happens automatically in
+       either the OS or the native code).  Therefore we need to continue
+       all threads in order to make progress.  */
+    if (ecs->new_thread_event)
+      {
+	target_resume (-1, 0, TARGET_SIGNAL_0);
+	goto wfi_continue;
+      }
 
-      stop_pc = read_pc_pid (ecs->pid);
+    stop_pc = read_pc_pid (ecs->pid);
 
-      /* See if a thread hit a thread-specific breakpoint that was meant for
-	 another thread.  If so, then step that thread past the breakpoint,
-	 and continue it.  */
+    /* See if a thread hit a thread-specific breakpoint that was meant for
+       another thread.  If so, then step that thread past the breakpoint,
+       and continue it.  */
 
-      if (stop_signal == TARGET_SIGNAL_TRAP)
-	{
-	  if (SOFTWARE_SINGLE_STEP_P && singlestep_breakpoints_inserted_p)
+    if (stop_signal == TARGET_SIGNAL_TRAP)
+      {
+	if (SOFTWARE_SINGLE_STEP_P && singlestep_breakpoints_inserted_p)
+	  ecs->random_signal = 0;
+	else if (breakpoints_inserted
+		 && breakpoint_here_p (stop_pc - DECR_PC_AFTER_BREAK))
+	  {
 	    ecs->random_signal = 0;
-	  else if (breakpoints_inserted
-		   && breakpoint_here_p (stop_pc - DECR_PC_AFTER_BREAK))
-	    {
-	      ecs->random_signal = 0;
-	      if (!breakpoint_thread_match (stop_pc - DECR_PC_AFTER_BREAK,
-					    ecs->pid))
-		{
-		  int remove_status;
-
-		  /* Saw a breakpoint, but it was hit by the wrong thread.
-		       Just continue. */
-		  write_pc_pid (stop_pc - DECR_PC_AFTER_BREAK, ecs->pid);
-
-		  remove_status = remove_breakpoints ();
-		  /* Did we fail to remove breakpoints?  If so, try
-                       to set the PC past the bp.  (There's at least
-                       one situation in which we can fail to remove
-                       the bp's: On HP-UX's that use ttrace, we can't
-                       change the address space of a vforking child
-                       process until the child exits (well, okay, not
-                       then either :-) or execs. */
-		  if (remove_status != 0)
-		    {
-		      write_pc_pid (stop_pc - DECR_PC_AFTER_BREAK + 4, ecs->pid);
-		    }
-		  else
-		    {		/* Single step */
-		      target_resume (ecs->pid, 1, TARGET_SIGNAL_0);
-		      /* FIXME: What if a signal arrives instead of the
-			   single-step happening?  */
-
-		      ecs->waiton_pid = ecs->pid;
-		      ecs->wp = &(ecs->ws);
-		      ecs->infwait_state = infwait_thread_hop_state;
-		      goto wfi_continue;
-		    }
-
-		    /* We need to restart all the threads now,
-		     * unles we're running in scheduler-locked mode. 
-		     * FIXME: shouldn't we look at currently_stepping ()?
-		     */
-		    if (scheduler_mode == schedlock_on)
-		      target_resume (ecs->pid, 0, TARGET_SIGNAL_0);
-		    else
-		      target_resume (-1, 0, TARGET_SIGNAL_0);
+	    if (!breakpoint_thread_match (stop_pc - DECR_PC_AFTER_BREAK,
+					  ecs->pid))
+	      {
+		int remove_status;
+
+		/* Saw a breakpoint, but it was hit by the wrong thread.
+		   Just continue. */
+		write_pc_pid (stop_pc - DECR_PC_AFTER_BREAK, ecs->pid);
+
+		remove_status = remove_breakpoints ();
+		/* Did we fail to remove breakpoints?  If so, try
+		   to set the PC past the bp.  (There's at least
+		   one situation in which we can fail to remove
+		   the bp's: On HP-UX's that use ttrace, we can't
+		   change the address space of a vforking child
+		   process until the child exits (well, okay, not
+		   then either :-) or execs. */
+		if (remove_status != 0)
+		  {
+		    write_pc_pid (stop_pc - DECR_PC_AFTER_BREAK + 4, ecs->pid);
+		  }
+		else
+		  {		/* Single step */
+		    target_resume (ecs->pid, 1, TARGET_SIGNAL_0);
+		    /* FIXME: What if a signal arrives instead of the
+		       single-step happening?  */
+
+		    ecs->waiton_pid = ecs->pid;
+		    ecs->wp = &(ecs->ws);
+		    ecs->infwait_state = infwait_thread_hop_state;
 		    goto wfi_continue;
-		}
-	      else
-		{
-		  /* This breakpoint matches--either it is the right
-		       thread or it's a generic breakpoint for all threads.
-		       Remember that we'll need to step just _this_ thread
-		       on any following user continuation! */
-		  thread_step_needed = 1;
-		}
-	    }
-	}
-      else
-	ecs->random_signal = 1;
+		  }
 
-      /* See if something interesting happened to the non-current thread.  If
-         so, then switch to that thread, and eventually give control back to
-	 the user.
-
-         Note that if there's any kind of pending follow (i.e., of a fork,
-         vfork or exec), we don't want to do this now.  Rather, we'll let
-         the next resume handle it. */
-      if ((ecs->pid != inferior_pid) &&
-	  (pending_follow.kind == TARGET_WAITKIND_SPURIOUS))
-	{
-	  int printed = 0;
+		/* We need to restart all the threads now,
+		 * unles we're running in scheduler-locked mode. 
+		 * FIXME: shouldn't we look at currently_stepping ()?
+		 */
+		if (scheduler_mode == schedlock_on)
+		  target_resume (ecs->pid, 0, TARGET_SIGNAL_0);
+		else
+		  target_resume (-1, 0, TARGET_SIGNAL_0);
+		goto wfi_continue;
+	      }
+	    else
+	      {
+		/* This breakpoint matches--either it is the right
+		   thread or it's a generic breakpoint for all threads.
+		   Remember that we'll need to step just _this_ thread
+		   on any following user continuation! */
+		thread_step_needed = 1;
+	      }
+	  }
+      }
+    else
+      ecs->random_signal = 1;
+
+    /* See if something interesting happened to the non-current thread.  If
+       so, then switch to that thread, and eventually give control back to
+       the user.
+
+       Note that if there's any kind of pending follow (i.e., of a fork,
+       vfork or exec), we don't want to do this now.  Rather, we'll let
+       the next resume handle it. */
+    if ((ecs->pid != inferior_pid) &&
+	(pending_follow.kind == TARGET_WAITKIND_SPURIOUS))
+      {
+	int printed = 0;
 
-	  /* If it's a random signal for a non-current thread, notify user
-	     if he's expressed an interest. */
-	  if (ecs->random_signal
-	      && signal_print[stop_signal])
-	    {
+	/* If it's a random signal for a non-current thread, notify user
+	   if he's expressed an interest. */
+	if (ecs->random_signal
+	    && signal_print[stop_signal])
+	  {
 /* ??rehrauer: I don't understand the rationale for this code.  If the
    inferior will stop as a result of this signal, then the act of handling
    the stop ought to print a message that's couches the stoppage in user
@@ -1801,1185 +1804,1185 @@ handle_inferior_event (ecs)
 
    For now, remove the message altogether. */
 #if 0
-	      printed = 1;
-	      target_terminal_ours_for_output ();
-	      printf_filtered ("\nProgram received signal %s, %s.\n",
-			       target_signal_to_name (stop_signal),
-			       target_signal_to_string (stop_signal));
-	      gdb_flush (gdb_stdout);
+	    printed = 1;
+	    target_terminal_ours_for_output ();
+	    printf_filtered ("\nProgram received signal %s, %s.\n",
+			     target_signal_to_name (stop_signal),
+			     target_signal_to_string (stop_signal));
+	    gdb_flush (gdb_stdout);
 #endif
-	    }
-
-	  /* If it's not SIGTRAP and not a signal we want to stop for, then
-	     continue the thread. */
-
-	  if (stop_signal != TARGET_SIGNAL_TRAP
-	      && !signal_stop[stop_signal])
-	    {
-	      if (printed)
-		target_terminal_inferior ();
+	  }
 
-	      /* Clear the signal if it should not be passed.  */
-	      if (signal_program[stop_signal] == 0)
-		stop_signal = TARGET_SIGNAL_0;
+	/* If it's not SIGTRAP and not a signal we want to stop for, then
+	   continue the thread. */
 
-	      target_resume (ecs->pid, 0, stop_signal);
-	      goto wfi_continue;
-	    }
+	if (stop_signal != TARGET_SIGNAL_TRAP
+	    && !signal_stop[stop_signal])
+	  {
+	    if (printed)
+	      target_terminal_inferior ();
 
-	  /* It's a SIGTRAP or a signal we're interested in.  Switch threads,
-	     and fall into the rest of wait_for_inferior().  */
-
-	  /* Save infrun state for the old thread.  */
-	  save_infrun_state (inferior_pid, prev_pc,
-			     prev_func_start, prev_func_name,
-			     trap_expected, step_resume_breakpoint,
-			     through_sigtramp_breakpoint,
-			     step_range_start, step_range_end,
-			     step_frame_address, ecs->handling_longjmp,
-			     ecs->another_trap,
-			     ecs->stepping_through_solib_after_catch,
-			     ecs->stepping_through_solib_catchpoints,
-			     ecs->stepping_through_sigtramp);
-
-	  if (may_switch_from_inferior_pid)
-	    switched_from_inferior_pid = inferior_pid;
-
-	  inferior_pid = ecs->pid;
-
-	  /* Load infrun state for the new thread.  */
-	  load_infrun_state (inferior_pid, &prev_pc,
-			     &prev_func_start, &prev_func_name,
-			     &trap_expected, &step_resume_breakpoint,
-			     &through_sigtramp_breakpoint,
-			     &step_range_start, &step_range_end,
-			     &step_frame_address, &ecs->handling_longjmp,
-			     &ecs->another_trap,
-			     &ecs->stepping_through_solib_after_catch,
-			     &ecs->stepping_through_solib_catchpoints,
-			     &ecs->stepping_through_sigtramp);
-
-	  if (context_hook)
-	    context_hook (pid_to_thread_id (ecs->pid));
-
-	  printf_filtered ("[Switching to %s]\n", target_pid_to_str (ecs->pid));
-	  flush_cached_frames ();
-	}
+	    /* Clear the signal if it should not be passed.  */
+	    if (signal_program[stop_signal] == 0)
+	      stop_signal = TARGET_SIGNAL_0;
 
-      if (SOFTWARE_SINGLE_STEP_P && singlestep_breakpoints_inserted_p)
-	{
-	  /* Pull the single step breakpoints out of the target. */
-	  SOFTWARE_SINGLE_STEP (0, 0);
-	  singlestep_breakpoints_inserted_p = 0;
-	}
+	    target_resume (ecs->pid, 0, stop_signal);
+	    goto wfi_continue;
+	  }
 
-      /* If PC is pointing at a nullified instruction, then step beyond
-	 it so that the user won't be confused when GDB appears to be ready
-	 to execute it. */
+	/* It's a SIGTRAP or a signal we're interested in.  Switch threads,
+	   and fall into the rest of wait_for_inferior().  */
+
+	/* Save infrun state for the old thread.  */
+	save_infrun_state (inferior_pid, prev_pc,
+			   prev_func_start, prev_func_name,
+			   trap_expected, step_resume_breakpoint,
+			   through_sigtramp_breakpoint,
+			   step_range_start, step_range_end,
+			   step_frame_address, ecs->handling_longjmp,
+			   ecs->another_trap,
+			   ecs->stepping_through_solib_after_catch,
+			   ecs->stepping_through_solib_catchpoints,
+			   ecs->stepping_through_sigtramp);
+
+	if (may_switch_from_inferior_pid)
+	  switched_from_inferior_pid = inferior_pid;
+
+	inferior_pid = ecs->pid;
+
+	/* Load infrun state for the new thread.  */
+	load_infrun_state (inferior_pid, &prev_pc,
+			   &prev_func_start, &prev_func_name,
+			   &trap_expected, &step_resume_breakpoint,
+			   &through_sigtramp_breakpoint,
+			   &step_range_start, &step_range_end,
+			   &step_frame_address, &ecs->handling_longjmp,
+			   &ecs->another_trap,
+			   &ecs->stepping_through_solib_after_catch,
+			   &ecs->stepping_through_solib_catchpoints,
+			   &ecs->stepping_through_sigtramp);
+
+	if (context_hook)
+	  context_hook (pid_to_thread_id (ecs->pid));
+
+	printf_filtered ("[Switching to %s]\n", target_pid_to_str (ecs->pid));
+	flush_cached_frames ();
+      }
 
-      /*      if (INSTRUCTION_NULLIFIED && currently_stepping (ecs)) */
-      if (INSTRUCTION_NULLIFIED)
-	{
-	  registers_changed ();
-	  target_resume (ecs->pid, 1, TARGET_SIGNAL_0);
+    if (SOFTWARE_SINGLE_STEP_P && singlestep_breakpoints_inserted_p)
+      {
+	/* Pull the single step breakpoints out of the target. */
+	SOFTWARE_SINGLE_STEP (0, 0);
+	singlestep_breakpoints_inserted_p = 0;
+      }
 
-	  /* We may have received a signal that we want to pass to
-	     the inferior; therefore, we must not clobber the waitstatus
-	     in WS. */
+    /* If PC is pointing at a nullified instruction, then step beyond
+       it so that the user won't be confused when GDB appears to be ready
+       to execute it. */
 
-	  ecs->infwait_state = infwait_nullified_state;
-	  ecs->waiton_pid = ecs->pid;
-	  ecs->wp = &(ecs->tmpstatus);
-	  goto wfi_continue;
-	}
+    /*      if (INSTRUCTION_NULLIFIED && currently_stepping (ecs)) */
+    if (INSTRUCTION_NULLIFIED)
+      {
+	registers_changed ();
+	target_resume (ecs->pid, 1, TARGET_SIGNAL_0);
 
-      /* It may not be necessary to disable the watchpoint to stop over
-	 it.  For example, the PA can (with some kernel cooperation)
-	 single step over a watchpoint without disabling the watchpoint.  */
-      if (HAVE_STEPPABLE_WATCHPOINT && STOPPED_BY_WATCHPOINT (ecs->ws))
-	{
-	  resume (1, 0);
-	  goto wfi_continue;
-	}
+	/* We may have received a signal that we want to pass to
+	   the inferior; therefore, we must not clobber the waitstatus
+	   in WS. */
 
-      /* It is far more common to need to disable a watchpoint to step
-	 the inferior over it.  FIXME.  What else might a debug
-	 register or page protection watchpoint scheme need here?  */
-      if (HAVE_NONSTEPPABLE_WATCHPOINT && STOPPED_BY_WATCHPOINT (ecs->ws))
-	{
-	  /* At this point, we are stopped at an instruction which has
-	     attempted to write to a piece of memory under control of
-	     a watchpoint.  The instruction hasn't actually executed
-	     yet.  If we were to evaluate the watchpoint expression
-	     now, we would get the old value, and therefore no change
-	     would seem to have occurred.
-
-	     In order to make watchpoints work `right', we really need
-	     to complete the memory write, and then evaluate the
-	     watchpoint expression.  The following code does that by
-	     removing the watchpoint (actually, all watchpoints and
-	     breakpoints), single-stepping the target, re-inserting
-	     watchpoints, and then falling through to let normal
-	     single-step processing handle proceed.  Since this
-	     includes evaluating watchpoints, things will come to a
-	     stop in the correct manner.  */
-
-	  write_pc (stop_pc - DECR_PC_AFTER_BREAK);
+	ecs->infwait_state = infwait_nullified_state;
+	ecs->waiton_pid = ecs->pid;
+	ecs->wp = &(ecs->tmpstatus);
+	goto wfi_continue;
+      }
 
-	  remove_breakpoints ();
-	  registers_changed ();
-	  target_resume (ecs->pid, 1, TARGET_SIGNAL_0);  /* Single step */
+    /* It may not be necessary to disable the watchpoint to stop over
+       it.  For example, the PA can (with some kernel cooperation)
+       single step over a watchpoint without disabling the watchpoint.  */
+    if (HAVE_STEPPABLE_WATCHPOINT && STOPPED_BY_WATCHPOINT (ecs->ws))
+      {
+	resume (1, 0);
+	goto wfi_continue;
+      }
 
-	  ecs->waiton_pid = ecs->pid;
-	  ecs->wp = &(ecs->ws);
-	  ecs->infwait_state = infwait_nonstep_watch_state;
-	  goto wfi_continue;
-	}
+    /* It is far more common to need to disable a watchpoint to step
+       the inferior over it.  FIXME.  What else might a debug
+       register or page protection watchpoint scheme need here?  */
+    if (HAVE_NONSTEPPABLE_WATCHPOINT && STOPPED_BY_WATCHPOINT (ecs->ws))
+      {
+	/* At this point, we are stopped at an instruction which has
+	   attempted to write to a piece of memory under control of
+	   a watchpoint.  The instruction hasn't actually executed
+	   yet.  If we were to evaluate the watchpoint expression
+	   now, we would get the old value, and therefore no change
+	   would seem to have occurred.
+
+	   In order to make watchpoints work `right', we really need
+	   to complete the memory write, and then evaluate the
+	   watchpoint expression.  The following code does that by
+	   removing the watchpoint (actually, all watchpoints and
+	   breakpoints), single-stepping the target, re-inserting
+	   watchpoints, and then falling through to let normal
+	   single-step processing handle proceed.  Since this
+	   includes evaluating watchpoints, things will come to a
+	   stop in the correct manner.  */
+
+	write_pc (stop_pc - DECR_PC_AFTER_BREAK);
+
+	remove_breakpoints ();
+	registers_changed ();
+	target_resume (ecs->pid, 1, TARGET_SIGNAL_0);	/* Single step */
+
+	ecs->waiton_pid = ecs->pid;
+	ecs->wp = &(ecs->ws);
+	ecs->infwait_state = infwait_nonstep_watch_state;
+	goto wfi_continue;
+      }
 
-      /* It may be possible to simply continue after a watchpoint.  */
-      if (HAVE_CONTINUABLE_WATCHPOINT)
-	STOPPED_BY_WATCHPOINT (ecs->ws);
-
-      ecs->stop_func_start = 0;
-      ecs->stop_func_end = 0;
-      ecs->stop_func_name = 0;
-      /* Don't care about return value; stop_func_start and stop_func_name
-	 will both be 0 if it doesn't work.  */
-      find_pc_partial_function (stop_pc, &ecs->stop_func_name,
-				&ecs->stop_func_start, &ecs->stop_func_end);
-      ecs->stop_func_start += FUNCTION_START_OFFSET;
-      ecs->another_trap = 0;
-      bpstat_clear (&stop_bpstat);
-      stop_step = 0;
-      stop_stack_dummy = 0;
-      stop_print_frame = 1;
-      ecs->random_signal = 0;
-      stopped_by_random_signal = 0;
-      breakpoints_failed = 0;
-
-      /* Look at the cause of the stop, and decide what to do.
-	 The alternatives are:
-	 1) break; to really stop and return to the debugger,
-	 2) drop through to start up again
-	 (set ecs->another_trap to 1 to single step once)
-	 3) set ecs->random_signal to 1, and the decision between 1 and 2
-	 will be made according to the signal handling tables.  */
-
-      /* First, distinguish signals caused by the debugger from signals
-	 that have to do with the program's own actions.
-	 Note that breakpoint insns may cause SIGTRAP or SIGILL
-	 or SIGEMT, depending on the operating system version.
-	 Here we detect when a SIGILL or SIGEMT is really a breakpoint
-	 and change it to SIGTRAP.  */
-
-      if (stop_signal == TARGET_SIGNAL_TRAP
-	  || (breakpoints_inserted &&
-	      (stop_signal == TARGET_SIGNAL_ILL
-	       || stop_signal == TARGET_SIGNAL_EMT
-	      ))
-	  || stop_soon_quietly)
-	{
-	  if (stop_signal == TARGET_SIGNAL_TRAP && stop_after_trap)
-	    {
-	      stop_print_frame = 0;
-	      goto wfi_break;
-	    }
-	  if (stop_soon_quietly)
+    /* It may be possible to simply continue after a watchpoint.  */
+    if (HAVE_CONTINUABLE_WATCHPOINT)
+      STOPPED_BY_WATCHPOINT (ecs->ws);
+
+    ecs->stop_func_start = 0;
+    ecs->stop_func_end = 0;
+    ecs->stop_func_name = 0;
+    /* Don't care about return value; stop_func_start and stop_func_name
+       will both be 0 if it doesn't work.  */
+    find_pc_partial_function (stop_pc, &ecs->stop_func_name,
+			      &ecs->stop_func_start, &ecs->stop_func_end);
+    ecs->stop_func_start += FUNCTION_START_OFFSET;
+    ecs->another_trap = 0;
+    bpstat_clear (&stop_bpstat);
+    stop_step = 0;
+    stop_stack_dummy = 0;
+    stop_print_frame = 1;
+    ecs->random_signal = 0;
+    stopped_by_random_signal = 0;
+    breakpoints_failed = 0;
+
+    /* Look at the cause of the stop, and decide what to do.
+       The alternatives are:
+       1) break; to really stop and return to the debugger,
+       2) drop through to start up again
+       (set ecs->another_trap to 1 to single step once)
+       3) set ecs->random_signal to 1, and the decision between 1 and 2
+       will be made according to the signal handling tables.  */
+
+    /* First, distinguish signals caused by the debugger from signals
+       that have to do with the program's own actions.
+       Note that breakpoint insns may cause SIGTRAP or SIGILL
+       or SIGEMT, depending on the operating system version.
+       Here we detect when a SIGILL or SIGEMT is really a breakpoint
+       and change it to SIGTRAP.  */
+
+    if (stop_signal == TARGET_SIGNAL_TRAP
+	|| (breakpoints_inserted &&
+	    (stop_signal == TARGET_SIGNAL_ILL
+	     || stop_signal == TARGET_SIGNAL_EMT
+	    ))
+	|| stop_soon_quietly)
+      {
+	if (stop_signal == TARGET_SIGNAL_TRAP && stop_after_trap)
+	  {
+	    stop_print_frame = 0;
 	    goto wfi_break;
+	  }
+	if (stop_soon_quietly)
+	  goto wfi_break;
 
-	  /* Don't even think about breakpoints
-	     if just proceeded over a breakpoint.
+	/* Don't even think about breakpoints
+	   if just proceeded over a breakpoint.
 
-	     However, if we are trying to proceed over a breakpoint
-	     and end up in sigtramp, then through_sigtramp_breakpoint
-	     will be set and we should check whether we've hit the
-	     step breakpoint.  */
-	  if (stop_signal == TARGET_SIGNAL_TRAP && trap_expected
-	      && through_sigtramp_breakpoint == NULL)
-	    bpstat_clear (&stop_bpstat);
-	  else
-	    {
-	      /* See if there is a breakpoint at the current PC.  */
-	      stop_bpstat = bpstat_stop_status
-		(&stop_pc,
-		 (DECR_PC_AFTER_BREAK ?
-	      /* Notice the case of stepping through a jump
-		    that lands just after a breakpoint.
-		    Don't confuse that with hitting the breakpoint.
-		    What we check for is that 1) stepping is going on
-		    and 2) the pc before the last insn does not match
-		    the address of the breakpoint before the current pc
-		    and 3) we didn't hit a breakpoint in a signal handler
-		    without an intervening stop in sigtramp, which is
-		    detected by a new stack pointer value below
-		    any usual function calling stack adjustments.  */
-		  (currently_stepping (ecs)
-		   && prev_pc != stop_pc - DECR_PC_AFTER_BREAK
-		   && !(step_range_end
-			&& INNER_THAN (read_sp (), (step_sp - 16)))) :
-		  0)
-		);
-	      /* Following in case break condition called a
-		 function.  */
-	      stop_print_frame = 1;
-	    }
+	   However, if we are trying to proceed over a breakpoint
+	   and end up in sigtramp, then through_sigtramp_breakpoint
+	   will be set and we should check whether we've hit the
+	   step breakpoint.  */
+	if (stop_signal == TARGET_SIGNAL_TRAP && trap_expected
+	    && through_sigtramp_breakpoint == NULL)
+	  bpstat_clear (&stop_bpstat);
+	else
+	  {
+	    /* See if there is a breakpoint at the current PC.  */
+	    stop_bpstat = bpstat_stop_status
+	      (&stop_pc,
+	       (DECR_PC_AFTER_BREAK ?
+	    /* Notice the case of stepping through a jump
+	       that lands just after a breakpoint.
+	       Don't confuse that with hitting the breakpoint.
+	       What we check for is that 1) stepping is going on
+	       and 2) the pc before the last insn does not match
+	       the address of the breakpoint before the current pc
+	       and 3) we didn't hit a breakpoint in a signal handler
+	       without an intervening stop in sigtramp, which is
+	       detected by a new stack pointer value below
+	       any usual function calling stack adjustments.  */
+		(currently_stepping (ecs)
+		 && prev_pc != stop_pc - DECR_PC_AFTER_BREAK
+		 && !(step_range_end
+		      && INNER_THAN (read_sp (), (step_sp - 16)))) :
+		0)
+	      );
+	    /* Following in case break condition called a
+	       function.  */
+	    stop_print_frame = 1;
+	  }
+
+	if (stop_signal == TARGET_SIGNAL_TRAP)
+	  ecs->random_signal
+	    = !(bpstat_explains_signal (stop_bpstat)
+		|| trap_expected
+		|| (!CALL_DUMMY_BREAKPOINT_OFFSET_P
+		    && PC_IN_CALL_DUMMY (stop_pc, read_sp (),
+					 FRAME_FP (get_current_frame ())))
+		|| (step_range_end && step_resume_breakpoint == NULL));
 
-	  if (stop_signal == TARGET_SIGNAL_TRAP)
+	else
+	  {
 	    ecs->random_signal
 	      = !(bpstat_explains_signal (stop_bpstat)
-		  || trap_expected
+	    /* End of a stack dummy.  Some systems (e.g. Sony
+	       news) give another signal besides SIGTRAP, so
+	       check here as well as above.  */
 		  || (!CALL_DUMMY_BREAKPOINT_OFFSET_P
 		      && PC_IN_CALL_DUMMY (stop_pc, read_sp (),
 					   FRAME_FP (get_current_frame ())))
-		  || (step_range_end && step_resume_breakpoint == NULL));
+	      );
+	    if (!ecs->random_signal)
+	      stop_signal = TARGET_SIGNAL_TRAP;
+	  }
+      }
 
-	  else
-	    {
-	      ecs->random_signal
-		= !(bpstat_explains_signal (stop_bpstat)
-		    /* End of a stack dummy.  Some systems (e.g. Sony
-		       news) give another signal besides SIGTRAP, so
-		       check here as well as above.  */
-		    || (!CALL_DUMMY_BREAKPOINT_OFFSET_P
-			&& PC_IN_CALL_DUMMY (stop_pc, read_sp (),
-					     FRAME_FP (get_current_frame ())))
-		);
-	      if (!ecs->random_signal)
-		stop_signal = TARGET_SIGNAL_TRAP;
-	    }
-	}
+    /* When we reach this point, we've pretty much decided
+       that the reason for stopping must've been a random
+       (unexpected) signal. */
+
+    else
+      ecs->random_signal = 1;
+    /* If a fork, vfork or exec event was seen, then there are two
+       possible responses we can make:
+
+       1. If a catchpoint triggers for the event (ecs->random_signal == 0),
+       then we must stop now and issue a prompt.  We will resume
+       the inferior when the user tells us to.
+       2. If no catchpoint triggers for the event (ecs->random_signal == 1),
+       then we must resume the inferior now and keep checking.
+
+       In either case, we must take appropriate steps to "follow" the
+       the fork/vfork/exec when the inferior is resumed.  For example,
+       if follow-fork-mode is "child", then we must detach from the
+       parent inferior and follow the new child inferior.
+
+       In either case, setting pending_follow causes the next resume()
+       to take the appropriate following action. */
+  process_event_stop_test:
+    if (ecs->ws.kind == TARGET_WAITKIND_FORKED)
+      {
+	if (ecs->random_signal)	/* I.e., no catchpoint triggered for this. */
+	  {
+	    trap_expected = 1;
+	    stop_signal = TARGET_SIGNAL_0;
+	    goto keep_going;
+	  }
+      }
+    else if (ecs->ws.kind == TARGET_WAITKIND_VFORKED)
+      {
+	if (ecs->random_signal)	/* I.e., no catchpoint triggered for this. */
+	  {
+	    stop_signal = TARGET_SIGNAL_0;
+	    goto keep_going;
+	  }
+      }
+    else if (ecs->ws.kind == TARGET_WAITKIND_EXECD)
+      {
+	pending_follow.kind = ecs->ws.kind;
+	if (ecs->random_signal)	/* I.e., no catchpoint triggered for this. */
+	  {
+	    trap_expected = 1;
+	    stop_signal = TARGET_SIGNAL_0;
+	    goto keep_going;
+	  }
+      }
 
-      /* When we reach this point, we've pretty much decided
-         that the reason for stopping must've been a random
-         (unexpected) signal. */
+    /* For the program's own signals, act according to
+       the signal handling tables.  */
 
-      else
-	ecs->random_signal = 1;
-      /* If a fork, vfork or exec event was seen, then there are two
-         possible responses we can make:
-
-         1. If a catchpoint triggers for the event (ecs->random_signal == 0),
-            then we must stop now and issue a prompt.  We will resume
-            the inferior when the user tells us to.
-         2. If no catchpoint triggers for the event (ecs->random_signal == 1),
-            then we must resume the inferior now and keep checking.
-
-         In either case, we must take appropriate steps to "follow" the
-         the fork/vfork/exec when the inferior is resumed.  For example,
-         if follow-fork-mode is "child", then we must detach from the
-         parent inferior and follow the new child inferior.
-
-         In either case, setting pending_follow causes the next resume()
-         to take the appropriate following action. */
-    process_event_stop_test:
-      if (ecs->ws.kind == TARGET_WAITKIND_FORKED)
+    if (ecs->random_signal)
+      {
+	/* Signal not for debugging purposes.  */
+	int printed = 0;
+
+	stopped_by_random_signal = 1;
+
+	if (signal_print[stop_signal])
+	  {
+	    printed = 1;
+	    target_terminal_ours_for_output ();
+	    annotate_signal ();
+	    printf_filtered ("\nProgram received signal ");
+	    annotate_signal_name ();
+	    printf_filtered ("%s", target_signal_to_name (stop_signal));
+	    annotate_signal_name_end ();
+	    printf_filtered (", ");
+	    annotate_signal_string ();
+	    printf_filtered ("%s", target_signal_to_string (stop_signal));
+	    annotate_signal_string_end ();
+	    printf_filtered (".\n");
+	    gdb_flush (gdb_stdout);
+	  }
+	if (signal_stop[stop_signal])
+	  goto wfi_break;
+	/* If not going to stop, give terminal back
+	   if we took it away.  */
+	else if (printed)
+	  target_terminal_inferior ();
+
+	/* Clear the signal if it should not be passed.  */
+	if (signal_program[stop_signal] == 0)
+	  stop_signal = TARGET_SIGNAL_0;
+
+	/* If we're in the middle of a "next" command, let the code for
+	   stepping over a function handle this. pai/1997-09-10
+
+	   A previous comment here suggested it was possible to change
+	   this to jump to keep_going in all cases. */
+
+	if (step_over_calls > 0)
+	  goto step_over_function;
+	else
+	  goto check_sigtramp2;
+      }
+
+    /* Handle cases caused by hitting a breakpoint.  */
+    {
+      CORE_ADDR jmp_buf_pc;
+      struct bpstat_what what;
+
+      what = bpstat_what (stop_bpstat);
+
+      if (what.call_dummy)
 	{
-	  if (ecs->random_signal)	/* I.e., no catchpoint triggered for this. */
-	    {
-	      trap_expected = 1;
-	      stop_signal = TARGET_SIGNAL_0;
-	      goto keep_going;
-	    }
+	  stop_stack_dummy = 1;
+#ifdef HP_OS_BUG
+	  trap_expected_after_continue = 1;
+#endif
 	}
-      else if (ecs->ws.kind == TARGET_WAITKIND_VFORKED)
+
+      switch (what.main_action)
 	{
-	  if (ecs->random_signal)	/* I.e., no catchpoint triggered for this. */
+	case BPSTAT_WHAT_SET_LONGJMP_RESUME:
+	  /* If we hit the breakpoint at longjmp, disable it for the
+	     duration of this command.  Then, install a temporary
+	     breakpoint at the target of the jmp_buf. */
+	  disable_longjmp_breakpoint ();
+	  remove_breakpoints ();
+	  breakpoints_inserted = 0;
+	  if (!GET_LONGJMP_TARGET (&jmp_buf_pc))
+	    goto keep_going;
+
+	  /* Need to blow away step-resume breakpoint, as it
+	     interferes with us */
+	  if (step_resume_breakpoint != NULL)
 	    {
-	      stop_signal = TARGET_SIGNAL_0;
-	      goto keep_going;
+	      delete_breakpoint (step_resume_breakpoint);
+	      step_resume_breakpoint = NULL;
 	    }
-	}
-      else if (ecs->ws.kind == TARGET_WAITKIND_EXECD)
-	{
-	  pending_follow.kind = ecs->ws.kind;
-	  if (ecs->random_signal)	/* I.e., no catchpoint triggered for this. */
+	  /* Not sure whether we need to blow this away too, but probably
+	     it is like the step-resume breakpoint.  */
+	  if (through_sigtramp_breakpoint != NULL)
 	    {
-	      trap_expected = 1;
-	      stop_signal = TARGET_SIGNAL_0;
-	      goto keep_going;
+	      delete_breakpoint (through_sigtramp_breakpoint);
+	      through_sigtramp_breakpoint = NULL;
 	    }
-	}
-
-      /* For the program's own signals, act according to
-	 the signal handling tables.  */
 
-      if (ecs->random_signal)
-	{
-	  /* Signal not for debugging purposes.  */
-	  int printed = 0;
+#if 0
+	  /* FIXME - Need to implement nested temporary breakpoints */
+	  if (step_over_calls > 0)
+	    set_longjmp_resume_breakpoint (jmp_buf_pc,
+					   get_current_frame ());
+	  else
+#endif /* 0 */
+	    set_longjmp_resume_breakpoint (jmp_buf_pc, NULL);
+	  ecs->handling_longjmp = 1;	/* FIXME */
+	  goto keep_going;
 
-	  stopped_by_random_signal = 1;
+	case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME:
+	case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE:
+	  remove_breakpoints ();
+	  breakpoints_inserted = 0;
+#if 0
+	  /* FIXME - Need to implement nested temporary breakpoints */
+	  if (step_over_calls
+	      && (INNER_THAN (FRAME_FP (get_current_frame ()),
+			      step_frame_address)))
+	    {
+	      ecs->another_trap = 1;
+	      goto keep_going;
+	    }
+#endif /* 0 */
+	  disable_longjmp_breakpoint ();
+	  ecs->handling_longjmp = 0;	/* FIXME */
+	  if (what.main_action == BPSTAT_WHAT_CLEAR_LONGJMP_RESUME)
+	    break;
+	  /* else fallthrough */
 
-	  if (signal_print[stop_signal])
+	case BPSTAT_WHAT_SINGLE:
+	  if (breakpoints_inserted)
 	    {
-	      printed = 1;
-	      target_terminal_ours_for_output ();
-	      annotate_signal ();
-	      printf_filtered ("\nProgram received signal ");
-	      annotate_signal_name ();
-	      printf_filtered ("%s", target_signal_to_name (stop_signal));
-	      annotate_signal_name_end ();
-	      printf_filtered (", ");
-	      annotate_signal_string ();
-	      printf_filtered ("%s", target_signal_to_string (stop_signal));
-	      annotate_signal_string_end ();
-	      printf_filtered (".\n");
-	      gdb_flush (gdb_stdout);
+	      thread_step_needed = 1;
+	      remove_breakpoints ();
 	    }
-	  if (signal_stop[stop_signal])
-	    goto wfi_break;
-	  /* If not going to stop, give terminal back
-	     if we took it away.  */
-	  else if (printed)
-	    target_terminal_inferior ();
+	  breakpoints_inserted = 0;
+	  ecs->another_trap = 1;
+	  /* Still need to check other stuff, at least the case
+	     where we are stepping and step out of the right range.  */
+	  break;
 
-	  /* Clear the signal if it should not be passed.  */
-	  if (signal_program[stop_signal] == 0)
-	    stop_signal = TARGET_SIGNAL_0;
+	case BPSTAT_WHAT_STOP_NOISY:
+	  stop_print_frame = 1;
 
-	  /* If we're in the middle of a "next" command, let the code for
-             stepping over a function handle this. pai/1997-09-10
+	  /* We are about to nuke the step_resume_breakpoint and
+	     through_sigtramp_breakpoint via the cleanup chain, so
+	     no need to worry about it here.  */
 
-             A previous comment here suggested it was possible to change
-             this to jump to keep_going in all cases. */
+	  goto stop_stepping;
 
-	  if (step_over_calls > 0)
-	    goto step_over_function;
-	  else
-	    goto check_sigtramp2;
-	}
+	case BPSTAT_WHAT_STOP_SILENT:
+	  stop_print_frame = 0;
 
-      /* Handle cases caused by hitting a breakpoint.  */
-      {
-	CORE_ADDR jmp_buf_pc;
-	struct bpstat_what what;
+	  /* We are about to nuke the step_resume_breakpoint and
+	     through_sigtramp_breakpoint via the cleanup chain, so
+	     no need to worry about it here.  */
 
-	what = bpstat_what (stop_bpstat);
+	  goto stop_stepping;
 
-	if (what.call_dummy)
-	  {
-	    stop_stack_dummy = 1;
-#ifdef HP_OS_BUG
-	    trap_expected_after_continue = 1;
-#endif
-	  }
+	case BPSTAT_WHAT_STEP_RESUME:
+	  /* This proably demands a more elegant solution, but, yeah
+	     right...
+
+	     This function's use of the simple variable
+	     step_resume_breakpoint doesn't seem to accomodate
+	     simultaneously active step-resume bp's, although the
+	     breakpoint list certainly can.
 
-	switch (what.main_action)
+	     If we reach here and step_resume_breakpoint is already
+	     NULL, then apparently we have multiple active
+	     step-resume bp's.  We'll just delete the breakpoint we
+	     stopped at, and carry on.  */
+	  if (step_resume_breakpoint == NULL)
+	    {
+	      step_resume_breakpoint =
+		bpstat_find_step_resume_breakpoint (stop_bpstat);
+	    }
+	  delete_breakpoint (step_resume_breakpoint);
+	  step_resume_breakpoint = NULL;
+	  break;
+
+	case BPSTAT_WHAT_THROUGH_SIGTRAMP:
+	  if (through_sigtramp_breakpoint)
+	    delete_breakpoint (through_sigtramp_breakpoint);
+	  through_sigtramp_breakpoint = NULL;
+
+	  /* If were waiting for a trap, hitting the step_resume_break
+	     doesn't count as getting it.  */
+	  if (trap_expected)
+	    ecs->another_trap = 1;
+	  break;
+
+	case BPSTAT_WHAT_CHECK_SHLIBS:
+	case BPSTAT_WHAT_CHECK_SHLIBS_RESUME_FROM_HOOK:
+#ifdef SOLIB_ADD
 	  {
-	  case BPSTAT_WHAT_SET_LONGJMP_RESUME:
-	    /* If we hit the breakpoint at longjmp, disable it for the
-	       duration of this command.  Then, install a temporary
-	       breakpoint at the target of the jmp_buf. */
-	    disable_longjmp_breakpoint ();
-	    remove_breakpoints ();
+	    /* Remove breakpoints, we eventually want to step over the
+	       shlib event breakpoint, and SOLIB_ADD might adjust
+	       breakpoint addresses via breakpoint_re_set.  */
+	    if (breakpoints_inserted)
+	      remove_breakpoints ();
 	    breakpoints_inserted = 0;
-	    if (!GET_LONGJMP_TARGET (&jmp_buf_pc))
-	      goto keep_going;
 
-	    /* Need to blow away step-resume breakpoint, as it
-	       interferes with us */
-	    if (step_resume_breakpoint != NULL)
+	    /* Check for any newly added shared libraries if we're
+	       supposed to be adding them automatically.  */
+	    if (auto_solib_add)
 	      {
-		delete_breakpoint (step_resume_breakpoint);
-		step_resume_breakpoint = NULL;
+		/* Switch terminal for any messages produced by
+		   breakpoint_re_set.  */
+		target_terminal_ours_for_output ();
+		SOLIB_ADD (NULL, 0, NULL);
+		target_terminal_inferior ();
 	      }
-	    /* Not sure whether we need to blow this away too, but probably
-	       it is like the step-resume breakpoint.  */
-	    if (through_sigtramp_breakpoint != NULL)
+
+	    /* Try to reenable shared library breakpoints, additional
+	       code segments in shared libraries might be mapped in now. */
+	    re_enable_breakpoints_in_shlibs ();
+
+	    /* If requested, stop when the dynamic linker notifies
+	       gdb of events.  This allows the user to get control
+	       and place breakpoints in initializer routines for
+	       dynamically loaded objects (among other things).  */
+	    if (stop_on_solib_events)
 	      {
-		delete_breakpoint (through_sigtramp_breakpoint);
-		through_sigtramp_breakpoint = NULL;
+		stop_print_frame = 0;
+		goto stop_stepping;
 	      }
 
-#if 0
-	    /* FIXME - Need to implement nested temporary breakpoints */
-	    if (step_over_calls > 0)
-	      set_longjmp_resume_breakpoint (jmp_buf_pc,
-					     get_current_frame ());
-	    else
-#endif /* 0 */
-	      set_longjmp_resume_breakpoint (jmp_buf_pc, NULL);
-	    ecs->handling_longjmp = 1;	/* FIXME */
-	    goto keep_going;
-
-	  case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME:
-	  case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE:
-	    remove_breakpoints ();
-	    breakpoints_inserted = 0;
-#if 0
-	    /* FIXME - Need to implement nested temporary breakpoints */
-	    if (step_over_calls
-		&& (INNER_THAN (FRAME_FP (get_current_frame ()),
-				step_frame_address)))
+	    /* If we stopped due to an explicit catchpoint, then the
+	       (see above) call to SOLIB_ADD pulled in any symbols
+	       from a newly-loaded library, if appropriate.
+
+	       We do want the inferior to stop, but not where it is
+	       now, which is in the dynamic linker callback.  Rather,
+	       we would like it stop in the user's program, just after
+	       the call that caused this catchpoint to trigger.  That
+	       gives the user a more useful vantage from which to
+	       examine their program's state. */
+	    else if (what.main_action == BPSTAT_WHAT_CHECK_SHLIBS_RESUME_FROM_HOOK)
 	      {
+		/* ??rehrauer: If I could figure out how to get the
+		   right return PC from here, we could just set a temp
+		   breakpoint and resume.  I'm not sure we can without
+		   cracking open the dld's shared libraries and sniffing
+		   their unwind tables and text/data ranges, and that's
+		   not a terribly portable notion.
+
+		   Until that time, we must step the inferior out of the
+		   dld callback, and also out of the dld itself (and any
+		   code or stubs in libdld.sl, such as "shl_load" and
+		   friends) until we reach non-dld code.  At that point,
+		   we can stop stepping. */
+		bpstat_get_triggered_catchpoints (stop_bpstat,
+				  &ecs->stepping_through_solib_catchpoints);
+		ecs->stepping_through_solib_after_catch = 1;
+
+		/* Be sure to lift all breakpoints, so the inferior does
+		   actually step past this point... */
 		ecs->another_trap = 1;
-		goto keep_going;
+		break;
 	      }
-#endif /* 0 */
-	    disable_longjmp_breakpoint ();
-	    ecs->handling_longjmp = 0;	/* FIXME */
-	    if (what.main_action == BPSTAT_WHAT_CLEAR_LONGJMP_RESUME)
-	      break;
-	    /* else fallthrough */
-
-	  case BPSTAT_WHAT_SINGLE:
-	    if (breakpoints_inserted)
+	    else
 	      {
-		thread_step_needed = 1;
-		remove_breakpoints ();
+		/* We want to step over this breakpoint, then keep going.  */
+		ecs->another_trap = 1;
+		break;
 	      }
-	    breakpoints_inserted = 0;
-	    ecs->another_trap = 1;
-	    /* Still need to check other stuff, at least the case
-	       where we are stepping and step out of the right range.  */
-	    break;
+	  }
+#endif
+	  break;
 
-	  case BPSTAT_WHAT_STOP_NOISY:
-	    stop_print_frame = 1;
+	case BPSTAT_WHAT_LAST:
+	  /* Not a real code, but listed here to shut up gcc -Wall.  */
 
-	    /* We are about to nuke the step_resume_breakpoint and
-	       through_sigtramp_breakpoint via the cleanup chain, so
-	       no need to worry about it here.  */
+	case BPSTAT_WHAT_KEEP_CHECKING:
+	  break;
+	}
+    }
+
+    /* We come here if we hit a breakpoint but should not
+       stop for it.  Possibly we also were stepping
+       and should stop for that.  So fall through and
+       test for stepping.  But, if not stepping,
+       do not stop.  */
 
-	    goto stop_stepping;
+    /* Are we stepping to get the inferior out of the dynamic
+       linker's hook (and possibly the dld itself) after catching
+       a shlib event? */
+    if (ecs->stepping_through_solib_after_catch)
+      {
+#if defined(SOLIB_ADD)
+	/* Have we reached our destination?  If not, keep going. */
+	if (SOLIB_IN_DYNAMIC_LINKER (ecs->pid, stop_pc))
+	  {
+	    ecs->another_trap = 1;
+	    goto keep_going;
+	  }
+#endif
+	/* Else, stop and report the catchpoint(s) whose triggering
+	   caused us to begin stepping. */
+	ecs->stepping_through_solib_after_catch = 0;
+	bpstat_clear (&stop_bpstat);
+	stop_bpstat = bpstat_copy (ecs->stepping_through_solib_catchpoints);
+	bpstat_clear (&ecs->stepping_through_solib_catchpoints);
+	stop_print_frame = 1;
+	goto stop_stepping;
+      }
 
-	  case BPSTAT_WHAT_STOP_SILENT:
+    if (!CALL_DUMMY_BREAKPOINT_OFFSET_P)
+      {
+	/* This is the old way of detecting the end of the stack dummy.
+	   An architecture which defines CALL_DUMMY_BREAKPOINT_OFFSET gets
+	   handled above.  As soon as we can test it on all of them, all
+	   architectures should define it.  */
+
+	/* If this is the breakpoint at the end of a stack dummy,
+	   just stop silently, unless the user was doing an si/ni, in which
+	   case she'd better know what she's doing.  */
+
+	if (CALL_DUMMY_HAS_COMPLETED (stop_pc, read_sp (),
+				      FRAME_FP (get_current_frame ()))
+	    && !step_range_end)
+	  {
 	    stop_print_frame = 0;
+	    stop_stack_dummy = 1;
+#ifdef HP_OS_BUG
+	    trap_expected_after_continue = 1;
+#endif
+	    goto wfi_break;
+	  }
+      }
 
-	    /* We are about to nuke the step_resume_breakpoint and
-	       through_sigtramp_breakpoint via the cleanup chain, so
-	       no need to worry about it here.  */
+    if (step_resume_breakpoint)
+      /* Having a step-resume breakpoint overrides anything
+         else having to do with stepping commands until
+         that breakpoint is reached.  */
+      /* I'm not sure whether this needs to be check_sigtramp2 or
+         whether it could/should be keep_going.  */
+      goto check_sigtramp2;
+
+    if (step_range_end == 0)
+      /* Likewise if we aren't even stepping.  */
+      /* I'm not sure whether this needs to be check_sigtramp2 or
+         whether it could/should be keep_going.  */
+      goto check_sigtramp2;
+
+    /* If stepping through a line, keep going if still within it.
+
+       Note that step_range_end is the address of the first instruction
+       beyond the step range, and NOT the address of the last instruction
+       within it! */
+    if (stop_pc >= step_range_start
+	&& stop_pc < step_range_end)
+      {
+	/* We might be doing a BPSTAT_WHAT_SINGLE and getting a signal.
+	   So definately need to check for sigtramp here.  */
+	goto check_sigtramp2;
+      }
 
-	    goto stop_stepping;
+    /* We stepped out of the stepping range.  */
 
-	  case BPSTAT_WHAT_STEP_RESUME:
-	    /* This proably demands a more elegant solution, but, yeah
-               right...
+    /* If we are stepping at the source level and entered the runtime
+       loader dynamic symbol resolution code, we keep on single stepping
+       until we exit the run time loader code and reach the callee's
+       address.  */
+    if (step_over_calls < 0 && IN_SOLIB_DYNSYM_RESOLVE_CODE (stop_pc))
+      goto keep_going;
 
-               This function's use of the simple variable
-               step_resume_breakpoint doesn't seem to accomodate
-               simultaneously active step-resume bp's, although the
-               breakpoint list certainly can.
+    /* We can't update step_sp every time through the loop, because
+       reading the stack pointer would slow down stepping too much.
+       But we can update it every time we leave the step range.  */
+    ecs->update_step_sp = 1;
 
-               If we reach here and step_resume_breakpoint is already
-               NULL, then apparently we have multiple active
-               step-resume bp's.  We'll just delete the breakpoint we
-               stopped at, and carry on.  */
-	    if (step_resume_breakpoint == NULL)
-	      {
-		step_resume_breakpoint =
-		  bpstat_find_step_resume_breakpoint (stop_bpstat);
-	      }
-	    delete_breakpoint (step_resume_breakpoint);
-	    step_resume_breakpoint = NULL;
-	    break;
+    /* Did we just take a signal?  */
+    if (IN_SIGTRAMP (stop_pc, ecs->stop_func_name)
+	&& !IN_SIGTRAMP (prev_pc, prev_func_name)
+	&& INNER_THAN (read_sp (), step_sp))
+      {
+	/* We've just taken a signal; go until we are back to
+	   the point where we took it and one more.  */
 
-	  case BPSTAT_WHAT_THROUGH_SIGTRAMP:
-	    if (through_sigtramp_breakpoint)
-	      delete_breakpoint (through_sigtramp_breakpoint);
-	    through_sigtramp_breakpoint = NULL;
+	/* Note: The test above succeeds not only when we stepped
+	   into a signal handler, but also when we step past the last
+	   statement of a signal handler and end up in the return stub
+	   of the signal handler trampoline.  To distinguish between
+	   these two cases, check that the frame is INNER_THAN the
+	   previous one below. pai/1997-09-11 */
 
-	    /* If were waiting for a trap, hitting the step_resume_break
-	       doesn't count as getting it.  */
-	    if (trap_expected)
-	      ecs->another_trap = 1;
-	    break;
 
-	  case BPSTAT_WHAT_CHECK_SHLIBS:
-	  case BPSTAT_WHAT_CHECK_SHLIBS_RESUME_FROM_HOOK:
-#ifdef SOLIB_ADD
-	    {
-	      /* Remove breakpoints, we eventually want to step over the
-		 shlib event breakpoint, and SOLIB_ADD might adjust
-		 breakpoint addresses via breakpoint_re_set.  */
-	      if (breakpoints_inserted)
-		remove_breakpoints ();
-	      breakpoints_inserted = 0;
+	{
+	  CORE_ADDR current_frame = FRAME_FP (get_current_frame ());
 
-	      /* Check for any newly added shared libraries if we're
-		 supposed to be adding them automatically.  */
-	      if (auto_solib_add)
-		{
-		  /* Switch terminal for any messages produced by
-		     breakpoint_re_set.  */
-		  target_terminal_ours_for_output ();
-		  SOLIB_ADD (NULL, 0, NULL);
-		  target_terminal_inferior ();
-		}
+	  if (INNER_THAN (current_frame, step_frame_address))
+	    {
+	      /* We have just taken a signal; go until we are back to
+	         the point where we took it and one more.  */
 
-	      /* Try to reenable shared library breakpoints, additional
-		 code segments in shared libraries might be mapped in now. */
-	      re_enable_breakpoints_in_shlibs ();
+	      /* This code is needed at least in the following case:
+	         The user types "next" and then a signal arrives (before
+	         the "next" is done).  */
 
-	      /* If requested, stop when the dynamic linker notifies
-		 gdb of events.  This allows the user to get control
-		 and place breakpoints in initializer routines for
-		 dynamically loaded objects (among other things).  */
-	      if (stop_on_solib_events)
-		{
-		  stop_print_frame = 0;
-		  goto stop_stepping;
-		}
+	      /* Note that if we are stopped at a breakpoint, then we need
+	         the step_resume breakpoint to override any breakpoints at
+	         the same location, so that we will still step over the
+	         breakpoint even though the signal happened.  */
+	      struct symtab_and_line sr_sal;
 
-	      /* If we stopped due to an explicit catchpoint, then the
-                 (see above) call to SOLIB_ADD pulled in any symbols
-                 from a newly-loaded library, if appropriate.
-
-                 We do want the inferior to stop, but not where it is
-                 now, which is in the dynamic linker callback.  Rather,
-                 we would like it stop in the user's program, just after
-                 the call that caused this catchpoint to trigger.  That
-                 gives the user a more useful vantage from which to
-                 examine their program's state. */
-	      else if (what.main_action == BPSTAT_WHAT_CHECK_SHLIBS_RESUME_FROM_HOOK)
-		{
-		  /* ??rehrauer: If I could figure out how to get the
-                     right return PC from here, we could just set a temp
-                     breakpoint and resume.  I'm not sure we can without
-                     cracking open the dld's shared libraries and sniffing
-                     their unwind tables and text/data ranges, and that's
-                     not a terribly portable notion.
-
-                     Until that time, we must step the inferior out of the
-                     dld callback, and also out of the dld itself (and any
-                     code or stubs in libdld.sl, such as "shl_load" and
-                     friends) until we reach non-dld code.  At that point,
-                     we can stop stepping. */
-		  bpstat_get_triggered_catchpoints (stop_bpstat,
-				       &ecs->stepping_through_solib_catchpoints);
-		  ecs->stepping_through_solib_after_catch = 1;
-
-		  /* Be sure to lift all breakpoints, so the inferior does
-                     actually step past this point... */
-		  ecs->another_trap = 1;
-		  break;
-		}
-	      else
-		{
-		  /* We want to step over this breakpoint, then keep going.  */
-		  ecs->another_trap = 1;
-		  break;
-		}
+	      INIT_SAL (&sr_sal);
+	      sr_sal.symtab = NULL;
+	      sr_sal.line = 0;
+	      sr_sal.pc = prev_pc;
+	      /* We could probably be setting the frame to
+	         step_frame_address; I don't think anyone thought to
+	         try it.  */
+	      step_resume_breakpoint =
+		set_momentary_breakpoint (sr_sal, NULL, bp_step_resume);
+	      if (breakpoints_inserted)
+		insert_breakpoints ();
 	    }
-#endif
-	    break;
-
-	  case BPSTAT_WHAT_LAST:
-	    /* Not a real code, but listed here to shut up gcc -Wall.  */
-
-	  case BPSTAT_WHAT_KEEP_CHECKING:
-	    break;
-	  }
-      }
-
-      /* We come here if we hit a breakpoint but should not
-	 stop for it.  Possibly we also were stepping
-	 and should stop for that.  So fall through and
-	 test for stepping.  But, if not stepping,
-	 do not stop.  */
-
-      /* Are we stepping to get the inferior out of the dynamic
-         linker's hook (and possibly the dld itself) after catching
-         a shlib event? */
-      if (ecs->stepping_through_solib_after_catch)
-	{
-#if defined(SOLIB_ADD)
-	  /* Have we reached our destination?  If not, keep going. */
-	  if (SOLIB_IN_DYNAMIC_LINKER (ecs->pid, stop_pc))
+	  else
 	    {
-	      ecs->another_trap = 1;
-	      goto keep_going;
+	      /* We just stepped out of a signal handler and into
+	         its calling trampoline.
+
+	         Normally, we'd jump to step_over_function from
+	         here, but for some reason GDB can't unwind the
+	         stack correctly to find the real PC for the point
+	         user code where the signal trampoline will return
+	         -- FRAME_SAVED_PC fails, at least on HP-UX 10.20.
+	         But signal trampolines are pretty small stubs of
+	         code, anyway, so it's OK instead to just
+	         single-step out.  Note: assuming such trampolines
+	         don't exhibit recursion on any platform... */
+	      find_pc_partial_function (stop_pc, &ecs->stop_func_name,
+					&ecs->stop_func_start,
+					&ecs->stop_func_end);
+	      /* Readjust stepping range */
+	      step_range_start = ecs->stop_func_start;
+	      step_range_end = ecs->stop_func_end;
+	      ecs->stepping_through_sigtramp = 1;
 	    }
-#endif
-	  /* Else, stop and report the catchpoint(s) whose triggering
-             caused us to begin stepping. */
-	  ecs->stepping_through_solib_after_catch = 0;
-	  bpstat_clear (&stop_bpstat);
-	  stop_bpstat = bpstat_copy (ecs->stepping_through_solib_catchpoints);
-	  bpstat_clear (&ecs->stepping_through_solib_catchpoints);
-	  stop_print_frame = 1;
-	  goto stop_stepping;
 	}
 
-      if (!CALL_DUMMY_BREAKPOINT_OFFSET_P)
-	{
-	  /* This is the old way of detecting the end of the stack dummy.
-	     An architecture which defines CALL_DUMMY_BREAKPOINT_OFFSET gets
-	     handled above.  As soon as we can test it on all of them, all
-	     architectures should define it.  */
-	  
-	  /* If this is the breakpoint at the end of a stack dummy,
-	     just stop silently, unless the user was doing an si/ni, in which
-	     case she'd better know what she's doing.  */
-	  
-	  if (CALL_DUMMY_HAS_COMPLETED (stop_pc, read_sp (),
-					FRAME_FP (get_current_frame ()))
-	      && !step_range_end)
-	    {
-	      stop_print_frame = 0;
-	      stop_stack_dummy = 1;
-#ifdef HP_OS_BUG
-	      trap_expected_after_continue = 1;
-#endif
-	      goto wfi_break;
-	    }
-	}
-      
-      if (step_resume_breakpoint)
-	/* Having a step-resume breakpoint overrides anything
-	   else having to do with stepping commands until
-	   that breakpoint is reached.  */
-	/* I'm not sure whether this needs to be check_sigtramp2 or
-	   whether it could/should be keep_going.  */
-	goto check_sigtramp2;
-      
-      if (step_range_end == 0)
-	/* Likewise if we aren't even stepping.  */
-	/* I'm not sure whether this needs to be check_sigtramp2 or
-	   whether it could/should be keep_going.  */
-	goto check_sigtramp2;
-      
-      /* If stepping through a line, keep going if still within it.
-	 
-         Note that step_range_end is the address of the first instruction
-         beyond the step range, and NOT the address of the last instruction
-         within it! */
-      if (stop_pc >= step_range_start
-	  && stop_pc < step_range_end)
-	{
-	  /* We might be doing a BPSTAT_WHAT_SINGLE and getting a signal.
-	     So definately need to check for sigtramp here.  */
-	  goto check_sigtramp2;
-	}
 
-      /* We stepped out of the stepping range.  */
+	/* If this is stepi or nexti, make sure that the stepping range
+	   gets us past that instruction.  */
+	if (step_range_end == 1)
+	  /* FIXME: Does this run afoul of the code below which, if
+	     we step into the middle of a line, resets the stepping
+	     range?  */
+	  step_range_end = (step_range_start = prev_pc) + 1;
 
-      /* If we are stepping at the source level and entered the runtime
-         loader dynamic symbol resolution code, we keep on single stepping
-	 until we exit the run time loader code and reach the callee's
-	 address.  */
-      if (step_over_calls < 0 && IN_SOLIB_DYNSYM_RESOLVE_CODE (stop_pc))
+	ecs->remove_breakpoints_on_following_step = 1;
 	goto keep_going;
+      }
 
-      /* We can't update step_sp every time through the loop, because
-	 reading the stack pointer would slow down stepping too much.
-	 But we can update it every time we leave the step range.  */
-      ecs->update_step_sp = 1;
-
-      /* Did we just take a signal?  */
-      if (IN_SIGTRAMP (stop_pc, ecs->stop_func_name)
-	  && !IN_SIGTRAMP (prev_pc, prev_func_name)
-	  && INNER_THAN (read_sp (), step_sp))
-	{
-	  /* We've just taken a signal; go until we are back to
-	     the point where we took it and one more.  */
-
-	  /* Note: The test above succeeds not only when we stepped
-             into a signal handler, but also when we step past the last
-             statement of a signal handler and end up in the return stub
-             of the signal handler trampoline.  To distinguish between
-             these two cases, check that the frame is INNER_THAN the
-             previous one below. pai/1997-09-11 */
-
+    if (stop_pc == ecs->stop_func_start		/* Quick test */
+	|| (in_prologue (stop_pc, ecs->stop_func_start) &&
+	    !IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name))
+	|| IN_SOLIB_CALL_TRAMPOLINE (stop_pc, ecs->stop_func_name)
+	|| ecs->stop_func_name == 0)
+      {
+	/* It's a subroutine call.  */
 
+	if (step_over_calls == 0)
 	  {
-	    CORE_ADDR current_frame = FRAME_FP (get_current_frame ());
+	    /* I presume that step_over_calls is only 0 when we're
+	       supposed to be stepping at the assembly language level
+	       ("stepi").  Just stop.  */
+	    stop_step = 1;
+	    goto wfi_break;
+	  }
 
-	    if (INNER_THAN (current_frame, step_frame_address))
+	if (step_over_calls > 0 || IGNORE_HELPER_CALL (stop_pc))
+	  /* We're doing a "next".  */
+	  goto step_over_function;
+
+	/* If we are in a function call trampoline (a stub between
+	   the calling routine and the real function), locate the real
+	   function.  That's what tells us (a) whether we want to step
+	   into it at all, and (b) what prologue we want to run to
+	   the end of, if we do step into it.  */
+	tmp = SKIP_TRAMPOLINE_CODE (stop_pc);
+	if (tmp != 0)
+	  ecs->stop_func_start = tmp;
+	else
+	  {
+	    tmp = DYNAMIC_TRAMPOLINE_NEXTPC (stop_pc);
+	    if (tmp)
 	      {
-		/* We have just taken a signal; go until we are back to
-                   the point where we took it and one more.  */
-
-		/* This code is needed at least in the following case:
-                   The user types "next" and then a signal arrives (before
-                   the "next" is done).  */
-
-		/* Note that if we are stopped at a breakpoint, then we need
-                   the step_resume breakpoint to override any breakpoints at
-                   the same location, so that we will still step over the
-                   breakpoint even though the signal happened.  */
-		struct symtab_and_line sr_sal;
-
-		INIT_SAL (&sr_sal);
-		sr_sal.symtab = NULL;
-		sr_sal.line = 0;
-		sr_sal.pc = prev_pc;
-		/* We could probably be setting the frame to
-                   step_frame_address; I don't think anyone thought to
-                   try it.  */
+		struct symtab_and_line xxx;
+		/* Why isn't this s_a_l called "sr_sal", like all of the
+		   other s_a_l's where this code is duplicated?  */
+		INIT_SAL (&xxx);	/* initialize to zeroes */
+		xxx.pc = tmp;
+		xxx.section = find_pc_overlay (xxx.pc);
 		step_resume_breakpoint =
-		  set_momentary_breakpoint (sr_sal, NULL, bp_step_resume);
-		if (breakpoints_inserted)
-		  insert_breakpoints ();
-	      }
-	    else
-	      {
-		/* We just stepped out of a signal handler and into
-                   its calling trampoline.
-
-                   Normally, we'd jump to step_over_function from
-                   here, but for some reason GDB can't unwind the
-                   stack correctly to find the real PC for the point
-                   user code where the signal trampoline will return
-                   -- FRAME_SAVED_PC fails, at least on HP-UX 10.20.
-                   But signal trampolines are pretty small stubs of
-                   code, anyway, so it's OK instead to just
-                   single-step out.  Note: assuming such trampolines
-                   don't exhibit recursion on any platform... */
-		find_pc_partial_function (stop_pc, &ecs->stop_func_name,
-					  &ecs->stop_func_start,
-					  &ecs->stop_func_end);
-		/* Readjust stepping range */
-		step_range_start = ecs->stop_func_start;
-		step_range_end = ecs->stop_func_end;
-		ecs->stepping_through_sigtramp = 1;
+		  set_momentary_breakpoint (xxx, NULL, bp_step_resume);
+		insert_breakpoints ();
+		goto keep_going;
 	      }
 	  }
 
+	/* If we have line number information for the function we
+	   are thinking of stepping into, step into it.
 
-	  /* If this is stepi or nexti, make sure that the stepping range
-	     gets us past that instruction.  */
-	  if (step_range_end == 1)
-	    /* FIXME: Does this run afoul of the code below which, if
-	       we step into the middle of a line, resets the stepping
-	       range?  */
-	    step_range_end = (step_range_start = prev_pc) + 1;
+	   If there are several symtabs at that PC (e.g. with include
+	   files), just want to know whether *any* of them have line
+	   numbers.  find_pc_line handles this.  */
+	{
+	  struct symtab_and_line tmp_sal;
 
-	  ecs->remove_breakpoints_on_following_step = 1;
-	  goto keep_going;
+	  tmp_sal = find_pc_line (ecs->stop_func_start, 0);
+	  if (tmp_sal.line != 0)
+	    goto step_into_function;
 	}
 
-      if (stop_pc == ecs->stop_func_start	/* Quick test */
-	  || (in_prologue (stop_pc, ecs->stop_func_start) &&
-	      !IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name))
-	  || IN_SOLIB_CALL_TRAMPOLINE (stop_pc, ecs->stop_func_name)
-	  || ecs->stop_func_name == 0)
+      step_over_function:
+	/* A subroutine call has happened.  */
 	{
-	  /* It's a subroutine call.  */
+	  /* Set a special breakpoint after the return */
+	  struct symtab_and_line sr_sal;
 
-	  if (step_over_calls == 0)
+	  INIT_SAL (&sr_sal);
+	  sr_sal.symtab = NULL;
+	  sr_sal.line = 0;
+
+	  /* If we came here after encountering a signal in the middle of
+	     a "next", use the stashed-away previous frame pc */
+	  sr_sal.pc
+	    = stopped_by_random_signal
+	    ? prev_pc
+	    : ADDR_BITS_REMOVE (SAVED_PC_AFTER_CALL (get_current_frame ()));
+
+	  step_resume_breakpoint =
+	    set_momentary_breakpoint (sr_sal,
+				      stopped_by_random_signal ?
+				      NULL : get_current_frame (),
+				      bp_step_resume);
+
+	  /* We've just entered a callee, and we wish to resume until
+	     it returns to the caller.  Setting a step_resume bp on
+	     the return PC will catch a return from the callee.
+
+	     However, if the callee is recursing, we want to be
+	     careful not to catch returns of those recursive calls,
+	     but of THIS instance of the call.
+
+	     To do this, we set the step_resume bp's frame to our
+	     current caller's frame (step_frame_address, which is
+	     set by the "next" or "until" command, before execution
+	     begins).
+
+	     But ... don't do it if we're single-stepping out of a
+	     sigtramp, because the reason we're single-stepping is
+	     precisely because unwinding is a problem (HP-UX 10.20,
+	     e.g.) and the frame address is likely to be incorrect.
+	     No danger of sigtramp recursion.  */
+
+	  if (ecs->stepping_through_sigtramp)
 	    {
-	      /* I presume that step_over_calls is only 0 when we're
-		 supposed to be stepping at the assembly language level
-		 ("stepi").  Just stop.  */
-	      stop_step = 1;
-	      goto wfi_break;
+	      step_resume_breakpoint->frame = (CORE_ADDR) NULL;
+	      ecs->stepping_through_sigtramp = 0;
 	    }
+	  else if (!IN_SOLIB_DYNSYM_RESOLVE_CODE (sr_sal.pc))
+	    step_resume_breakpoint->frame = step_frame_address;
 
-	  if (step_over_calls > 0 || IGNORE_HELPER_CALL (stop_pc))
-	    /* We're doing a "next".  */
-	    goto step_over_function;
-
-	  /* If we are in a function call trampoline (a stub between
-	     the calling routine and the real function), locate the real
-	     function.  That's what tells us (a) whether we want to step
-	     into it at all, and (b) what prologue we want to run to
-	     the end of, if we do step into it.  */
-	  tmp = SKIP_TRAMPOLINE_CODE (stop_pc);
-	  if (tmp != 0)
-	    ecs->stop_func_start = tmp;
-	  else
-	    {
-	      tmp = DYNAMIC_TRAMPOLINE_NEXTPC (stop_pc);
-	      if (tmp)
-		{
-		  struct symtab_and_line xxx;
-		  /* Why isn't this s_a_l called "sr_sal", like all of the
-		     other s_a_l's where this code is duplicated?  */
-		  INIT_SAL (&xxx);	/* initialize to zeroes */
-		  xxx.pc = tmp;
-		  xxx.section = find_pc_overlay (xxx.pc);
-		  step_resume_breakpoint =
-		    set_momentary_breakpoint (xxx, NULL, bp_step_resume);
-		  insert_breakpoints ();
-		  goto keep_going;
-		}
-	    }
+	  if (breakpoints_inserted)
+	    insert_breakpoints ();
+	}
+	goto keep_going;
 
-	  /* If we have line number information for the function we
-	     are thinking of stepping into, step into it.
+      step_into_function:
+	/* Subroutine call with source code we should not step over.
+	   Do step to the first line of code in it.  */
+	{
+	  struct symtab *s;
 
-	     If there are several symtabs at that PC (e.g. with include
-	     files), just want to know whether *any* of them have line
-	     numbers.  find_pc_line handles this.  */
-	  {
-	    struct symtab_and_line tmp_sal;
+	  s = find_pc_symtab (stop_pc);
+	  if (s && s->language != language_asm)
+	    ecs->stop_func_start = SKIP_PROLOGUE (ecs->stop_func_start);
+	}
+	ecs->sal = find_pc_line (ecs->stop_func_start, 0);
+	/* Use the step_resume_break to step until
+	   the end of the prologue, even if that involves jumps
+	   (as it seems to on the vax under 4.2).  */
+	/* If the prologue ends in the middle of a source line,
+	   continue to the end of that source line (if it is still
+	   within the function).  Otherwise, just go to end of prologue.  */
+#ifdef PROLOGUE_FIRSTLINE_OVERLAP
+	/* no, don't either.  It skips any code that's
+	   legitimately on the first line.  */
+#else
+	if (ecs->sal.end && ecs->sal.pc != ecs->stop_func_start && ecs->sal.end < ecs->stop_func_end)
+	  ecs->stop_func_start = ecs->sal.end;
+#endif
 
-	    tmp_sal = find_pc_line (ecs->stop_func_start, 0);
-	    if (tmp_sal.line != 0)
-	      goto step_into_function;
+	if (ecs->stop_func_start == stop_pc)
+	  {
+	    /* We are already there: stop now.  */
+	    stop_step = 1;
+	    goto wfi_break;
 	  }
-
-	step_over_function:
-	  /* A subroutine call has happened.  */
+	else
+	  /* Put the step-breakpoint there and go until there. */
 	  {
-	    /* Set a special breakpoint after the return */
 	    struct symtab_and_line sr_sal;
 
-	    INIT_SAL (&sr_sal);
-	    sr_sal.symtab = NULL;
-	    sr_sal.line = 0;
-
-	    /* If we came here after encountering a signal in the middle of
-               a "next", use the stashed-away previous frame pc */
-	    sr_sal.pc
-	      = stopped_by_random_signal
-	      ? prev_pc
-	      : ADDR_BITS_REMOVE (SAVED_PC_AFTER_CALL (get_current_frame ()));
-
+	    INIT_SAL (&sr_sal);	/* initialize to zeroes */
+	    sr_sal.pc = ecs->stop_func_start;
+	    sr_sal.section = find_pc_overlay (ecs->stop_func_start);
+	    /* Do not specify what the fp should be when we stop
+	       since on some machines the prologue
+	       is where the new fp value is established.  */
 	    step_resume_breakpoint =
-	      set_momentary_breakpoint (sr_sal,
-					stopped_by_random_signal ?
-					NULL : get_current_frame (),
-					bp_step_resume);
-
-	    /* We've just entered a callee, and we wish to resume until
-               it returns to the caller.  Setting a step_resume bp on
-               the return PC will catch a return from the callee.
-
-               However, if the callee is recursing, we want to be
-               careful not to catch returns of those recursive calls,
-               but of THIS instance of the call.
-
-               To do this, we set the step_resume bp's frame to our
-               current caller's frame (step_frame_address, which is
-               set by the "next" or "until" command, before execution
-               begins).
-
-               But ... don't do it if we're single-stepping out of a
-               sigtramp, because the reason we're single-stepping is
-               precisely because unwinding is a problem (HP-UX 10.20,
-               e.g.) and the frame address is likely to be incorrect.
-               No danger of sigtramp recursion.  */
-
-	    if (ecs->stepping_through_sigtramp)
-	      {
-		step_resume_breakpoint->frame = (CORE_ADDR) NULL;
-		ecs->stepping_through_sigtramp = 0;
-	      }
-	    else if (!IN_SOLIB_DYNSYM_RESOLVE_CODE (sr_sal.pc))
-	      step_resume_breakpoint->frame = step_frame_address;
-
+	      set_momentary_breakpoint (sr_sal, NULL, bp_step_resume);
 	    if (breakpoints_inserted)
 	      insert_breakpoints ();
-	  }
-	  goto keep_going;
 
-	step_into_function:
-	  /* Subroutine call with source code we should not step over.
-	     Do step to the first line of code in it.  */
-	  {
-	    struct symtab *s;
-
-	    s = find_pc_symtab (stop_pc);
-	    if (s && s->language != language_asm)
-	      ecs->stop_func_start = SKIP_PROLOGUE (ecs->stop_func_start);
+	    /* And make sure stepping stops right away then.  */
+	    step_range_end = step_range_start;
 	  }
-	  ecs->sal = find_pc_line (ecs->stop_func_start, 0);
-	  /* Use the step_resume_break to step until
-	     the end of the prologue, even if that involves jumps
-	     (as it seems to on the vax under 4.2).  */
-	  /* If the prologue ends in the middle of a source line,
-	     continue to the end of that source line (if it is still
-	     within the function).  Otherwise, just go to end of prologue.  */
-#ifdef PROLOGUE_FIRSTLINE_OVERLAP
-	  /* no, don't either.  It skips any code that's
-	     legitimately on the first line.  */
-#else
-	  if (ecs->sal.end && ecs->sal.pc != ecs->stop_func_start && ecs->sal.end < ecs->stop_func_end)
-	    ecs->stop_func_start = ecs->sal.end;
-#endif
-
-	  if (ecs->stop_func_start == stop_pc)
-	    {
-	      /* We are already there: stop now.  */
-	      stop_step = 1;
-	      goto wfi_break;
-	    }
-	  else
-	    /* Put the step-breakpoint there and go until there. */
-	    {
-	      struct symtab_and_line sr_sal;
-
-	      INIT_SAL (&sr_sal);	/* initialize to zeroes */
-	      sr_sal.pc = ecs->stop_func_start;
-	      sr_sal.section = find_pc_overlay (ecs->stop_func_start);
-	      /* Do not specify what the fp should be when we stop
-		 since on some machines the prologue
-		 is where the new fp value is established.  */
-	      step_resume_breakpoint =
-		set_momentary_breakpoint (sr_sal, NULL, bp_step_resume);
-	      if (breakpoints_inserted)
-		insert_breakpoints ();
-
-	      /* And make sure stepping stops right away then.  */
-	      step_range_end = step_range_start;
-	    }
-	  goto keep_going;
-	}
-
-      /* We've wandered out of the step range.  */
-
-      ecs->sal = find_pc_line (stop_pc, 0);
-
-      if (step_range_end == 1)
-	{
-	  /* It is stepi or nexti.  We always want to stop stepping after
-	     one instruction.  */
-	  stop_step = 1;
-	  goto wfi_break;
-	}
-
-      /* If we're in the return path from a shared library trampoline,
-	 we want to proceed through the trampoline when stepping.  */
-      if (IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name))
-	{
-	  CORE_ADDR tmp;
+	goto keep_going;
+      }
 
-	  /* Determine where this trampoline returns.  */
-	  tmp = SKIP_TRAMPOLINE_CODE (stop_pc);
+    /* We've wandered out of the step range.  */
 
-	  /* Only proceed through if we know where it's going.  */
-	  if (tmp)
-	    {
-	      /* And put the step-breakpoint there and go until there. */
-	      struct symtab_and_line sr_sal;
+    ecs->sal = find_pc_line (stop_pc, 0);
 
-	      INIT_SAL (&sr_sal);	/* initialize to zeroes */
-	      sr_sal.pc = tmp;
-	      sr_sal.section = find_pc_overlay (sr_sal.pc);
-	      /* Do not specify what the fp should be when we stop
-		 since on some machines the prologue
-		 is where the new fp value is established.  */
-	      step_resume_breakpoint =
-		set_momentary_breakpoint (sr_sal, NULL, bp_step_resume);
-	      if (breakpoints_inserted)
-		insert_breakpoints ();
+    if (step_range_end == 1)
+      {
+	/* It is stepi or nexti.  We always want to stop stepping after
+	   one instruction.  */
+	stop_step = 1;
+	goto wfi_break;
+      }
 
-	      /* Restart without fiddling with the step ranges or
-		 other state.  */
-	      goto keep_going;
-	    }
-	}
+    /* If we're in the return path from a shared library trampoline,
+       we want to proceed through the trampoline when stepping.  */
+    if (IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name))
+      {
+	CORE_ADDR tmp;
 
-      if (ecs->sal.line == 0)
-	{
-	  /* We have no line number information.  That means to stop
-	     stepping (does this always happen right after one instruction,
-	     when we do "s" in a function with no line numbers,
-	     or can this happen as a result of a return or longjmp?).  */
-	  stop_step = 1;
-	  goto wfi_break;
-	}
+	/* Determine where this trampoline returns.  */
+	tmp = SKIP_TRAMPOLINE_CODE (stop_pc);
 
-      if ((stop_pc == ecs->sal.pc)
-	  && (ecs->current_line != ecs->sal.line || ecs->current_symtab != ecs->sal.symtab))
-	{
-	  /* We are at the start of a different line.  So stop.  Note that
-	     we don't stop if we step into the middle of a different line.
-	     That is said to make things like for (;;) statements work
-	     better.  */
-	  stop_step = 1;
-	  goto wfi_break;
-	}
+	/* Only proceed through if we know where it's going.  */
+	if (tmp)
+	  {
+	    /* And put the step-breakpoint there and go until there. */
+	    struct symtab_and_line sr_sal;
 
-      /* We aren't done stepping.
+	    INIT_SAL (&sr_sal);	/* initialize to zeroes */
+	    sr_sal.pc = tmp;
+	    sr_sal.section = find_pc_overlay (sr_sal.pc);
+	    /* Do not specify what the fp should be when we stop
+	       since on some machines the prologue
+	       is where the new fp value is established.  */
+	    step_resume_breakpoint =
+	      set_momentary_breakpoint (sr_sal, NULL, bp_step_resume);
+	    if (breakpoints_inserted)
+	      insert_breakpoints ();
 
-	 Optimize by setting the stepping range to the line.
-	 (We might not be in the original line, but if we entered a
-	 new line in mid-statement, we continue stepping.  This makes
-	 things like for(;;) statements work better.)  */
+	    /* Restart without fiddling with the step ranges or
+	       other state.  */
+	    goto keep_going;
+	  }
+      }
 
-      if (ecs->stop_func_end && ecs->sal.end >= ecs->stop_func_end)
-	{
-	  /* If this is the last line of the function, don't keep stepping
-	     (it would probably step us out of the function).
-	     This is particularly necessary for a one-line function,
-	     in which after skipping the prologue we better stop even though
-	     we will be in mid-line.  */
-	  stop_step = 1;
-	  goto wfi_break;
-	}
-      step_range_start = ecs->sal.pc;
-      step_range_end = ecs->sal.end;
-      step_frame_address = FRAME_FP (get_current_frame ());
-      ecs->current_line = ecs->sal.line;
-      ecs->current_symtab = ecs->sal.symtab;
-
-      /* In the case where we just stepped out of a function into the middle
-         of a line of the caller, continue stepping, but step_frame_address
-         must be modified to current frame */
+    if (ecs->sal.line == 0)
       {
-	CORE_ADDR current_frame = FRAME_FP (get_current_frame ());
-	if (!(INNER_THAN (current_frame, step_frame_address)))
-	  step_frame_address = current_frame;
+	/* We have no line number information.  That means to stop
+	   stepping (does this always happen right after one instruction,
+	   when we do "s" in a function with no line numbers,
+	   or can this happen as a result of a return or longjmp?).  */
+	stop_step = 1;
+	goto wfi_break;
       }
 
+    if ((stop_pc == ecs->sal.pc)
+	&& (ecs->current_line != ecs->sal.line || ecs->current_symtab != ecs->sal.symtab))
+      {
+	/* We are at the start of a different line.  So stop.  Note that
+	   we don't stop if we step into the middle of a different line.
+	   That is said to make things like for (;;) statements work
+	   better.  */
+	stop_step = 1;
+	goto wfi_break;
+      }
 
-      goto keep_going;
+    /* We aren't done stepping.
 
-    check_sigtramp2:
-      if (trap_expected
-	  && IN_SIGTRAMP (stop_pc, ecs->stop_func_name)
-	  && !IN_SIGTRAMP (prev_pc, prev_func_name)
-	  && INNER_THAN (read_sp (), step_sp))
-	{
-	  /* What has happened here is that we have just stepped the inferior
-	     with a signal (because it is a signal which shouldn't make
-	     us stop), thus stepping into sigtramp.
-
-	     So we need to set a step_resume_break_address breakpoint
-	     and continue until we hit it, and then step.  FIXME: This should
-	     be more enduring than a step_resume breakpoint; we should know
-	     that we will later need to keep going rather than re-hitting
-	     the breakpoint here (see testsuite/gdb.t06/signals.exp where
-	     it says "exceedingly difficult").  */
-	  struct symtab_and_line sr_sal;
+       Optimize by setting the stepping range to the line.
+       (We might not be in the original line, but if we entered a
+       new line in mid-statement, we continue stepping.  This makes
+       things like for(;;) statements work better.)  */
 
-	  INIT_SAL (&sr_sal);	/* initialize to zeroes */
-	  sr_sal.pc = prev_pc;
-	  sr_sal.section = find_pc_overlay (sr_sal.pc);
-	  /* We perhaps could set the frame if we kept track of what
-	     the frame corresponding to prev_pc was.  But we don't,
-	     so don't.  */
-	  through_sigtramp_breakpoint =
-	    set_momentary_breakpoint (sr_sal, NULL, bp_through_sigtramp);
-	  if (breakpoints_inserted)
-	    insert_breakpoints ();
+    if (ecs->stop_func_end && ecs->sal.end >= ecs->stop_func_end)
+      {
+	/* If this is the last line of the function, don't keep stepping
+	   (it would probably step us out of the function).
+	   This is particularly necessary for a one-line function,
+	   in which after skipping the prologue we better stop even though
+	   we will be in mid-line.  */
+	stop_step = 1;
+	goto wfi_break;
+      }
+    step_range_start = ecs->sal.pc;
+    step_range_end = ecs->sal.end;
+    step_frame_address = FRAME_FP (get_current_frame ());
+    ecs->current_line = ecs->sal.line;
+    ecs->current_symtab = ecs->sal.symtab;
+
+    /* In the case where we just stepped out of a function into the middle
+       of a line of the caller, continue stepping, but step_frame_address
+       must be modified to current frame */
+    {
+      CORE_ADDR current_frame = FRAME_FP (get_current_frame ());
+      if (!(INNER_THAN (current_frame, step_frame_address)))
+	step_frame_address = current_frame;
+    }
 
-	  ecs->remove_breakpoints_on_following_step = 1;
-	  ecs->another_trap = 1;
-	}
 
-    keep_going:
-      /* Come to this label when you need to resume the inferior.
-	 It's really much cleaner to do a goto than a maze of if-else
-	 conditions.  */
-
-      /* ??rehrauer: ttrace on HP-UX theoretically allows one to debug
-         a vforked child beetween its creation and subsequent exit or
-         call to exec().  However, I had big problems in this rather
-         creaky exec engine, getting that to work.  The fundamental
-         problem is that I'm trying to debug two processes via an
-         engine that only understands a single process with possibly
-         multiple threads.
-
-         Hence, this spot is known to have problems when
-         target_can_follow_vfork_prior_to_exec returns 1. */
-
-      /* Save the pc before execution, to compare with pc after stop.  */
-      prev_pc = read_pc ();	/* Might have been DECR_AFTER_BREAK */
-      prev_func_start = ecs->stop_func_start;	/* Ok, since if DECR_PC_AFTER
-					  BREAK is defined, the
-					  original pc would not have
-					  been at the start of a
-					  function. */
-      prev_func_name = ecs->stop_func_name;
+    goto keep_going;
 
-      if (ecs->update_step_sp)
-	step_sp = read_sp ();
-      ecs->update_step_sp = 0;
+  check_sigtramp2:
+    if (trap_expected
+	&& IN_SIGTRAMP (stop_pc, ecs->stop_func_name)
+	&& !IN_SIGTRAMP (prev_pc, prev_func_name)
+	&& INNER_THAN (read_sp (), step_sp))
+      {
+	/* What has happened here is that we have just stepped the inferior
+	   with a signal (because it is a signal which shouldn't make
+	   us stop), thus stepping into sigtramp.
+
+	   So we need to set a step_resume_break_address breakpoint
+	   and continue until we hit it, and then step.  FIXME: This should
+	   be more enduring than a step_resume breakpoint; we should know
+	   that we will later need to keep going rather than re-hitting
+	   the breakpoint here (see testsuite/gdb.t06/signals.exp where
+	   it says "exceedingly difficult").  */
+	struct symtab_and_line sr_sal;
+
+	INIT_SAL (&sr_sal);	/* initialize to zeroes */
+	sr_sal.pc = prev_pc;
+	sr_sal.section = find_pc_overlay (sr_sal.pc);
+	/* We perhaps could set the frame if we kept track of what
+	   the frame corresponding to prev_pc was.  But we don't,
+	   so don't.  */
+	through_sigtramp_breakpoint =
+	  set_momentary_breakpoint (sr_sal, NULL, bp_through_sigtramp);
+	if (breakpoints_inserted)
+	  insert_breakpoints ();
 
-      /* If we did not do break;, it means we should keep
-	 running the inferior and not return to debugger.  */
+	ecs->remove_breakpoints_on_following_step = 1;
+	ecs->another_trap = 1;
+      }
 
-      if (trap_expected && stop_signal != TARGET_SIGNAL_TRAP)
-	{
-	  /* We took a signal (which we are supposed to pass through to
-	     the inferior, else we'd have done a break above) and we
-	     haven't yet gotten our trap.  Simply continue.  */
-	  resume (currently_stepping (ecs), stop_signal);
-	}
-      else
-	{
-	  /* Either the trap was not expected, but we are continuing
-	     anyway (the user asked that this signal be passed to the
-	     child)
-	       -- or --
-	     The signal was SIGTRAP, e.g. it was our signal, but we
-	     decided we should resume from it.
-
-	     We're going to run this baby now!
-
-	     Insert breakpoints now, unless we are trying
-	     to one-proceed past a breakpoint.  */
-	  /* If we've just finished a special step resume and we don't
-	     want to hit a breakpoint, pull em out.  */
-	  if (step_resume_breakpoint == NULL
-	      && through_sigtramp_breakpoint == NULL
-	      && ecs->remove_breakpoints_on_following_step)
-	    {
-	      ecs->remove_breakpoints_on_following_step = 0;
-	      remove_breakpoints ();
-	      breakpoints_inserted = 0;
-	    }
-	  else if (!breakpoints_inserted &&
-		   (through_sigtramp_breakpoint != NULL || !ecs->another_trap))
-	    {
-	      breakpoints_failed = insert_breakpoints ();
-	      if (breakpoints_failed)
-		goto wfi_break;
-	      breakpoints_inserted = 1;
-	    }
+  keep_going:
+    /* Come to this label when you need to resume the inferior.
+       It's really much cleaner to do a goto than a maze of if-else
+       conditions.  */
+
+    /* ??rehrauer: ttrace on HP-UX theoretically allows one to debug
+       a vforked child beetween its creation and subsequent exit or
+       call to exec().  However, I had big problems in this rather
+       creaky exec engine, getting that to work.  The fundamental
+       problem is that I'm trying to debug two processes via an
+       engine that only understands a single process with possibly
+       multiple threads.
+
+       Hence, this spot is known to have problems when
+       target_can_follow_vfork_prior_to_exec returns 1. */
+
+    /* Save the pc before execution, to compare with pc after stop.  */
+    prev_pc = read_pc ();	/* Might have been DECR_AFTER_BREAK */
+    prev_func_start = ecs->stop_func_start;	/* Ok, since if DECR_PC_AFTER
+						   BREAK is defined, the
+						   original pc would not have
+						   been at the start of a
+						   function. */
+    prev_func_name = ecs->stop_func_name;
+
+    if (ecs->update_step_sp)
+      step_sp = read_sp ();
+    ecs->update_step_sp = 0;
+
+    /* If we did not do break;, it means we should keep
+       running the inferior and not return to debugger.  */
+
+    if (trap_expected && stop_signal != TARGET_SIGNAL_TRAP)
+      {
+	/* We took a signal (which we are supposed to pass through to
+	   the inferior, else we'd have done a break above) and we
+	   haven't yet gotten our trap.  Simply continue.  */
+	resume (currently_stepping (ecs), stop_signal);
+      }
+    else
+      {
+	/* Either the trap was not expected, but we are continuing
+	   anyway (the user asked that this signal be passed to the
+	   child)
+	   -- or --
+	   The signal was SIGTRAP, e.g. it was our signal, but we
+	   decided we should resume from it.
+
+	   We're going to run this baby now!
+
+	   Insert breakpoints now, unless we are trying
+	   to one-proceed past a breakpoint.  */
+	/* If we've just finished a special step resume and we don't
+	   want to hit a breakpoint, pull em out.  */
+	if (step_resume_breakpoint == NULL
+	    && through_sigtramp_breakpoint == NULL
+	    && ecs->remove_breakpoints_on_following_step)
+	  {
+	    ecs->remove_breakpoints_on_following_step = 0;
+	    remove_breakpoints ();
+	    breakpoints_inserted = 0;
+	  }
+	else if (!breakpoints_inserted &&
+		 (through_sigtramp_breakpoint != NULL || !ecs->another_trap))
+	  {
+	    breakpoints_failed = insert_breakpoints ();
+	    if (breakpoints_failed)
+	      goto wfi_break;
+	    breakpoints_inserted = 1;
+	  }
 
-	  trap_expected = ecs->another_trap;
+	trap_expected = ecs->another_trap;
 
-          /* Do not deliver SIGNAL_TRAP (except when the user
-	     explicitly specifies that such a signal should be
-	     delivered to the target program).
+	/* Do not deliver SIGNAL_TRAP (except when the user
+	   explicitly specifies that such a signal should be
+	   delivered to the target program).
 
-	     Typically, this would occure when a user is debugging a
-	     target monitor on a simulator: the target monitor sets a
-	     breakpoint; the simulator encounters this break-point and
-	     halts the simulation handing control to GDB; GDB, noteing
-	     that the break-point isn't valid, returns control back to
-	     the simulator; the simulator then delivers the hardware
-	     equivalent of a SIGNAL_TRAP to the program being
-	     debugged. */
+	   Typically, this would occure when a user is debugging a
+	   target monitor on a simulator: the target monitor sets a
+	   breakpoint; the simulator encounters this break-point and
+	   halts the simulation handing control to GDB; GDB, noteing
+	   that the break-point isn't valid, returns control back to
+	   the simulator; the simulator then delivers the hardware
+	   equivalent of a SIGNAL_TRAP to the program being
+	   debugged. */
 
-	  if (stop_signal == TARGET_SIGNAL_TRAP
-	      && !signal_program[stop_signal])
-	    stop_signal = TARGET_SIGNAL_0;
+	if (stop_signal == TARGET_SIGNAL_TRAP
+	    && !signal_program[stop_signal])
+	  stop_signal = TARGET_SIGNAL_0;
 
 #ifdef SHIFT_INST_REGS
-	  /* I'm not sure when this following segment applies.  I do know,
-	     now, that we shouldn't rewrite the regs when we were stopped
-	     by a random signal from the inferior process.  */
-	  /* FIXME: Shouldn't this be based on the valid bit of the SXIP?
-	     (this is only used on the 88k).  */
-
-	  if (!bpstat_explains_signal (stop_bpstat)
-	      && (stop_signal != TARGET_SIGNAL_CHLD)
-	      && !stopped_by_random_signal)
-	    SHIFT_INST_REGS ();
+	/* I'm not sure when this following segment applies.  I do know,
+	   now, that we shouldn't rewrite the regs when we were stopped
+	   by a random signal from the inferior process.  */
+	/* FIXME: Shouldn't this be based on the valid bit of the SXIP?
+	   (this is only used on the 88k).  */
+
+	if (!bpstat_explains_signal (stop_bpstat)
+	    && (stop_signal != TARGET_SIGNAL_CHLD)
+	    && !stopped_by_random_signal)
+	  SHIFT_INST_REGS ();
 #endif /* SHIFT_INST_REGS */
 
-	  resume (currently_stepping (ecs), stop_signal);
-	}
+	resume (currently_stepping (ecs), stop_signal);
+      }
 
-      /* Former continues in the main loop goto here.  */
-    wfi_continue:
-      /* This used to be at the top of the loop.  */
-      if (ecs->infwait_state == infwait_normal_state)
-	{
-	  overlay_cache_invalid = 1;
+    /* Former continues in the main loop goto here.  */
+  wfi_continue:
+    /* This used to be at the top of the loop.  */
+    if (ecs->infwait_state == infwait_normal_state)
+      {
+	overlay_cache_invalid = 1;
 
-	  /* We have to invalidate the registers BEFORE calling
-	     target_wait because they can be loaded from the target
-	     while in target_wait.  This makes remote debugging a bit
-	     more efficient for those targets that provide critical
-	     registers as part of their normal status mechanism. */
+	/* We have to invalidate the registers BEFORE calling
+	   target_wait because they can be loaded from the target
+	   while in target_wait.  This makes remote debugging a bit
+	   more efficient for those targets that provide critical
+	   registers as part of their normal status mechanism. */
 
-	  registers_changed ();
-	  ecs->waiton_pid = -1;
-	  ecs->wp = &(ecs->ws);
-	}
-      /* This is the old end of the while loop.  Let everybody know
-	 we want to wait for the inferior some more and get called
-	 again soon.  */
-      ecs->wait_some_more = 1;
-      return;
-    }
+	registers_changed ();
+	ecs->waiton_pid = -1;
+	ecs->wp = &(ecs->ws);
+      }
+    /* This is the old end of the while loop.  Let everybody know
+       we want to wait for the inferior some more and get called
+       again soon.  */
+    ecs->wait_some_more = 1;
+    return;
+  }
 
   /* Former breaks in the main loop goto here.  */
 wfi_break:
@@ -3011,8 +3014,8 @@ stop_stepping:
 	}
 
       /* Assuming the inferior still exists, set these up for next
-	 time, just like we did above if we didn't break out of the
-	 loop.  */
+         time, just like we did above if we didn't break out of the
+         loop.  */
       prev_pc = read_pc ();
       prev_func_start = ecs->stop_func_start;
       prev_func_name = ecs->stop_func_name;
@@ -3107,7 +3110,7 @@ stopped_for_shlib_catchpoint (bs, cp_p)
 static void
 complete_execution ()
 {
-extern cleanup_sigint_signal_handler PARAMS ((void));
+  extern cleanup_sigint_signal_handler PARAMS ((void));
 
   if (sync_execution)
     {
@@ -3224,10 +3227,10 @@ The same program may be running in another process.\n");
       select_frame (get_current_frame (), 0);
 
       /* Print current location without a level number, if
-	 we have changed functions or hit a breakpoint.
-	 Print source line if we have one.
-	 bpstat_print() contains the logic deciding in detail
-	 what to print, based on the event(s) that just occurred. */
+         we have changed functions or hit a breakpoint.
+         Print source line if we have one.
+         bpstat_print() contains the logic deciding in detail
+         what to print, based on the event(s) that just occurred. */
 
       if (stop_print_frame)
 	{
@@ -3236,10 +3239,10 @@ The same program may be running in another process.\n");
 
 	  bpstat_ret = bpstat_print (stop_bpstat);
 	  /* bpstat_print() returned one of:
-             -1: Didn't print anything
-              0: Printed preliminary "Breakpoint n, " message, desires
-                 location tacked on
-              1: Printed something, don't tack on location */
+	     -1: Didn't print anything
+	     0: Printed preliminary "Breakpoint n, " message, desires
+	     location tacked on
+	     1: Printed something, don't tack on location */
 
 	  if (bpstat_ret == -1)
 	    if (stop_step
@@ -3274,11 +3277,11 @@ The same program may be running in another process.\n");
     {
       /* Pop the empty frame that contains the stack dummy.
          POP_FRAME ends with a setting of the current frame, so we
-	 can use that next. */
+         can use that next. */
       POP_FRAME;
       /* Set stop_pc to what it was before we called the function.
-	 Can't rely on restore_inferior_status because that only gets
-	 called if we don't stop in the called function.  */
+         Can't rely on restore_inferior_status because that only gets
+         called if we don't stop in the called function.  */
       stop_pc = read_pc ();
       select_frame (get_current_frame (), 0);
     }
@@ -3298,21 +3301,21 @@ hook_stop_stub (cmd)
   return (0);
 }
 
-int 
+int
 signal_stop_state (signo)
      int signo;
 {
   return signal_stop[signo];
 }
 
-int 
+int
 signal_print_state (signo)
      int signo;
 {
   return signal_print[signo];
 }
 
-int 
+int
 signal_pass_state (signo)
      int signo;
 {
@@ -3474,7 +3477,7 @@ handle_command (args, from_tty)
 	}
 
       /* If any signal numbers or symbol names were found, set flags for
-	 which signals to apply actions to. */
+         which signals to apply actions to. */
 
       for (signum = sigfirst; signum >= 0 && signum <= siglast; signum++)
 	{
@@ -3701,7 +3704,7 @@ write_inferior_status_register (inf_status, regno, val)
      int regno;
      LONGEST val;
 {
-  int size = REGISTER_RAW_SIZE(regno);
+  int size = REGISTER_RAW_SIZE (regno);
   void *buf = alloca (size);
   store_signed_integer (buf, size, val);
   memcpy (&inf_status->registers[REGISTER_BYTE (regno)], buf, size);
@@ -3740,7 +3743,7 @@ save_inferior_status (restore_stack_info)
   inf_status->breakpoint_proceeded = breakpoint_proceeded;
   inf_status->restore_stack_info = restore_stack_info;
   inf_status->proceed_to_finish = proceed_to_finish;
-  
+
   memcpy (inf_status->stop_registers, stop_registers, REGISTER_BYTES);
 
   read_register_bytes (0, inf_status->registers, REGISTER_BYTES);
@@ -3774,11 +3777,11 @@ restore_selected_frame (args)
   if (frame == NULL ||
   /*  FRAME_FP (frame) != fr->frame_address || */
   /* elz: deleted this check as a quick fix to the problem that
-	 for function called by hand gdb creates no internal frame
-	 structure and the real stack and gdb's idea of stack are
-	 different if nested calls by hands are made.
+     for function called by hand gdb creates no internal frame
+     structure and the real stack and gdb's idea of stack are
+     different if nested calls by hands are made.
 
-	 mvs: this worries me.  */
+     mvs: this worries me.  */
       level != 0)
     {
       warning ("Unable to restore previously selected frame.\n");
@@ -3832,8 +3835,8 @@ restore_inferior_status (inf_status)
       fr.level = inf_status->selected_level;
       fr.frame_address = inf_status->selected_frame_address;
       /* The point of catch_errors is that if the stack is clobbered,
-	 walking the stack might encounter a garbage pointer and error()
-	 trying to dereference it.  */
+         walking the stack might encounter a garbage pointer and error()
+         trying to dereference it.  */
       if (catch_errors (restore_selected_frame, &fr,
 			"Unable to restore previously selected frame:\n",
 			RETURN_MASK_ERROR) == 0)
@@ -3873,9 +3876,9 @@ set_follow_fork_mode_command (arg, from_tty, c)
     free (follow_fork_mode_string);
   follow_fork_mode_string = savestring (arg, strlen (arg));
 }
+
 
 
-
 static void build_infrun PARAMS ((void));
 static void
 build_infrun ()
@@ -4013,20 +4016,20 @@ to the user would be loading/unloading of a new library.\n",
    kernel problem.  It's also not terribly useful without a GUI to
    help the user drive two debuggers.  So for now, I'm disabling
    the "both" option.  */
-/*			"Set debugger response to a program call of fork \
-or vfork.\n\
-A fork or vfork creates a new process.  follow-fork-mode can be:\n\
-  parent  - the original process is debugged after a fork\n\
-  child   - the new process is debugged after a fork\n\
-  both    - both the parent and child are debugged after a fork\n\
-  ask     - the debugger will ask for one of the above choices\n\
-For \"both\", another copy of the debugger will be started to follow\n\
-the new child process.  The original debugger will continue to follow\n\
-the original parent process.  To distinguish their prompts, the\n\
-debugger copy's prompt will be changed.\n\
-For \"parent\" or \"child\", the unfollowed process will run free.\n\
-By default, the debugger will follow the parent process.",
-*/
+/*                      "Set debugger response to a program call of fork \
+   or vfork.\n\
+   A fork or vfork creates a new process.  follow-fork-mode can be:\n\
+   parent  - the original process is debugged after a fork\n\
+   child   - the new process is debugged after a fork\n\
+   both    - both the parent and child are debugged after a fork\n\
+   ask     - the debugger will ask for one of the above choices\n\
+   For \"both\", another copy of the debugger will be started to follow\n\
+   the new child process.  The original debugger will continue to follow\n\
+   the original parent process.  To distinguish their prompts, the\n\
+   debugger copy's prompt will be changed.\n\
+   For \"parent\" or \"child\", the unfollowed process will run free.\n\
+   By default, the debugger will follow the parent process.",
+ */
 			"Set debugger response to a program call of fork \
 or vfork.\n\
 A fork or vfork creates a new process.  follow-fork-mode can be:\n\
@@ -4036,7 +4039,7 @@ A fork or vfork creates a new process.  follow-fork-mode can be:\n\
 For \"parent\" or \"child\", the unfollowed process will run free.\n\
 By default, the debugger will follow the parent process.",
 			&setlist);
-/*  c->function.sfunc = ;*/
+/*  c->function.sfunc = ; */
   add_show_from_set (c, &showlist);
 
   set_follow_fork_mode_command ("parent", 0, NULL);