import gdb-1999-07-07 post reformat

1 files changed, 2109 insertions, 2066 deletions

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 16a3ad6..ef9dfb8 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1,22 +1,23 @@
 /* Everything about breakpoints, for GDB.
    Copyright 1986, 87, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999
-             Free Software Foundation, Inc.
+   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 <ctype.h>
@@ -63,7 +64,7 @@ static void
 enable_command PARAMS ((char *, int));
 
 static void
-map_breakpoint_numbers PARAMS ((char *,	void (*)(struct breakpoint *)));
+map_breakpoint_numbers PARAMS ((char *, void (*)(struct breakpoint *)));
 
 static void
 ignore_command PARAMS ((char *, int));
@@ -103,7 +104,7 @@ static void
 mention PARAMS ((struct breakpoint *));
 
 struct breakpoint *
-set_raw_breakpoint PARAMS ((struct symtab_and_line));
+  set_raw_breakpoint PARAMS ((struct symtab_and_line));
 
 static void
 check_duplicates PARAMS ((CORE_ADDR, asection *));
@@ -118,7 +119,7 @@ static void
 breakpoint_1 PARAMS ((int, int));
 
 static bpstat
-bpstat_alloc PARAMS ((struct breakpoint *, bpstat));
+  bpstat_alloc PARAMS ((struct breakpoint *, bpstat));
 
 static int breakpoint_cond_eval PARAMS ((PTR));
 
@@ -139,23 +140,27 @@ set_breakpoint_count PARAMS ((int));
 
 #if 0
 static struct breakpoint *
-create_temp_exception_breakpoint PARAMS ((CORE_ADDR));
+  create_temp_exception_breakpoint PARAMS ((CORE_ADDR));
 #endif
 
-typedef enum {
-  mark_inserted,
-  mark_uninserted
-} insertion_state_t;
+typedef enum
+  {
+    mark_inserted,
+    mark_uninserted
+  }
+insertion_state_t;
 
 static int
 remove_breakpoint PARAMS ((struct breakpoint *, insertion_state_t));
 
 static int print_it_normal PARAMS ((bpstat));
 
-typedef struct {
-  enum exception_event_kind kind;
-  int enable;
-} args_for_catchpoint_enable;
+typedef struct
+  {
+    enum exception_event_kind kind;
+    int enable;
+  }
+args_for_catchpoint_enable;
 
 static int watchpoint_check PARAMS ((PTR));
 
@@ -187,9 +192,9 @@ static void awatch_command PARAMS ((char *, int));
 
 static void do_enable_breakpoint PARAMS ((struct breakpoint *, enum bpdisp));
 
-static void create_solib_load_unload_event_breakpoint PARAMS ((char *hookname, int  tempflag, char *dll_pathname, char *cond_string, enum bptype bp_kind));
+static void create_solib_load_unload_event_breakpoint PARAMS ((char *hookname, int tempflag, char *dll_pathname, char *cond_string, enum bptype bp_kind));
 
-static void create_fork_vfork_event_catchpoint PARAMS ((int  tempflag, char *  cond_string, enum bptype bp_kind));
+static void create_fork_vfork_event_catchpoint PARAMS ((int tempflag, char *cond_string, enum bptype bp_kind));
 
 static void break_at_finish_at_depth_command_1 PARAMS ((char *arg, int flag, int from_tty));
 
@@ -209,7 +214,7 @@ static char *ep_parse_optional_filename PARAMS ((char **arg));
 
 static void catch_exec_command_1 PARAMS ((char *arg, int tempflag, int from_tty));
 
-static void create_exception_catchpoint PARAMS ((int tempflag, char *cond_string, enum exception_event_kind ex_event, struct symtab_and_line *sal));
+static void create_exception_catchpoint PARAMS ((int tempflag, char *cond_string, enum exception_event_kind ex_event, struct symtab_and_line * sal));
 
 static void catch_exception_command_1 PARAMS ((enum exception_event_kind ex_event, char *arg, int tempflag, int from_tty));
 
@@ -235,7 +240,7 @@ void _initialize_breakpoint PARAMS ((void));
 
 void set_breakpoint_count PARAMS ((int));
 
-extern int addressprint;		/* Print machine addresses? */
+extern int addressprint;	/* Print machine addresses? */
 
 #if defined (GET_LONGJMP_TARGET) || defined (SOLIB_ADD)
 static int internal_breakpoint_number = -1;
@@ -263,7 +268,7 @@ int must_shift_inst_regs =
 #else
 0
 #endif
-;
+ ;
 
 /* True if breakpoint hit counts should be displayed in breakpoint info.  */
 
@@ -277,13 +282,13 @@ struct breakpoint *breakpoint_chain;
 
 int breakpoint_count;
 
-/* Pointer to current exception event record */ 
-static struct exception_event_record * current_exception_event;
+/* Pointer to current exception event record */
+static struct exception_event_record *current_exception_event;
 
 /* Indicator of whether exception catchpoints should be nuked
    between runs of a program */
 int exception_catchpoints_are_fragile = 0;
- 
+
 /* Indicator of when exception catchpoints set-up should be
    reinitialized -- e.g. when program is re-run */
 int exception_support_initialized = 0;
@@ -394,7 +399,7 @@ get_number (pp)
   else if (*p == '$')
     {
       /* Make a copy of the name, so we can null-terminate it
-	 to pass to lookup_internalvar().  */
+         to pass to lookup_internalvar().  */
       char *varname;
       char *start = ++p;
       value_ptr val;
@@ -407,8 +412,8 @@ get_number (pp)
       val = value_of_internalvar (lookup_internalvar (varname));
       if (TYPE_CODE (VALUE_TYPE (val)) != TYPE_CODE_INT)
 	error (
-"Convenience variables used to specify breakpoints must have integer values."
-	       );
+		"Convenience variables used to specify breakpoints must have integer values."
+	  );
       retval = (int) value_as_long (val);
     }
   else
@@ -449,35 +454,35 @@ condition_command (arg, from_tty)
 
   ALL_BREAKPOINTS (b)
     if (b->number == bnum)
-      {
-	if (b->cond)
-	  {
-	    free ((PTR)b->cond);
-	    b->cond = 0;
-	  }
-	if (b->cond_string != NULL)
-	  free ((PTR)b->cond_string);
+    {
+      if (b->cond)
+	{
+	  free ((PTR) b->cond);
+	  b->cond = 0;
+	}
+      if (b->cond_string != NULL)
+	free ((PTR) b->cond_string);
 
-	if (*p == 0)
-	  {
-	    b->cond = 0;
-	    b->cond_string = NULL;
-	    if (from_tty)
-	      printf_filtered ("Breakpoint %d now unconditional.\n", bnum);
-	  }
-	else
-	  {
-	    arg = p;
-	    /* I don't know if it matters whether this is the string the user
-	       typed in or the decompiled expression.  */
-	    b->cond_string = savestring (arg, strlen (arg));
-	    b->cond = parse_exp_1 (&arg, block_for_pc (b->address), 0);
-	    if (*arg)
-	      error ("Junk at end of expression");
-	  }
-	breakpoints_changed ();
-	return;
-      }
+      if (*p == 0)
+	{
+	  b->cond = 0;
+	  b->cond_string = NULL;
+	  if (from_tty)
+	    printf_filtered ("Breakpoint %d now unconditional.\n", bnum);
+	}
+      else
+	{
+	  arg = p;
+	  /* I don't know if it matters whether this is the string the user
+	     typed in or the decompiled expression.  */
+	  b->cond_string = savestring (arg, strlen (arg));
+	  b->cond = parse_exp_1 (&arg, block_for_pc (b->address), 0);
+	  if (*arg)
+	    error ("Junk at end of expression");
+	}
+      breakpoints_changed ();
+      return;
+    }
 
   error ("No breakpoint number %d.", bnum);
 }
@@ -504,18 +509,18 @@ commands_command (arg, from_tty)
   bnum = get_number (&p);
   if (p && *p)
     error ("Unexpected extra arguments following breakpoint number.");
-      
+
   ALL_BREAKPOINTS (b)
     if (b->number == bnum)
-      {
-	char tmpbuf[128];
-	sprintf (tmpbuf, "Type commands for when breakpoint %d is hit, one per line.", bnum);
-	l = read_command_lines (tmpbuf, from_tty);
-	free_command_lines (&b->commands);
-	b->commands = l;
-	breakpoints_changed ();
-	return;
-      }
+    {
+      char tmpbuf[128];
+      sprintf (tmpbuf, "Type commands for when breakpoint %d is hit, one per line.", bnum);
+      l = read_command_lines (tmpbuf, from_tty);
+      free_command_lines (&b->commands);
+      b->commands = l;
+      breakpoints_changed ();
+      return;
+    }
   error ("No breakpoint number %d.", bnum);
 }
 
@@ -541,91 +546,91 @@ read_memory_nobpt (memaddr, myaddr, len)
   if (BREAKPOINT_FROM_PC (&bp_addr, &bp_size) == NULL)
     /* No breakpoints on this machine. */
     return target_read_memory (memaddr, myaddr, len);
-  
+
   ALL_BREAKPOINTS (b)
+  {
+    if (b->type == bp_none)
+      warning ("attempted to read through apparently deleted breakpoint #%d?\n", b->number);
+
+    /* memory breakpoint? */
+    if (b->type == bp_watchpoint
+	|| b->type == bp_hardware_watchpoint
+	|| b->type == bp_read_watchpoint
+	|| b->type == bp_access_watchpoint)
+      continue;
+    /* bp in memory? */
+    if (!b->inserted)
+      continue;
+    /* Addresses and length of the part of the breakpoint that
+       we need to copy.  */
+    /* XXXX The m68k, sh and h8300 have different local and remote
+       breakpoint values.  BREAKPOINT_FROM_PC still manages to
+       correctly determine the breakpoints memory address and size
+       for these targets. */
+    bp_addr = b->address;
+    bp_size = 0;
+    if (BREAKPOINT_FROM_PC (&bp_addr, &bp_size) == NULL)
+      continue;
+    if (bp_size == 0)
+      /* bp isn't valid */
+      continue;
+    if (bp_addr + bp_size <= memaddr)
+      /* The breakpoint is entirely before the chunk of memory we
+         are reading.  */
+      continue;
+    if (bp_addr >= memaddr + len)
+      /* The breakpoint is entirely after the chunk of memory we are
+         reading. */
+      continue;
+    /* Copy the breakpoint from the shadow contents, and recurse for
+       the things before and after.  */
     {
-      if (b->type == bp_none)
-        warning ("attempted to read through apparently deleted breakpoint #%d?\n", b->number);
+      /* Offset within shadow_contents.  */
+      int bptoffset = 0;
 
-      /* memory breakpoint? */
-      if (b->type == bp_watchpoint
-	  || b->type == bp_hardware_watchpoint
-	  || b->type == bp_read_watchpoint
-	  || b->type == bp_access_watchpoint)
-	continue;
-      /* bp in memory? */
-      if (!b->inserted)
-	continue;
-      /* Addresses and length of the part of the breakpoint that
-	 we need to copy.  */
-      /* XXXX The m68k, sh and h8300 have different local and remote
-	 breakpoint values.  BREAKPOINT_FROM_PC still manages to
-	 correctly determine the breakpoints memory address and size
-	 for these targets. */
-      bp_addr = b->address;
-      bp_size = 0;
-      if (BREAKPOINT_FROM_PC (&bp_addr, &bp_size) == NULL)
-	continue;
-      if (bp_size == 0)
-	/* bp isn't valid */
-	continue;
-      if (bp_addr + bp_size <= memaddr)
-	/* The breakpoint is entirely before the chunk of memory we
-	   are reading.  */
-	continue;
-      if (bp_addr >= memaddr + len)
-	/* The breakpoint is entirely after the chunk of memory we are
-	   reading. */
-	continue;
-      /* Copy the breakpoint from the shadow contents, and recurse for
-	 the things before and after.  */
-      {
-	/* Offset within shadow_contents.  */
-	int bptoffset = 0;
-	  
-	if (bp_addr < memaddr)
-	  {
-	    /* Only copy the second part of the breakpoint.  */
-	    bp_size -= memaddr - bp_addr;
-	    bptoffset = memaddr - bp_addr;
-	    bp_addr = memaddr;
-	  }
-	
-	if (bp_addr + bp_size > memaddr + len)
-	  {
-	    /* Only copy the first part of the breakpoint.  */
-	    bp_size -= (bp_addr + bp_size) - (memaddr + len);
-	  }
-	
-	memcpy (myaddr + bp_addr - memaddr, 
-		b->shadow_contents + bptoffset, bp_size);
-	
-	if (bp_addr > memaddr)
-	  {
-	    /* Copy the section of memory before the breakpoint.  */
-	    status = read_memory_nobpt (memaddr, myaddr, bp_addr - memaddr);
-	    if (status != 0)
-	      return status;
-	  }
-	
-	if (bp_addr + bp_size < memaddr + len)
-	  {
-	    /* Copy the section of memory after the breakpoint.  */
-	    status = read_memory_nobpt
-	      (bp_addr + bp_size,
-	       myaddr + bp_addr + bp_size - memaddr,
-	       memaddr + len - (bp_addr + bp_size));
-	    if (status != 0)
-	      return status;
-	  }
-	return 0;
-      }
+      if (bp_addr < memaddr)
+	{
+	  /* Only copy the second part of the breakpoint.  */
+	  bp_size -= memaddr - bp_addr;
+	  bptoffset = memaddr - bp_addr;
+	  bp_addr = memaddr;
+	}
+
+      if (bp_addr + bp_size > memaddr + len)
+	{
+	  /* Only copy the first part of the breakpoint.  */
+	  bp_size -= (bp_addr + bp_size) - (memaddr + len);
+	}
+
+      memcpy (myaddr + bp_addr - memaddr,
+	      b->shadow_contents + bptoffset, bp_size);
+
+      if (bp_addr > memaddr)
+	{
+	  /* Copy the section of memory before the breakpoint.  */
+	  status = read_memory_nobpt (memaddr, myaddr, bp_addr - memaddr);
+	  if (status != 0)
+	    return status;
+	}
+
+      if (bp_addr + bp_size < memaddr + len)
+	{
+	  /* Copy the section of memory after the breakpoint.  */
+	  status = read_memory_nobpt
+	    (bp_addr + bp_size,
+	     myaddr + bp_addr + bp_size - memaddr,
+	     memaddr + len - (bp_addr + bp_size));
+	  if (status != 0)
+	    return status;
+	}
+      return 0;
     }
+  }
   /* Nothing overlaps.  Just call read_memory_noerr.  */
   return target_read_memory (memaddr, myaddr, len);
 }
-
 
+
 /* insert_breakpoints is used when starting or continuing the program.
    remove_breakpoints is used when the program stops.
    Both return zero if successful,
@@ -643,110 +648,110 @@ insert_breakpoints ()
 
 
   ALL_BREAKPOINTS_SAFE (b, temp)
-    {
-      if (b->type != bp_watchpoint
-	  && b->type != bp_hardware_watchpoint
-	  && b->type != bp_read_watchpoint
-	  && b->type != bp_access_watchpoint
-	  && b->type != bp_catch_fork
-	  && b->type != bp_catch_vfork
-	  && b->type != bp_catch_exec
-          && b->type != bp_catch_throw
-          && b->type != bp_catch_catch
-	  && b->enable != disabled
-	  && b->enable != shlib_disabled
-          && b->enable != call_disabled
-	  && ! b->inserted
-	  && ! b->duplicate)
-	{
-	  if (b->type == bp_hardware_breakpoint)
-	    val = target_insert_hw_breakpoint(b->address, b->shadow_contents);
-	  else
-	    {
-	      /* Check to see if breakpoint is in an overlay section;
-		 if so, we should set the breakpoint at the LMA address.
-		 Only if the section is currently mapped should we ALSO
-		 set a break at the VMA address. */
-	      if (overlay_debugging && b->section &&
-		  section_is_overlay (b->section))
-		{
-		  CORE_ADDR addr;
-
-		  addr = overlay_unmapped_address (b->address, b->section);
-		  val = target_insert_breakpoint (addr, b->shadow_contents);
-		  /* This would be the time to check val, to see if the
-		     breakpoint write to the load address succeeded.  
-		     However, this might be an ordinary occurrance, eg. if 
-		     the unmapped overlay is in ROM.  */
-		  val = 0;	/* in case unmapped address failed */
-		  if (section_is_mapped (b->section))
-		    val = target_insert_breakpoint (b->address, 
-						    b->shadow_contents);
-		}
-	      else /* ordinary (non-overlay) address */
-		val = target_insert_breakpoint(b->address, b->shadow_contents);
-	    }
-	  if (val)
-	    {
-	      /* Can't set the breakpoint.  */
+  {
+    if (b->type != bp_watchpoint
+	&& b->type != bp_hardware_watchpoint
+	&& b->type != bp_read_watchpoint
+	&& b->type != bp_access_watchpoint
+	&& b->type != bp_catch_fork
+	&& b->type != bp_catch_vfork
+	&& b->type != bp_catch_exec
+	&& b->type != bp_catch_throw
+	&& b->type != bp_catch_catch
+	&& b->enable != disabled
+	&& b->enable != shlib_disabled
+	&& b->enable != call_disabled
+	&& !b->inserted
+	&& !b->duplicate)
+      {
+	if (b->type == bp_hardware_breakpoint)
+	  val = target_insert_hw_breakpoint (b->address, b->shadow_contents);
+	else
+	  {
+	    /* Check to see if breakpoint is in an overlay section;
+	       if so, we should set the breakpoint at the LMA address.
+	       Only if the section is currently mapped should we ALSO
+	       set a break at the VMA address. */
+	    if (overlay_debugging && b->section &&
+		section_is_overlay (b->section))
+	      {
+		CORE_ADDR addr;
+
+		addr = overlay_unmapped_address (b->address, b->section);
+		val = target_insert_breakpoint (addr, b->shadow_contents);
+		/* This would be the time to check val, to see if the
+		   breakpoint write to the load address succeeded.  
+		   However, this might be an ordinary occurrance, eg. if 
+		   the unmapped overlay is in ROM.  */
+		val = 0;	/* in case unmapped address failed */
+		if (section_is_mapped (b->section))
+		  val = target_insert_breakpoint (b->address,
+						  b->shadow_contents);
+	      }
+	    else		/* ordinary (non-overlay) address */
+	      val = target_insert_breakpoint (b->address, b->shadow_contents);
+	  }
+	if (val)
+	  {
+	    /* Can't set the breakpoint.  */
 #if defined (DISABLE_UNSETTABLE_BREAK)
-	      if (DISABLE_UNSETTABLE_BREAK (b->address))
-		{
-                  /* See also: disable_breakpoints_in_shlibs. */
-		  val = 0;
-		  b->enable = shlib_disabled;
-		  if (!disabled_breaks)
-		    {
-		      target_terminal_ours_for_output ();
-		      fprintf_unfiltered (gdb_stderr,
-					  "Cannot insert breakpoint %d:\n", b->number);
-		      printf_filtered ("Temporarily disabling shared library breakpoints:\n");
-		    }
-		  disabled_breaks = 1;
-		  printf_filtered ("%d ", b->number);
-		}
-	      else
+	    if (DISABLE_UNSETTABLE_BREAK (b->address))
+	      {
+		/* See also: disable_breakpoints_in_shlibs. */
+		val = 0;
+		b->enable = shlib_disabled;
+		if (!disabled_breaks)
+		  {
+		    target_terminal_ours_for_output ();
+		    fprintf_unfiltered (gdb_stderr,
+			       "Cannot insert breakpoint %d:\n", b->number);
+		    printf_filtered ("Temporarily disabling shared library breakpoints:\n");
+		  }
+		disabled_breaks = 1;
+		printf_filtered ("%d ", b->number);
+	      }
+	    else
 #endif
-		{
-		  target_terminal_ours_for_output ();
-		  fprintf_unfiltered (gdb_stderr, "Cannot insert breakpoint %d:\n", b->number);
+	      {
+		target_terminal_ours_for_output ();
+		fprintf_unfiltered (gdb_stderr, "Cannot insert breakpoint %d:\n", b->number);
 #ifdef ONE_PROCESS_WRITETEXT
-		  fprintf_unfiltered (gdb_stderr,
-				      "The same program may be running in another process.\n");
+		fprintf_unfiltered (gdb_stderr,
+		   "The same program may be running in another process.\n");
 #endif
-		  memory_error (val, b->address);	/* which bombs us out */
-		}
-	    }
-	  else
-            b->inserted = 1;
-       }
+		memory_error (val, b->address);		/* which bombs us out */
+	      }
+	  }
+	else
+	  b->inserted = 1;
+      }
     else if (ep_is_exception_catchpoint (b)
-             && b->enable != disabled
-             && b->enable != shlib_disabled
-             && b->enable != call_disabled
-             && ! b->inserted
-             && ! b->duplicate)
+	     && b->enable != disabled
+	     && b->enable != shlib_disabled
+	     && b->enable != call_disabled
+	     && !b->inserted
+	     && !b->duplicate)
 
       {
-         /* If we get here, we must have a callback mechanism for exception
-            events -- with g++ style embedded label support, we insert
-            ordinary breakpoints and not catchpoints. */ 
-        sprintf (message, message1, b->number); /* Format possible error message */
- 
-        val = target_insert_breakpoint(b->address, b->shadow_contents);
-        if (val)
-          {
-           /* Couldn't set breakpoint for some reason */ 
-           target_terminal_ours_for_output ();
-           fprintf_unfiltered (gdb_stderr,
-                        "Cannot insert catchpoint %d; disabling it\n", b->number);
-           b->enable = disabled;
-          }
-        else
-          {
-              /* Bp set, now make sure callbacks are enabled */ 
+	/* If we get here, we must have a callback mechanism for exception
+	   events -- with g++ style embedded label support, we insert
+	   ordinary breakpoints and not catchpoints. */
+	sprintf (message, message1, b->number);		/* Format possible error message */
+
+	val = target_insert_breakpoint (b->address, b->shadow_contents);
+	if (val)
+	  {
+	    /* Couldn't set breakpoint for some reason */
+	    target_terminal_ours_for_output ();
+	    fprintf_unfiltered (gdb_stderr,
+		  "Cannot insert catchpoint %d; disabling it\n", b->number);
+	    b->enable = disabled;
+	  }
+	else
+	  {
+	    /* Bp set, now make sure callbacks are enabled */
 	    int val;
-	    args_for_catchpoint_enable args;  
+	    args_for_catchpoint_enable args;
 	    args.kind = b->type == bp_catch_catch ? EX_EVENT_CATCH : EX_EVENT_THROW;
 	    args.enable = 1;
 	    val = catch_errors (cover_target_enable_exception_callback,
@@ -756,140 +761,140 @@ insert_breakpoints ()
 	      {
 		b->inserted = 1;
 	      }
-	    /* Check if something went wrong; val == 0 can be ignored */ 
+	    /* Check if something went wrong; val == 0 can be ignored */
 	    if (val == -1)
 	      {
-		/* something went wrong */ 
+		/* something went wrong */
 		target_terminal_ours_for_output ();
 		fprintf_unfiltered (gdb_stderr, "Cannot insert catchpoint %d; disabling it\n", b->number);
 		b->enable = disabled;
 	      }
-          }
+	  }
       }
 
-      else if ((b->type == bp_hardware_watchpoint ||
-		b->type == bp_read_watchpoint ||
-		b->type == bp_access_watchpoint)
-	       && b->enable == enabled
-	       && ! b->inserted
-	       && ! b->duplicate)
-	{
-	  struct frame_info *saved_frame;
-	  int saved_level, within_current_scope;
-	  value_ptr mark = value_mark ();
-	  value_ptr v;
-
-	  /* Save the current frame and level so we can restore it after
-	     evaluating the watchpoint expression on its own frame.  */
-	  saved_frame = selected_frame;
-	  saved_level = selected_frame_level;
-
-	  /* Determine if the watchpoint is within scope.  */
-	  if (b->exp_valid_block == NULL)
-	    within_current_scope = 1;
-	  else
-	    {
-	      struct frame_info *fi;
-
-	      /* There might be no current frame at this moment if we are
-		 resuming from a step over a breakpoint.
-		 Set up current frame before trying to find the watchpoint
-		 frame.  */
-	      get_current_frame ();
-	      fi = find_frame_addr_in_frame_chain (b->watchpoint_frame);
-	      within_current_scope = (fi != NULL);
-	      if (within_current_scope)
-		select_frame (fi, -1);
-	    }
-	
-	  if (within_current_scope)
-	    {
-	      /* Evaluate the expression and cut the chain of values
-		 produced off from the value chain.  */
-	      v = evaluate_expression (b->exp);
-	      value_release_to_mark (mark);
-	    
-	      b->val_chain = v;
-	      b->inserted = 1;
-
-	      /* Look at each value on the value chain.  */
-	      for ( ; v; v=v->next)
-		{
-		  /* If it's a memory location, then we must watch it.  */
-		  if (v->lval == lval_memory)
-		    {
-		      int addr, len, type;
-		    
-		      addr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
-		      len = TYPE_LENGTH (VALUE_TYPE (v));
-		      type = 0;
-		      if (b->type == bp_read_watchpoint)
-			type = 1;
-		      else if (b->type == bp_access_watchpoint)
-			type = 2;
-
-		      val = target_insert_watchpoint (addr, len, type);
-		      if (val == -1)
-			{
-			  b->inserted = 0;
-			  break;
-			}
-		      val = 0;
-		    }
-		}
-	      /* Failure to insert a watchpoint on any memory value in the
-		 value chain brings us here.  */
-	      if (!b->inserted)
-		warning ("Hardware watchpoint %d: Could not insert watchpoint\n",
-			 b->number);
-	    }
-	  else
-	    {
-	      printf_filtered ("\
+    else if ((b->type == bp_hardware_watchpoint ||
+	      b->type == bp_read_watchpoint ||
+	      b->type == bp_access_watchpoint)
+	     && b->enable == enabled
+	     && !b->inserted
+	     && !b->duplicate)
+      {
+	struct frame_info *saved_frame;
+	int saved_level, within_current_scope;
+	value_ptr mark = value_mark ();
+	value_ptr v;
+
+	/* Save the current frame and level so we can restore it after
+	   evaluating the watchpoint expression on its own frame.  */
+	saved_frame = selected_frame;
+	saved_level = selected_frame_level;
+
+	/* Determine if the watchpoint is within scope.  */
+	if (b->exp_valid_block == NULL)
+	  within_current_scope = 1;
+	else
+	  {
+	    struct frame_info *fi;
+
+	    /* There might be no current frame at this moment if we are
+	       resuming from a step over a breakpoint.
+	       Set up current frame before trying to find the watchpoint
+	       frame.  */
+	    get_current_frame ();
+	    fi = find_frame_addr_in_frame_chain (b->watchpoint_frame);
+	    within_current_scope = (fi != NULL);
+	    if (within_current_scope)
+	      select_frame (fi, -1);
+	  }
+
+	if (within_current_scope)
+	  {
+	    /* Evaluate the expression and cut the chain of values
+	       produced off from the value chain.  */
+	    v = evaluate_expression (b->exp);
+	    value_release_to_mark (mark);
+
+	    b->val_chain = v;
+	    b->inserted = 1;
+
+	    /* Look at each value on the value chain.  */
+	    for (; v; v = v->next)
+	      {
+		/* If it's a memory location, then we must watch it.  */
+		if (v->lval == lval_memory)
+		  {
+		    int addr, len, type;
+
+		    addr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
+		    len = TYPE_LENGTH (VALUE_TYPE (v));
+		    type = 0;
+		    if (b->type == bp_read_watchpoint)
+		      type = 1;
+		    else if (b->type == bp_access_watchpoint)
+		      type = 2;
+
+		    val = target_insert_watchpoint (addr, len, type);
+		    if (val == -1)
+		      {
+			b->inserted = 0;
+			break;
+		      }
+		    val = 0;
+		  }
+	      }
+	    /* Failure to insert a watchpoint on any memory value in the
+	       value chain brings us here.  */
+	    if (!b->inserted)
+	      warning ("Hardware watchpoint %d: Could not insert watchpoint\n",
+		       b->number);
+	  }
+	else
+	  {
+	    printf_filtered ("\
 Hardware watchpoint %d deleted because the program has left the block in\n\
 which its expression is valid.\n", b->number);
-	      if (b->related_breakpoint)
-		b->related_breakpoint->disposition = del_at_next_stop;
-	      b->disposition = del_at_next_stop;
-	    }
+	    if (b->related_breakpoint)
+	      b->related_breakpoint->disposition = del_at_next_stop;
+	    b->disposition = del_at_next_stop;
+	  }
 
-	  /* Restore the frame and level.  */
-	  if ((saved_frame != selected_frame) ||
-	      (saved_level != selected_frame_level))
-	    select_and_print_frame (saved_frame, saved_level);
-	} 
-      else if ((b->type == bp_catch_fork
-                || b->type == bp_catch_vfork
-                || b->type == bp_catch_exec)
-               && b->enable == enabled
-               && ! b->inserted
-               && ! b->duplicate)
-	{
-	  val = -1;
-          switch (b->type)
-            {
-	    case bp_catch_fork :
-	      val = target_insert_fork_catchpoint (inferior_pid);
-	      break;
-	    case bp_catch_vfork :
-	      val = target_insert_vfork_catchpoint (inferior_pid);
-	      break;
-	    case bp_catch_exec :
-	      val = target_insert_exec_catchpoint (inferior_pid);
-	      break;
-	    default:
-	      warning ("GDB bug: breakpoint.c (insert_breakpoints): enclosing `if' does not protect `switch'");
-	      break;
-            }
-          if (val < 0)
-            {
-              target_terminal_ours_for_output ();
-              fprintf_unfiltered (gdb_stderr, "Cannot insert catchpoint %d:\n", b->number);
-            }
-          else
-            b->inserted = 1;
-        }
-    }
+	/* Restore the frame and level.  */
+	if ((saved_frame != selected_frame) ||
+	    (saved_level != selected_frame_level))
+	  select_and_print_frame (saved_frame, saved_level);
+      }
+    else if ((b->type == bp_catch_fork
+	      || b->type == bp_catch_vfork
+	      || b->type == bp_catch_exec)
+	     && b->enable == enabled
+	     && !b->inserted
+	     && !b->duplicate)
+      {
+	val = -1;
+	switch (b->type)
+	  {
+	  case bp_catch_fork:
+	    val = target_insert_fork_catchpoint (inferior_pid);
+	    break;
+	  case bp_catch_vfork:
+	    val = target_insert_vfork_catchpoint (inferior_pid);
+	    break;
+	  case bp_catch_exec:
+	    val = target_insert_exec_catchpoint (inferior_pid);
+	    break;
+	  default:
+	    warning ("GDB bug: breakpoint.c (insert_breakpoints): enclosing `if' does not protect `switch'");
+	    break;
+	  }
+	if (val < 0)
+	  {
+	    target_terminal_ours_for_output ();
+	    fprintf_unfiltered (gdb_stderr, "Cannot insert catchpoint %d:\n", b->number);
+	  }
+	else
+	  b->inserted = 1;
+      }
+  }
   if (disabled_breaks)
     printf_filtered ("\n");
 
@@ -904,42 +909,42 @@ remove_breakpoints ()
   int val;
 
   ALL_BREAKPOINTS (b)
-    {
-      if (b->inserted)
-	{
-	  val = remove_breakpoint (b, mark_uninserted);
-	  if (val != 0)
-	    return val;
-	}
-    }
+  {
+    if (b->inserted)
+      {
+	val = remove_breakpoint (b, mark_uninserted);
+	if (val != 0)
+	  return val;
+      }
+  }
   return 0;
 }
 
 int
 reattach_breakpoints (pid)
-  int  pid;
+     int pid;
 {
   register struct breakpoint *b;
   int val;
-  int  saved_inferior_pid = inferior_pid;
+  int saved_inferior_pid = inferior_pid;
 
-  inferior_pid = pid;  /* Because remove_breakpoint will use this global. */
+  inferior_pid = pid;		/* Because remove_breakpoint will use this global. */
   ALL_BREAKPOINTS (b)
-    {
-      if (b->inserted)
-	{
-          remove_breakpoint (b, mark_inserted);
-          if (b->type == bp_hardware_breakpoint)
-            val = target_insert_hw_breakpoint(b->address, b->shadow_contents);
-          else
-            val = target_insert_breakpoint(b->address, b->shadow_contents);
-	  if (val != 0)
-            {
-              inferior_pid = saved_inferior_pid;
-              return val;
-            }
-        }
-    }
+  {
+    if (b->inserted)
+      {
+	remove_breakpoint (b, mark_inserted);
+	if (b->type == bp_hardware_breakpoint)
+	  val = target_insert_hw_breakpoint (b->address, b->shadow_contents);
+	else
+	  val = target_insert_breakpoint (b->address, b->shadow_contents);
+	if (val != 0)
+	  {
+	    inferior_pid = saved_inferior_pid;
+	    return val;
+	  }
+      }
+  }
   inferior_pid = saved_inferior_pid;
   return 0;
 }
@@ -947,8 +952,8 @@ reattach_breakpoints (pid)
 void
 update_breakpoints_after_exec ()
 {
-  struct breakpoint *  b;
-  struct breakpoint *  temp;
+  struct breakpoint *b;
+  struct breakpoint *temp;
 
   /* Doing this first prevents the badness of having delete_breakpoint()
      write a breakpoint's current "shadow contents" to lift the bp.  That
@@ -956,124 +961,124 @@ update_breakpoints_after_exec ()
   mark_breakpoints_out ();
 
   ALL_BREAKPOINTS_SAFE (b, temp)
-    {
-      /* Solib breakpoints must be explicitly reset after an exec(). */
-      if (b->type == bp_shlib_event)
-        {
-          delete_breakpoint (b);
-          continue;
-        }
-
-      /* Step-resume breakpoints are meaningless after an exec(). */
-      if (b->type == bp_step_resume)
-        {
-          delete_breakpoint (b);
-          continue;
-        }
-
-      /* Ditto the sigtramp handler breakpoints. */
-      if (b->type == bp_through_sigtramp)
-        {
-          delete_breakpoint (b);
-          continue;
-        }
-
-      /* Ditto the exception-handling catchpoints. */
-      if ((b->type == bp_catch_catch) || (b->type == bp_catch_throw))
-        {
-          delete_breakpoint (b);
-          continue;
-        }
-
-      /* Don't delete an exec catchpoint, because else the inferior
-         won't stop when it ought!
-
-         Similarly, we probably ought to keep vfork catchpoints, 'cause
-         on this target, we may not be able to stop when the vfork is seen,
-         but only when the subsequent exec is seen.  (And because deleting
-         fork catchpoints here but not vfork catchpoints will seem mysterious
-         to users, keep those too.)
-
-         ??rehrauer: Let's hope that merely clearing out this catchpoint's
-         target address field, if any, is sufficient to have it be reset
-         automagically.  Certainly on HP-UX that's true. */
-      if ((b->type == bp_catch_exec) ||
-          (b->type == bp_catch_vfork) ||
-          (b->type == bp_catch_fork))
-        {
-          b->address = (CORE_ADDR) NULL;
-          continue;
-        }
-
-      /* bp_finish is a special case.  The only way we ought to be able
-         to see one of these when an exec() has happened, is if the user
-         caught a vfork, and then said "finish".  Ordinarily a finish just
-         carries them to the call-site of the current callee, by setting
-         a temporary bp there and resuming.  But in this case, the finish
-         will carry them entirely through the vfork & exec.
-
-         We don't want to allow a bp_finish to remain inserted now.  But
-         we can't safely delete it, 'cause finish_command has a handle to
-         the bp on a bpstat, and will later want to delete it.  There's a
-         chance (and I've seen it happen) that if we delete the bp_finish
-         here, that its storage will get reused by the time finish_command
-         gets 'round to deleting the "use to be a bp_finish" breakpoint.
-         We really must allow finish_command to delete a bp_finish.
-
-         In the absense of a general solution for the "how do we know it's
-         safe to delete something others may have handles to?" problem, what
-         we'll do here is just uninsert the bp_finish, and let finish_command
-         delete it.
-
-         (We know the bp_finish is "doomed" in the sense that it's momentary,
-         and will be deleted as soon as finish_command sees the inferior stopped.
-         So it doesn't matter that the bp's address is probably bogus in the
-         new a.out, unlike e.g., the solib breakpoints.)  */
-      if (b->type == bp_finish)
-        {
-          continue;
-        }
-
-      /* Without a symbolic address, we have little hope of the
-         pre-exec() address meaning the same thing in the post-exec()
-         a.out. */
-      if (b->addr_string == NULL)
-        {
-          delete_breakpoint (b);
-          continue;
-        }
+  {
+    /* Solib breakpoints must be explicitly reset after an exec(). */
+    if (b->type == bp_shlib_event)
+      {
+	delete_breakpoint (b);
+	continue;
+      }
 
-      /* If this breakpoint has survived the above battery of checks, then
-         it must have a symbolic address.  Be sure that it gets reevaluated
-         to a target address, rather than reusing the old evaluation.  */
-      b->address = (CORE_ADDR) NULL;
-    }
+    /* Step-resume breakpoints are meaningless after an exec(). */
+    if (b->type == bp_step_resume)
+      {
+	delete_breakpoint (b);
+	continue;
+      }
+
+    /* Ditto the sigtramp handler breakpoints. */
+    if (b->type == bp_through_sigtramp)
+      {
+	delete_breakpoint (b);
+	continue;
+      }
+
+    /* Ditto the exception-handling catchpoints. */
+    if ((b->type == bp_catch_catch) || (b->type == bp_catch_throw))
+      {
+	delete_breakpoint (b);
+	continue;
+      }
+
+    /* Don't delete an exec catchpoint, because else the inferior
+       won't stop when it ought!
+
+       Similarly, we probably ought to keep vfork catchpoints, 'cause
+       on this target, we may not be able to stop when the vfork is seen,
+       but only when the subsequent exec is seen.  (And because deleting
+       fork catchpoints here but not vfork catchpoints will seem mysterious
+       to users, keep those too.)
+
+       ??rehrauer: Let's hope that merely clearing out this catchpoint's
+       target address field, if any, is sufficient to have it be reset
+       automagically.  Certainly on HP-UX that's true. */
+    if ((b->type == bp_catch_exec) ||
+	(b->type == bp_catch_vfork) ||
+	(b->type == bp_catch_fork))
+      {
+	b->address = (CORE_ADDR) NULL;
+	continue;
+      }
+
+    /* bp_finish is a special case.  The only way we ought to be able
+       to see one of these when an exec() has happened, is if the user
+       caught a vfork, and then said "finish".  Ordinarily a finish just
+       carries them to the call-site of the current callee, by setting
+       a temporary bp there and resuming.  But in this case, the finish
+       will carry them entirely through the vfork & exec.
+
+       We don't want to allow a bp_finish to remain inserted now.  But
+       we can't safely delete it, 'cause finish_command has a handle to
+       the bp on a bpstat, and will later want to delete it.  There's a
+       chance (and I've seen it happen) that if we delete the bp_finish
+       here, that its storage will get reused by the time finish_command
+       gets 'round to deleting the "use to be a bp_finish" breakpoint.
+       We really must allow finish_command to delete a bp_finish.
+
+       In the absense of a general solution for the "how do we know it's
+       safe to delete something others may have handles to?" problem, what
+       we'll do here is just uninsert the bp_finish, and let finish_command
+       delete it.
+
+       (We know the bp_finish is "doomed" in the sense that it's momentary,
+       and will be deleted as soon as finish_command sees the inferior stopped.
+       So it doesn't matter that the bp's address is probably bogus in the
+       new a.out, unlike e.g., the solib breakpoints.)  */
+    if (b->type == bp_finish)
+      {
+	continue;
+      }
+
+    /* Without a symbolic address, we have little hope of the
+       pre-exec() address meaning the same thing in the post-exec()
+       a.out. */
+    if (b->addr_string == NULL)
+      {
+	delete_breakpoint (b);
+	continue;
+      }
+
+    /* If this breakpoint has survived the above battery of checks, then
+       it must have a symbolic address.  Be sure that it gets reevaluated
+       to a target address, rather than reusing the old evaluation.  */
+    b->address = (CORE_ADDR) NULL;
+  }
 }
 
 int
 detach_breakpoints (pid)
-  int  pid;
+     int pid;
 {
   register struct breakpoint *b;
   int val;
-  int  saved_inferior_pid = inferior_pid;
- 
+  int saved_inferior_pid = inferior_pid;
+
   if (pid == inferior_pid)
     error ("Cannot detach breakpoints of inferior_pid");
- 
-  inferior_pid = pid;  /* Because remove_breakpoint will use this global. */
+
+  inferior_pid = pid;		/* Because remove_breakpoint will use this global. */
   ALL_BREAKPOINTS (b)
-    {
-      if (b->inserted)
-        {
-          val = remove_breakpoint (b, mark_inserted);
-          if (val != 0)
-            {
-              inferior_pid = saved_inferior_pid;
-              return val;
-            }
-        }
-    }
+  {
+    if (b->inserted)
+      {
+	val = remove_breakpoint (b, mark_inserted);
+	if (val != 0)
+	  {
+	    inferior_pid = saved_inferior_pid;
+	    return val;
+	  }
+      }
+  }
   inferior_pid = saved_inferior_pid;
   return 0;
 }
@@ -1081,10 +1086,10 @@ detach_breakpoints (pid)
 static int
 remove_breakpoint (b, is)
      struct breakpoint *b;
-     insertion_state_t  is;
+     insertion_state_t is;
 {
   int val;
-  
+
   if (b->type == bp_none)
     warning ("attempted to remove apparently deleted breakpoint #%d?\n", b->number);
 
@@ -1097,17 +1102,17 @@ remove_breakpoint (b, is)
       && b->type != bp_catch_exec
       && b->type != bp_catch_catch
       && b->type != bp_catch_throw)
-      
+
     {
       if (b->type == bp_hardware_breakpoint)
-        val = target_remove_hw_breakpoint(b->address, b->shadow_contents);
+	val = target_remove_hw_breakpoint (b->address, b->shadow_contents);
       else
 	{
 	  /* Check to see if breakpoint is in an overlay section;
 	     if so, we should remove the breakpoint at the LMA address.
 	     If that is not equal to the raw address, then we should 
 	     presumable remove the breakpoint there as well.  */
-	  if (overlay_debugging && b->section && 
+	  if (overlay_debugging && b->section &&
 	      section_is_overlay (b->section))
 	    {
 	      CORE_ADDR addr;
@@ -1115,29 +1120,29 @@ remove_breakpoint (b, is)
 	      addr = overlay_unmapped_address (b->address, b->section);
 	      val = target_remove_breakpoint (addr, b->shadow_contents);
 	      /* This would be the time to check val, to see if the
-		 shadow breakpoint write to the load address succeeded.  
-		 However, this might be an ordinary occurrance, eg. if 
-		 the unmapped overlay is in ROM.  */
-	      val = 0;	/* in case unmapped address failed */
+	         shadow breakpoint write to the load address succeeded.  
+	         However, this might be an ordinary occurrance, eg. if 
+	         the unmapped overlay is in ROM.  */
+	      val = 0;		/* in case unmapped address failed */
 	      if (section_is_mapped (b->section))
-		val = target_remove_breakpoint (b->address, 
+		val = target_remove_breakpoint (b->address,
 						b->shadow_contents);
 	    }
-	  else /* ordinary (non-overlay) address */
-	    val = target_remove_breakpoint(b->address, b->shadow_contents);
+	  else			/* ordinary (non-overlay) address */
+	    val = target_remove_breakpoint (b->address, b->shadow_contents);
 	}
       if (val)
 	return val;
       b->inserted = (is == mark_inserted);
     }
   else if ((b->type == bp_hardware_watchpoint ||
-            b->type == bp_read_watchpoint ||
-  	    b->type == bp_access_watchpoint)
+	    b->type == bp_read_watchpoint ||
+	    b->type == bp_access_watchpoint)
 	   && b->enable == enabled
-	   && ! b->duplicate)
+	   && !b->duplicate)
     {
       value_ptr v, n;
-      
+
       b->inserted = (is == mark_inserted);
       /* Walk down the saved value chain.  */
       for (v = b->val_chain; v; v = v->next)
@@ -1147,7 +1152,7 @@ remove_breakpoint (b, is)
 	  if (v->lval == lval_memory)
 	    {
 	      int addr, len, type;
-	      
+
 	      addr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
 	      len = TYPE_LENGTH (VALUE_TYPE (v));
 	      type = 0;
@@ -1166,9 +1171,9 @@ remove_breakpoint (b, is)
       if ((is == mark_uninserted) && (b->inserted))
 	warning ("Hardware watchpoint %d: Could not remove watchpoint\n",
 		 b->number);
-      
+
       /* Free the saved value chain.  We will construct a new one
-	 the next time the watchpoint is inserted.  */
+         the next time the watchpoint is inserted.  */
       for (v = b->val_chain; v; v = n)
 	{
 	  n = v->next;
@@ -1177,52 +1182,52 @@ remove_breakpoint (b, is)
       b->val_chain = NULL;
     }
   else if ((b->type == bp_catch_fork ||
-            b->type == bp_catch_vfork ||
-  	    b->type == bp_catch_exec)
+	    b->type == bp_catch_vfork ||
+	    b->type == bp_catch_exec)
 	   && b->enable == enabled
-	   && ! b->duplicate)
+	   && !b->duplicate)
     {
       val = -1;
       switch (b->type)
-        {
-          case bp_catch_fork:
-            val = target_remove_fork_catchpoint (inferior_pid);
-            break;
-          case bp_catch_vfork :
-            val = target_remove_vfork_catchpoint (inferior_pid);
-            break;
-          case bp_catch_exec :
-            val = target_remove_exec_catchpoint (inferior_pid);
-            break;
+	{
+	case bp_catch_fork:
+	  val = target_remove_fork_catchpoint (inferior_pid);
+	  break;
+	case bp_catch_vfork:
+	  val = target_remove_vfork_catchpoint (inferior_pid);
+	  break;
+	case bp_catch_exec:
+	  val = target_remove_exec_catchpoint (inferior_pid);
+	  break;
 	default:
 	  warning ("GDB bug: breakpoint.c (remove_breakpoint): enclosing `if' does not protect `switch'");
 	  break;
-        }
+	}
       if (val)
 	return val;
       b->inserted = (is == mark_inserted);
     }
   else if ((b->type == bp_catch_catch ||
-            b->type == bp_catch_throw)
-           && b->enable == enabled
-           && ! b->duplicate)
+	    b->type == bp_catch_throw)
+	   && b->enable == enabled
+	   && !b->duplicate)
     {
 
-      val = target_remove_breakpoint(b->address, b->shadow_contents);
+      val = target_remove_breakpoint (b->address, b->shadow_contents);
       if (val)
-        return val;
+	return val;
       b->inserted = (is == mark_inserted);
     }
   else if (ep_is_exception_catchpoint (b)
-           && b->inserted /* sometimes previous insert doesn't happen */ 
-           && b->enable == enabled
-           && ! b->duplicate)
+	   && b->inserted	/* sometimes previous insert doesn't happen */
+	   && b->enable == enabled
+	   && !b->duplicate)
     {
 
-      val = target_remove_breakpoint(b->address, b->shadow_contents);
+      val = target_remove_breakpoint (b->address, b->shadow_contents);
       if (val)
-          return val;
-      
+	return val;
+
       b->inserted = (is == mark_inserted);
     }
 
@@ -1247,65 +1252,65 @@ mark_breakpoints_out ()
    between runs.
 
    Note: this function gets called at the end of a run (by generic_mourn_inferior)
-   and when a run begins (by init_wait_for_inferior). */ 
+   and when a run begins (by init_wait_for_inferior). */
 
 
 
 void
 breakpoint_init_inferior (context)
-  enum inf_context context;
+     enum inf_context context;
 {
   register struct breakpoint *b, *temp;
   static int warning_needed = 0;
 
   ALL_BREAKPOINTS_SAFE (b, temp)
-    {
-      b->inserted = 0;
+  {
+    b->inserted = 0;
 
-      switch (b->type)
-	{
-	case bp_call_dummy:
-	case bp_watchpoint_scope:
+    switch (b->type)
+      {
+      case bp_call_dummy:
+      case bp_watchpoint_scope:
 
-	  /* If the call dummy breakpoint is at the entry point it will
-	     cause problems when the inferior is rerun, so we better
-	     get rid of it. 
+	/* If the call dummy breakpoint is at the entry point it will
+	   cause problems when the inferior is rerun, so we better
+	   get rid of it. 
 
-	     Also get rid of scope breakpoints.  */
-	  delete_breakpoint (b);
-	  break;
+	   Also get rid of scope breakpoints.  */
+	delete_breakpoint (b);
+	break;
 
-	case bp_watchpoint:
-	case bp_hardware_watchpoint:
-	case bp_read_watchpoint:
-	case bp_access_watchpoint:
+      case bp_watchpoint:
+      case bp_hardware_watchpoint:
+      case bp_read_watchpoint:
+      case bp_access_watchpoint:
 
-	  /* Likewise for watchpoints on local expressions.  */
-	  if (b->exp_valid_block != NULL)
+	/* Likewise for watchpoints on local expressions.  */
+	if (b->exp_valid_block != NULL)
+	  delete_breakpoint (b);
+	break;
+      default:
+	/* Likewise for exception catchpoints in dynamic-linked
+	   executables where required */
+	if (ep_is_exception_catchpoint (b) &&
+	    exception_catchpoints_are_fragile)
+	  {
+	    warning_needed = 1;
 	    delete_breakpoint (b);
-	  break;
-	default:
-         /* Likewise for exception catchpoints in dynamic-linked
-         executables where required */
-         if (ep_is_exception_catchpoint (b) &&
-            exception_catchpoints_are_fragile)
-          {
-            warning_needed = 1;
-            delete_breakpoint (b);
-          }
-          break;
-	}
-    }
+	  }
+	break;
+      }
+  }
 
   if (exception_catchpoints_are_fragile)
     exception_support_initialized = 0;
 
-  /* Don't issue the warning unless it's really needed... */ 
+  /* Don't issue the warning unless it's really needed... */
   if (warning_needed && (context != inf_exited))
     {
       warning ("Exception catchpoints from last run were deleted, you must reinsert them explicitly");
       warning_needed = 0;
-    }  
+    }
 }
 
 /* breakpoint_here_p (PC) returns 1 if an enabled breakpoint exists at PC.
@@ -1323,14 +1328,14 @@ breakpoint_here_p (pc)
 	&& b->enable != shlib_disabled
 	&& b->enable != call_disabled
 	&& b->address == pc)	/* bp is enabled and matches pc */
-      {
-        if (overlay_debugging &&
-	    section_is_overlay (b->section) &&
-	    !section_is_mapped (b->section))
-	  continue;		/* unmapped overlay -- can't be a match */
-        else
-	  return 1;
-      }
+    {
+      if (overlay_debugging &&
+	  section_is_overlay (b->section) &&
+	  !section_is_mapped (b->section))
+	continue;		/* unmapped overlay -- can't be a match */
+      else
+	return 1;
+    }
 
   return 0;
 }
@@ -1347,14 +1352,14 @@ breakpoint_inserted_here_p (pc)
   ALL_BREAKPOINTS (b)
     if (b->inserted
 	&& b->address == pc)	/* bp is inserted and matches pc */
-      {
-        if (overlay_debugging &&
-	    section_is_overlay (b->section) &&
-	    !section_is_mapped (b->section))
-	  continue;		/* unmapped overlay -- can't be a match */
-        else
-	  return 1;
-      }
+    {
+      if (overlay_debugging &&
+	  section_is_overlay (b->section) &&
+	  !section_is_mapped (b->section))
+	continue;		/* unmapped overlay -- can't be a match */
+      else
+	return 1;
+    }
 
   return 0;
 }
@@ -1370,24 +1375,24 @@ frame_in_dummy (frame)
 {
   struct breakpoint *b;
 
-  if (! CALL_DUMMY_P)
+  if (!CALL_DUMMY_P)
     return 0;
 
   if (USE_GENERIC_DUMMY_FRAMES)
     return generic_pc_in_call_dummy (frame->pc, frame->frame, frame->frame);
-  
+
   ALL_BREAKPOINTS (b)
-    {
-      if (b->type == bp_call_dummy
-	  && b->frame == frame->frame
-	  /* We need to check the PC as well as the frame on the sparc,
-	     for signals.exp in the testsuite.  */
-	  && (frame->pc
-	      >= (b->address
-		  - SIZEOF_CALL_DUMMY_WORDS / sizeof (LONGEST) * REGISTER_SIZE))
-	  && frame->pc <= b->address)
-	return 1;
-    }
+  {
+    if (b->type == bp_call_dummy
+	&& b->frame == frame->frame
+    /* We need to check the PC as well as the frame on the sparc,
+       for signals.exp in the testsuite.  */
+	&& (frame->pc
+	    >= (b->address
+	      - SIZEOF_CALL_DUMMY_WORDS / sizeof (LONGEST) * REGISTER_SIZE))
+	&& frame->pc <= b->address)
+      return 1;
+  }
   return 0;
 }
 
@@ -1410,25 +1415,25 @@ breakpoint_thread_match (pc, pid)
 	&& b->enable != call_disabled
 	&& b->address == pc
 	&& (b->thread == -1 || b->thread == thread))
-      {
-        if (overlay_debugging &&
-	    section_is_overlay (b->section) &&
-	    !section_is_mapped (b->section))
-	  continue;		/* unmapped overlay -- can't be a match */
-        else
-	  return 1;
-      }
+    {
+      if (overlay_debugging &&
+	  section_is_overlay (b->section) &&
+	  !section_is_mapped (b->section))
+	continue;		/* unmapped overlay -- can't be a match */
+      else
+	return 1;
+    }
 
   return 0;
 }
-
 
+
 /* bpstat stuff.  External routines' interfaces are documented
    in breakpoint.h.  */
 
 int
 ep_is_catchpoint (ep)
-  struct breakpoint *  ep;
+     struct breakpoint *ep;
 {
   return
     (ep->type == bp_catch_load)
@@ -1440,13 +1445,13 @@ ep_is_catchpoint (ep)
     || (ep->type == bp_catch_throw)
 
 
-    /* ??rehrauer: Add more kinds here, as are implemented... */
+  /* ??rehrauer: Add more kinds here, as are implemented... */
     ;
 }
- 
+
 int
 ep_is_shlib_catchpoint (ep)
-  struct breakpoint *  ep;
+     struct breakpoint *ep;
 {
   return
     (ep->type == bp_catch_load)
@@ -1456,7 +1461,7 @@ ep_is_shlib_catchpoint (ep)
 
 int
 ep_is_exception_catchpoint (ep)
-  struct breakpoint *  ep;
+     struct breakpoint *ep;
 {
   return
     (ep->type == bp_catch_catch)
@@ -1482,7 +1487,7 @@ bpstat_clear (bsp)
       q = p->next;
       if (p->old_val != NULL)
 	value_free (p->old_val);
-      free ((PTR)p);
+      free ((PTR) p);
       p = q;
     }
   *bsp = NULL;
@@ -1520,15 +1525,18 @@ bpstat_copy (bs)
 /* Find the bpstat associated with this breakpoint */
 
 bpstat
-bpstat_find_breakpoint(bsp, breakpoint)
+bpstat_find_breakpoint (bsp, breakpoint)
      bpstat bsp;
      struct breakpoint *breakpoint;
 {
-  if (bsp == NULL) return NULL;
+  if (bsp == NULL)
+    return NULL;
 
-  for (;bsp != NULL; bsp = bsp->next) {
-    if (bsp->breakpoint_at == breakpoint) return bsp;
-  }
+  for (; bsp != NULL; bsp = bsp->next)
+    {
+      if (bsp->breakpoint_at == breakpoint)
+	return bsp;
+    }
   return NULL;
 }
 
@@ -1542,7 +1550,7 @@ bpstat_find_breakpoint(bsp, breakpoint)
    See wait_for_inferior's use of this function.  */
 struct breakpoint *
 bpstat_find_step_resume_breakpoint (bsp)
-  bpstat  bsp;
+     bpstat bsp;
 {
   if (bsp == NULL)
     error ("Internal error (bpstat_find_step_resume_breakpoint)");
@@ -1550,8 +1558,8 @@ bpstat_find_step_resume_breakpoint (bsp)
   for (; bsp != NULL; bsp = bsp->next)
     {
       if ((bsp->breakpoint_at != NULL) &&
-          (bsp->breakpoint_at->type == bp_step_resume))
-        return bsp->breakpoint_at;
+	  (bsp->breakpoint_at->type == bp_step_resume))
+	return bsp->breakpoint_at;
     }
 
   error ("Internal error (no step_resume breakpoint found)");
@@ -1579,7 +1587,7 @@ bpstat_num (bsp)
       if (b == NULL)
 	return -1;		/* breakpoint that's been deleted since */
       else
-        return b->number;	/* We have its number */
+	return b->number;	/* We have its number */
     }
 }
 
@@ -1678,13 +1686,13 @@ top:
    calling the print_it function for each one. The default
    print_it function, used for breakpoints, is print_it_normal().
    (Also see print_it_noop() and print_it_done()).
-   
+
    Return values from this routine (used by bpstat_print() to
    decide what to do):
    1: Means we printed something, and we do *not* desire that
-      something to be followed by a location.
+   something to be followed by a location.
    0: Means we printed something, and we *do*  desire that
-      something to be followed by a location.
+   something to be followed by a location.
    -1: Means we printed nothing.  */
 
 static int
@@ -1695,13 +1703,13 @@ print_it_normal (bs)
      which has since been deleted.  */
   if (bs->breakpoint_at == NULL
       || (bs->breakpoint_at->type != bp_breakpoint
-          && bs->breakpoint_at->type != bp_catch_load
-          && bs->breakpoint_at->type != bp_catch_unload
-          && bs->breakpoint_at->type != bp_catch_fork
-          && bs->breakpoint_at->type != bp_catch_vfork
-          && bs->breakpoint_at->type != bp_catch_exec
-          && bs->breakpoint_at->type != bp_catch_catch
-          && bs->breakpoint_at->type != bp_catch_throw
+	  && bs->breakpoint_at->type != bp_catch_load
+	  && bs->breakpoint_at->type != bp_catch_unload
+	  && bs->breakpoint_at->type != bp_catch_fork
+	  && bs->breakpoint_at->type != bp_catch_vfork
+	  && bs->breakpoint_at->type != bp_catch_exec
+	  && bs->breakpoint_at->type != bp_catch_catch
+	  && bs->breakpoint_at->type != bp_catch_throw
 	  && bs->breakpoint_at->type != bp_hardware_breakpoint
 	  && bs->breakpoint_at->type != bp_watchpoint
 	  && bs->breakpoint_at->type != bp_read_watchpoint
@@ -1714,21 +1722,21 @@ print_it_normal (bs)
       annotate_catchpoint (bs->breakpoint_at->number);
       printf_filtered ("\nCatchpoint %d (", bs->breakpoint_at->number);
       if (bs->breakpoint_at->type == bp_catch_load)
-        printf_filtered ("loaded");
+	printf_filtered ("loaded");
       else if (bs->breakpoint_at->type == bp_catch_unload)
-        printf_filtered ("unloaded");
+	printf_filtered ("unloaded");
       printf_filtered (" %s), ", bs->breakpoint_at->triggered_dll_pathname);
       return 0;
     }
   else if (bs->breakpoint_at->type == bp_catch_fork ||
-      bs->breakpoint_at->type == bp_catch_vfork)
+	   bs->breakpoint_at->type == bp_catch_vfork)
     {
       annotate_catchpoint (bs->breakpoint_at->number);
       printf_filtered ("\nCatchpoint %d (", bs->breakpoint_at->number);
       if (bs->breakpoint_at->type == bp_catch_fork)
-        printf_filtered ("forked");
+	printf_filtered ("forked");
       else if (bs->breakpoint_at->type == bp_catch_vfork)
-        printf_filtered ("vforked");
+	printf_filtered ("vforked");
       printf_filtered (" process %d), ", bs->breakpoint_at->forked_inferior_pid);
       return 0;
     }
@@ -1736,84 +1744,84 @@ print_it_normal (bs)
     {
       annotate_catchpoint (bs->breakpoint_at->number);
       printf_filtered ("\nCatchpoint %d (exec'd %s), ",
-                       bs->breakpoint_at->number,
-                       bs->breakpoint_at->exec_pathname);
+		       bs->breakpoint_at->number,
+		       bs->breakpoint_at->exec_pathname);
       return 0;
     }
- else if (bs->breakpoint_at->type == bp_catch_catch)
+  else if (bs->breakpoint_at->type == bp_catch_catch)
     {
       if (current_exception_event && (CURRENT_EXCEPTION_KIND == EX_EVENT_CATCH))
-        {
-          annotate_catchpoint (bs->breakpoint_at->number);
-          printf_filtered ("\nCatchpoint %d (exception caught), ", bs->breakpoint_at->number);
-          printf_filtered ("throw location ");
-          if (CURRENT_EXCEPTION_THROW_PC && CURRENT_EXCEPTION_THROW_LINE)
-                printf_filtered ("%s:%d",
-                                 CURRENT_EXCEPTION_THROW_FILE,
-                                 CURRENT_EXCEPTION_THROW_LINE);
-          else
-            printf_filtered ("unknown");
-          
-          printf_filtered (", catch location ");
-          if (CURRENT_EXCEPTION_CATCH_PC  && CURRENT_EXCEPTION_CATCH_LINE)
-            printf_filtered ("%s:%d",
-                             CURRENT_EXCEPTION_CATCH_FILE,
-                             CURRENT_EXCEPTION_CATCH_LINE);
-          else
-            printf_filtered ("unknown");
-          
-          printf_filtered ("\n");
-          return 1;   /* don't bother to print location frame info */ 
-        }
+	{
+	  annotate_catchpoint (bs->breakpoint_at->number);
+	  printf_filtered ("\nCatchpoint %d (exception caught), ", bs->breakpoint_at->number);
+	  printf_filtered ("throw location ");
+	  if (CURRENT_EXCEPTION_THROW_PC && CURRENT_EXCEPTION_THROW_LINE)
+	    printf_filtered ("%s:%d",
+			     CURRENT_EXCEPTION_THROW_FILE,
+			     CURRENT_EXCEPTION_THROW_LINE);
+	  else
+	    printf_filtered ("unknown");
+
+	  printf_filtered (", catch location ");
+	  if (CURRENT_EXCEPTION_CATCH_PC && CURRENT_EXCEPTION_CATCH_LINE)
+	    printf_filtered ("%s:%d",
+			     CURRENT_EXCEPTION_CATCH_FILE,
+			     CURRENT_EXCEPTION_CATCH_LINE);
+	  else
+	    printf_filtered ("unknown");
+
+	  printf_filtered ("\n");
+	  return 1;		/* don't bother to print location frame info */
+	}
       else
-        {
-          return -1;  /* really throw, some other bpstat will handle it */
-        }
+	{
+	  return -1;		/* really throw, some other bpstat will handle it */
+	}
     }
   else if (bs->breakpoint_at->type == bp_catch_throw)
     {
       if (current_exception_event && (CURRENT_EXCEPTION_KIND == EX_EVENT_THROW))
-        {
-          annotate_catchpoint (bs->breakpoint_at->number);
-          printf_filtered ("\nCatchpoint %d (exception thrown), ", bs->breakpoint_at->number);
-          printf_filtered ("throw location ");
-          if (CURRENT_EXCEPTION_THROW_PC && CURRENT_EXCEPTION_THROW_LINE)
-                printf_filtered ("%s:%d",
-                                 CURRENT_EXCEPTION_THROW_FILE,
-                                 CURRENT_EXCEPTION_THROW_LINE);
-          else
-            printf_filtered ("unknown");
-          
-          printf_filtered (", catch location ");
-          if (CURRENT_EXCEPTION_CATCH_PC  && CURRENT_EXCEPTION_CATCH_LINE)
-            printf_filtered ("%s:%d",
-                             CURRENT_EXCEPTION_CATCH_FILE,
-                             CURRENT_EXCEPTION_CATCH_LINE);
-          else
-            printf_filtered ("unknown");
-          
-          printf_filtered ("\n");
-          return 1;   /* don't bother to print location frame info */ 
-        }
+	{
+	  annotate_catchpoint (bs->breakpoint_at->number);
+	  printf_filtered ("\nCatchpoint %d (exception thrown), ", bs->breakpoint_at->number);
+	  printf_filtered ("throw location ");
+	  if (CURRENT_EXCEPTION_THROW_PC && CURRENT_EXCEPTION_THROW_LINE)
+	    printf_filtered ("%s:%d",
+			     CURRENT_EXCEPTION_THROW_FILE,
+			     CURRENT_EXCEPTION_THROW_LINE);
+	  else
+	    printf_filtered ("unknown");
+
+	  printf_filtered (", catch location ");
+	  if (CURRENT_EXCEPTION_CATCH_PC && CURRENT_EXCEPTION_CATCH_LINE)
+	    printf_filtered ("%s:%d",
+			     CURRENT_EXCEPTION_CATCH_FILE,
+			     CURRENT_EXCEPTION_CATCH_LINE);
+	  else
+	    printf_filtered ("unknown");
+
+	  printf_filtered ("\n");
+	  return 1;		/* don't bother to print location frame info */
+	}
       else
-        {
-          return -1;  /* really catch, some other bpstat willhandle it */
-        }
+	{
+	  return -1;		/* really catch, some other bpstat willhandle it */
+	}
     }
 
   else if (bs->breakpoint_at->type == bp_breakpoint ||
-      bs->breakpoint_at->type == bp_hardware_breakpoint)
+	   bs->breakpoint_at->type == bp_hardware_breakpoint)
     {
       /* I think the user probably only wants to see one breakpoint
-	 number, not all of them.  */
+         number, not all of them.  */
       annotate_breakpoint (bs->breakpoint_at->number);
       printf_filtered ("\nBreakpoint %d, ", bs->breakpoint_at->number);
       return 0;
     }
   else if ((bs->old_val != NULL) &&
-	(bs->breakpoint_at->type == bp_watchpoint ||
-	 bs->breakpoint_at->type == bp_access_watchpoint ||
-	 bs->breakpoint_at->type == bp_hardware_watchpoint))
+	   (bs->breakpoint_at->type == bp_watchpoint ||
+	    bs->breakpoint_at->type == bp_access_watchpoint ||
+	    bs->breakpoint_at->type == bp_hardware_watchpoint))
     {
       annotate_watchpoint (bs->breakpoint_at->number);
       mention (bs->breakpoint_at);
@@ -1834,7 +1842,7 @@ print_it_normal (bs)
       mention (bs->breakpoint_at);
       printf_filtered ("\nValue = ");
       value_print (bs->breakpoint_at->val, gdb_stdout, 0,
-                   Val_pretty_default);
+		   Val_pretty_default);
       printf_filtered ("\n");
       return -1;
     }
@@ -1853,27 +1861,27 @@ print_it_normal (bs)
 
    -1: Means we printed nothing
    0: Means we printed something, and expect subsequent
-      code to print the location. An example is 
-      "Breakpoint 1, " which should be followed by
-      the location.
+   code to print the location. An example is 
+   "Breakpoint 1, " which should be followed by
+   the location.
    1 : Means we printed something, but there is no need
-       to also print the location part of the message.
-       An example is the catch/throw messages, which
-       don't require a location appended to the end.  */ 
+   to also print the location part of the message.
+   An example is the catch/throw messages, which
+   don't require a location appended to the end.  */
 
 int
 bpstat_print (bs)
      bpstat bs;
 {
   int val;
-  
+
   if (bs == NULL)
     return -1;
 
   val = (*bs->print_it) (bs);
   if (val >= 0)
     return val;
-  
+
   /* Maybe another breakpoint in the chain caused us to stop.
      (Currently all watchpoints go on the bpstat whether hit or
      not.  That probably could (should) be changed, provided care is taken
@@ -1895,7 +1903,7 @@ breakpoint_cond_eval (exp)
      PTR exp;
 {
   value_ptr mark = value_mark ();
-  int i = !value_true (evaluate_expression ((struct expression *)exp));
+  int i = !value_true (evaluate_expression ((struct expression *) exp));
   value_free_to_mark (mark);
   return i;
 }
@@ -1905,7 +1913,7 @@ breakpoint_cond_eval (exp)
 static bpstat
 bpstat_alloc (b, cbs)
      register struct breakpoint *b;
-     bpstat cbs;			/* Current "bs" value */
+     bpstat cbs;		/* Current "bs" value */
 {
   bpstat bs;
 
@@ -1949,9 +1957,9 @@ watchpoint_check (p)
   else
     {
       /* There is no current frame at this moment.  If we're going to have
-	 any chance of handling watchpoints on local variables, we'll need
-	 the frame chain (so we can determine if we're in scope).  */
-      reinit_frame_cache();
+         any chance of handling watchpoints on local variables, we'll need
+         the frame chain (so we can determine if we're in scope).  */
+      reinit_frame_cache ();
       fr = find_frame_addr_in_frame_chain (b->watchpoint_frame);
       within_current_scope = (fr != NULL);
       if (within_current_scope)
@@ -1960,13 +1968,13 @@ watchpoint_check (p)
 	   the user.  */
 	select_frame (fr, -1);
     }
-      
+
   if (within_current_scope)
     {
       /* We use value_{,free_to_}mark because it could be a
          *long* time before we return to the command level and
-	 call free_all_values.  We can't call free_all_values because
-	 we might be in the middle of evaluating a function call.  */
+         call free_all_values.  We can't call free_all_values because
+         we might be in the middle of evaluating a function call.  */
 
       value_ptr mark = value_mark ();
       value_ptr new_val = evaluate_expression (bs->breakpoint_at->exp);
@@ -1990,13 +1998,13 @@ watchpoint_check (p)
   else
     {
       /* This seems like the only logical thing to do because
-	 if we temporarily ignored the watchpoint, then when
-	 we reenter the block in which it is valid it contains
-	 garbage (in the case of a function, it may have two
-	 garbage values, one before and one after the prologue).
-	 So we can't even detect the first assignment to it and
-	 watch after that (since the garbage may or may not equal
-	 the first value assigned).  */
+         if we temporarily ignored the watchpoint, then when
+         we reenter the block in which it is valid it contains
+         garbage (in the case of a function, it may have two
+         garbage values, one before and one after the prologue).
+         So we can't even detect the first assignment to it and
+         watch after that (since the garbage may or may not equal
+         the first value assigned).  */
       printf_filtered ("\
 Watchpoint %d deleted because the program has left the block in\n\
 which its expression is valid.\n", bs->breakpoint_at->number);
@@ -2051,16 +2059,16 @@ print_it_noop (bs)
 /* Determine whether we stopped at a breakpoint, etc, or whether we
    don't understand this stop.  Result is a chain of bpstat's such that:
 
-	if we don't understand the stop, the result is a null pointer.
+   if we don't understand the stop, the result is a null pointer.
 
-	if we understand why we stopped, the result is not null.
+   if we understand why we stopped, the result is not null.
 
-	Each element of the chain refers to a particular breakpoint or
-	watchpoint at which we have stopped.  (We may have stopped for
-	several reasons concurrently.)
+   Each element of the chain refers to a particular breakpoint or
+   watchpoint at which we have stopped.  (We may have stopped for
+   several reasons concurrently.)
 
-	Each element of the chain has valid next, breakpoint_at,
-	commands, FIXME??? fields.  */
+   Each element of the chain has valid next, breakpoint_at,
+   commands, FIXME??? fields.  */
 
 bpstat
 bpstat_stop_status (pc, not_a_breakpoint)
@@ -2076,94 +2084,149 @@ bpstat_stop_status (pc, not_a_breakpoint)
   /* Pointer to the last thing in the chain currently.  */
   bpstat bs = root_bs;
   static char message1[] =
-            "Error evaluating expression for watchpoint %d\n";
-  char message[sizeof (message1) + 30 /* slop */];
+  "Error evaluating expression for watchpoint %d\n";
+  char message[sizeof (message1) + 30 /* slop */ ];
 
   /* Get the address where the breakpoint would have been.  */
   bp_addr = *pc - DECR_PC_AFTER_BREAK;
 
   ALL_BREAKPOINTS_SAFE (b, temp)
-    {
-      if (b->enable == disabled
-	  || b->enable == shlib_disabled
-          || b->enable == call_disabled)
-	continue;
-
-      if (b->type != bp_watchpoint
-	  && b->type != bp_hardware_watchpoint
-          && b->type != bp_read_watchpoint
-          && b->type != bp_access_watchpoint
-	  && b->type != bp_hardware_breakpoint
-          && b->type != bp_catch_fork
-          && b->type != bp_catch_vfork
-          && b->type != bp_catch_exec
-          && b->type != bp_catch_catch
-          && b->type != bp_catch_throw)         /* a non-watchpoint bp */
-	if (b->address != bp_addr ||		/* address doesn't match or */
-	    (overlay_debugging &&		/* overlay doesn't match */
-	     section_is_overlay (b->section) &&
-	     !section_is_mapped (b->section)))
-	  continue;
-
-      if (b->type == bp_hardware_breakpoint
-	  && b->address != (*pc - DECR_PC_AFTER_HW_BREAK))
-	continue;
-
-      if (b->type != bp_watchpoint
-	  && b->type != bp_hardware_watchpoint
-	  && b->type != bp_read_watchpoint
-	  && b->type != bp_access_watchpoint
-	  && not_a_breakpoint)
+  {
+    if (b->enable == disabled
+	|| b->enable == shlib_disabled
+	|| b->enable == call_disabled)
+      continue;
+
+    if (b->type != bp_watchpoint
+	&& b->type != bp_hardware_watchpoint
+	&& b->type != bp_read_watchpoint
+	&& b->type != bp_access_watchpoint
+	&& b->type != bp_hardware_breakpoint
+	&& b->type != bp_catch_fork
+	&& b->type != bp_catch_vfork
+	&& b->type != bp_catch_exec
+	&& b->type != bp_catch_catch
+	&& b->type != bp_catch_throw)	/* a non-watchpoint bp */
+      if (b->address != bp_addr ||	/* address doesn't match or */
+	  (overlay_debugging &&	/* overlay doesn't match */
+	   section_is_overlay (b->section) &&
+	   !section_is_mapped (b->section)))
 	continue;
 
-      /* Is this a catchpoint of a load or unload?  If so, did we
-         get a load or unload of the specified library?  If not,
-         ignore it. */
-      if ((b->type == bp_catch_load)
+    if (b->type == bp_hardware_breakpoint
+	&& b->address != (*pc - DECR_PC_AFTER_HW_BREAK))
+      continue;
+
+    if (b->type != bp_watchpoint
+	&& b->type != bp_hardware_watchpoint
+	&& b->type != bp_read_watchpoint
+	&& b->type != bp_access_watchpoint
+	&& not_a_breakpoint)
+      continue;
+
+    /* Is this a catchpoint of a load or unload?  If so, did we
+       get a load or unload of the specified library?  If not,
+       ignore it. */
+    if ((b->type == bp_catch_load)
 #if defined(SOLIB_HAVE_LOAD_EVENT)
-          && (!SOLIB_HAVE_LOAD_EVENT(inferior_pid)
-              || ((b->dll_pathname != NULL)
-                  && (strcmp (b->dll_pathname, SOLIB_LOADED_LIBRARY_PATHNAME(inferior_pid)) != 0)))
+	&& (!SOLIB_HAVE_LOAD_EVENT (inferior_pid)
+	    || ((b->dll_pathname != NULL)
+		&& (strcmp (b->dll_pathname, SOLIB_LOADED_LIBRARY_PATHNAME (inferior_pid)) != 0)))
 #endif
-		  )
-        continue;
- 
-      if ((b->type == bp_catch_unload)
+      )
+      continue;
+
+    if ((b->type == bp_catch_unload)
 #if defined(SOLIB_HAVE_UNLOAD_EVENT)
-          && (!SOLIB_HAVE_UNLOAD_EVENT(inferior_pid)
-              || ((b->dll_pathname != NULL)
-                  && (strcmp (b->dll_pathname, SOLIB_UNLOADED_LIBRARY_PATHNAME(inferior_pid)) != 0)))
+	&& (!SOLIB_HAVE_UNLOAD_EVENT (inferior_pid)
+	    || ((b->dll_pathname != NULL)
+		&& (strcmp (b->dll_pathname, SOLIB_UNLOADED_LIBRARY_PATHNAME (inferior_pid)) != 0)))
 #endif
-	  )
-        continue;
- 
-      if ((b->type == bp_catch_fork)
-          && ! target_has_forked (inferior_pid, &b->forked_inferior_pid))
-          continue;
- 
-      if ((b->type == bp_catch_vfork)
-          && ! target_has_vforked (inferior_pid, &b->forked_inferior_pid))
-          continue;
- 
-      if ((b->type == bp_catch_exec)
-	  && ! target_has_execd (inferior_pid, &b->exec_pathname))
-	continue;
+      )
+      continue;
 
-      if (ep_is_exception_catchpoint (b) &&
-          !(current_exception_event = target_get_current_exception_event ()))
-        continue;
+    if ((b->type == bp_catch_fork)
+	&& !target_has_forked (inferior_pid, &b->forked_inferior_pid))
+      continue;
 
-      /* Come here if it's a watchpoint, or if the break address matches */
+    if ((b->type == bp_catch_vfork)
+	&& !target_has_vforked (inferior_pid, &b->forked_inferior_pid))
+      continue;
 
-      bs = bpstat_alloc (b, bs);	/* Alloc a bpstat to explain stop */
+    if ((b->type == bp_catch_exec)
+	&& !target_has_execd (inferior_pid, &b->exec_pathname))
+      continue;
 
-      /* Watchpoints may change this, if not found to have triggered. */
-      bs->stop = 1;
-      bs->print = 1;
+    if (ep_is_exception_catchpoint (b) &&
+	!(current_exception_event = target_get_current_exception_event ()))
+      continue;
 
-      sprintf (message, message1, b->number);
-      if (b->type == bp_watchpoint || b->type == bp_hardware_watchpoint)
-	{
+    /* Come here if it's a watchpoint, or if the break address matches */
+
+    bs = bpstat_alloc (b, bs);	/* Alloc a bpstat to explain stop */
+
+    /* Watchpoints may change this, if not found to have triggered. */
+    bs->stop = 1;
+    bs->print = 1;
+
+    sprintf (message, message1, b->number);
+    if (b->type == bp_watchpoint || b->type == bp_hardware_watchpoint)
+      {
+	switch (catch_errors (watchpoint_check, bs, message, RETURN_MASK_ALL))
+	  {
+	  case WP_DELETED:
+	    /* We've already printed what needs to be printed.  */
+	    bs->print_it = print_it_done;
+	    /* Stop.  */
+	    break;
+	  case WP_VALUE_CHANGED:
+	    /* Stop.  */
+	    ++(b->hit_count);
+	    break;
+	  case WP_VALUE_NOT_CHANGED:
+	    /* Don't stop.  */
+	    bs->print_it = print_it_noop;
+	    bs->stop = 0;
+	    /* Don't consider this a hit.  */
+	    --(b->hit_count);
+	    continue;
+	  default:
+	    /* Can't happen.  */
+	    /* FALLTHROUGH */
+	  case 0:
+	    /* Error from catch_errors.  */
+	    printf_filtered ("Watchpoint %d deleted.\n", b->number);
+	    if (b->related_breakpoint)
+	      b->related_breakpoint->disposition = del_at_next_stop;
+	    b->disposition = del_at_next_stop;
+	    /* We've already printed what needs to be printed.  */
+	    bs->print_it = print_it_done;
+
+	    /* Stop.  */
+	    break;
+	  }
+      }
+    else if (b->type == bp_read_watchpoint || b->type == bp_access_watchpoint)
+      {
+	CORE_ADDR addr;
+	value_ptr v;
+	int found = 0;
+
+	addr = target_stopped_data_address ();
+	if (addr == 0)
+	  continue;
+	for (v = b->val_chain; v; v = v->next)
+	  {
+	    if (v->lval == lval_memory)
+	      {
+		CORE_ADDR vaddr;
+
+		vaddr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
+		if (addr == vaddr)
+		  found = 1;
+	      }
+	  }
+	if (found)
 	  switch (catch_errors (watchpoint_check, bs, message, RETURN_MASK_ALL))
 	    {
 	    case WP_DELETED:
@@ -2172,19 +2235,12 @@ bpstat_stop_status (pc, not_a_breakpoint)
 	      /* Stop.  */
 	      break;
 	    case WP_VALUE_CHANGED:
+	    case WP_VALUE_NOT_CHANGED:
 	      /* Stop.  */
 	      ++(b->hit_count);
 	      break;
-	    case WP_VALUE_NOT_CHANGED:
-	      /* Don't stop.  */
-	      bs->print_it = print_it_noop;
-	      bs->stop = 0;
-	      /* Don't consider this a hit.  */
-	      --(b->hit_count);
-	      continue;
 	    default:
 	      /* Can't happen.  */
-	      /* FALLTHROUGH */
 	    case 0:
 	      /* Error from catch_errors.  */
 	      printf_filtered ("Watchpoint %d deleted.\n", b->number);
@@ -2193,126 +2249,79 @@ bpstat_stop_status (pc, not_a_breakpoint)
 	      b->disposition = del_at_next_stop;
 	      /* We've already printed what needs to be printed.  */
 	      bs->print_it = print_it_done;
-
-	      /* Stop.  */
 	      break;
 	    }
-	}
-      else if (b->type == bp_read_watchpoint || b->type == bp_access_watchpoint)
-        {
-	  CORE_ADDR addr;
-	  value_ptr v;
-          int found = 0;
-
-	  addr = target_stopped_data_address();
-	  if (addr == 0) continue;
-          for (v = b->val_chain; v; v = v->next)
-            {
-              if (v->lval == lval_memory)
-                {
-                  CORE_ADDR vaddr;
-
-                  vaddr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
-	          if (addr == vaddr)
-	            found = 1;
-                }
-            }
-	  if (found) 
-	    switch (catch_errors (watchpoint_check, bs, message, RETURN_MASK_ALL))
-   	      {
-                case WP_DELETED:
-                  /* We've already printed what needs to be printed.  */
-                  bs->print_it = print_it_done;
-                  /* Stop.  */
-                  break;
-                case WP_VALUE_CHANGED:
-                case WP_VALUE_NOT_CHANGED:
-                  /* Stop.  */
-		  ++(b->hit_count);
-                  break;
-                default:
-                  /* Can't happen.  */
-                case 0:
-                  /* Error from catch_errors.  */
-                  printf_filtered ("Watchpoint %d deleted.\n", b->number);
-		  if (b->related_breakpoint)
-		    b->related_breakpoint->disposition = del_at_next_stop;
-		  b->disposition = del_at_next_stop;
-                  /* We've already printed what needs to be printed.  */
-                  bs->print_it = print_it_done;
-                  break;
-	      }
-        }
-      else 
-        {
-          /* By definition, an encountered breakpoint is a triggered
-             breakpoint. */
-          ++(b->hit_count);
-
-	  real_breakpoint = 1;
-        }
-
-      if (b->frame && b->frame != (get_current_frame ())->frame &&
-          (b->type == bp_step_resume && 
-           (INNER_THAN (get_current_frame ()->frame, b->frame))))
-	bs->stop = 0;
-      else
-	{
-	  int value_is_zero = 0;
+      }
+    else
+      {
+	/* By definition, an encountered breakpoint is a triggered
+	   breakpoint. */
+	++(b->hit_count);
 
-	  if (b->cond)
-	    {
-	      /* Need to select the frame, with all that implies
-		 so that the conditions will have the right context.  */
-	      select_frame (get_current_frame (), 0);
-	      value_is_zero
-		= catch_errors (breakpoint_cond_eval, (b->cond),
-				"Error in testing breakpoint condition:\n",
-				RETURN_MASK_ALL);
-				/* FIXME-someday, should give breakpoint # */
-	      free_all_values ();
-	    }
-	  if (b->cond && value_is_zero)
-	    {
-	      bs->stop = 0;
-	      /* Don't consider this a hit.  */
-	      --(b->hit_count);
-	    }
-	  else if (b->ignore_count > 0)
-	    {
-	      b->ignore_count--;
-	      bs->stop = 0;
-	    }
-	  else
-	    {
-	      /* We will stop here */
-	      if (b->disposition == disable)
-		b->enable = disabled;
-	      bs->commands = b->commands;
-	      if (b->silent)
+	real_breakpoint = 1;
+      }
+
+    if (b->frame && b->frame != (get_current_frame ())->frame &&
+	(b->type == bp_step_resume &&
+	 (INNER_THAN (get_current_frame ()->frame, b->frame))))
+      bs->stop = 0;
+    else
+      {
+	int value_is_zero = 0;
+
+	if (b->cond)
+	  {
+	    /* Need to select the frame, with all that implies
+	       so that the conditions will have the right context.  */
+	    select_frame (get_current_frame (), 0);
+	    value_is_zero
+	      = catch_errors (breakpoint_cond_eval, (b->cond),
+			      "Error in testing breakpoint condition:\n",
+			      RETURN_MASK_ALL);
+	    /* FIXME-someday, should give breakpoint # */
+	    free_all_values ();
+	  }
+	if (b->cond && value_is_zero)
+	  {
+	    bs->stop = 0;
+	    /* Don't consider this a hit.  */
+	    --(b->hit_count);
+	  }
+	else if (b->ignore_count > 0)
+	  {
+	    b->ignore_count--;
+	    bs->stop = 0;
+	  }
+	else
+	  {
+	    /* We will stop here */
+	    if (b->disposition == disable)
+	      b->enable = disabled;
+	    bs->commands = b->commands;
+	    if (b->silent)
+	      bs->print = 0;
+	    if (bs->commands &&
+		(STREQ ("silent", bs->commands->line) ||
+		 (xdb_commands && STREQ ("Q", bs->commands->line))))
+	      {
+		bs->commands = bs->commands->next;
 		bs->print = 0;
-	      if (bs->commands &&
-		  (STREQ ("silent", bs->commands->line) ||
-		   (xdb_commands && STREQ ("Q", bs->commands->line))))
-		{
-		  bs->commands = bs->commands->next;
-		  bs->print = 0;
-		}
-	    }
-	}
-      /* Print nothing for this entry if we dont stop or if we dont print.  */
-      if (bs->stop == 0 || bs->print == 0)
-	bs->print_it = print_it_noop;
-    }
+	      }
+	  }
+      }
+    /* Print nothing for this entry if we dont stop or if we dont print.  */
+    if (bs->stop == 0 || bs->print == 0)
+      bs->print_it = print_it_noop;
+  }
 
   bs->next = NULL;		/* Terminate the chain */
   bs = root_bs->next;		/* Re-grab the head of the chain */
 
   if (real_breakpoint && bs)
     {
-      if (bs->breakpoint_at->type == bp_hardware_breakpoint) 
+      if (bs->breakpoint_at->type == bp_hardware_breakpoint)
 	{
-	  if (DECR_PC_AFTER_HW_BREAK != 0) 
+	  if (DECR_PC_AFTER_HW_BREAK != 0)
 	    {
 	      *pc = *pc - DECR_PC_AFTER_HW_BREAK;
 	      write_pc (*pc);
@@ -2324,7 +2333,7 @@ bpstat_stop_status (pc, not_a_breakpoint)
 	    {
 	      *pc = bp_addr;
 #if defined (SHIFT_INST_REGS)
-	      SHIFT_INST_REGS();
+	      SHIFT_INST_REGS ();
 #else /* No SHIFT_INST_REGS.  */
 	      write_pc (bp_addr);
 #endif /* No SHIFT_INST_REGS.  */
@@ -2334,7 +2343,7 @@ bpstat_stop_status (pc, not_a_breakpoint)
 
   /* The value of a hardware watchpoint hasn't changed, but the
      intermediate memory locations we are watching may have.  */
-  if (bs && ! bs->stop &&
+  if (bs && !bs->stop &&
       (bs->breakpoint_at->type == bp_hardware_watchpoint ||
        bs->breakpoint_at->type == bp_read_watchpoint ||
        bs->breakpoint_at->type == bp_access_watchpoint))
@@ -2351,45 +2360,46 @@ bpstat_what (bs)
      bpstat bs;
 {
   /* Classify each bpstat as one of the following.  */
-  enum class {
-    /* This bpstat element has no effect on the main_action.  */
-    no_effect = 0,
+  enum class
+    {
+      /* This bpstat element has no effect on the main_action.  */
+      no_effect = 0,
+
+      /* There was a watchpoint, stop but don't print.  */
+      wp_silent,
 
-    /* There was a watchpoint, stop but don't print.  */
-    wp_silent,
+      /* There was a watchpoint, stop and print.  */
+      wp_noisy,
 
-    /* There was a watchpoint, stop and print.  */
-    wp_noisy,
+      /* There was a breakpoint but we're not stopping.  */
+      bp_nostop,
 
-    /* There was a breakpoint but we're not stopping.  */
-    bp_nostop,
+      /* There was a breakpoint, stop but don't print.  */
+      bp_silent,
 
-    /* There was a breakpoint, stop but don't print.  */
-    bp_silent,
+      /* There was a breakpoint, stop and print.  */
+      bp_noisy,
 
-    /* There was a breakpoint, stop and print.  */
-    bp_noisy,
+      /* We hit the longjmp breakpoint.  */
+      long_jump,
 
-    /* We hit the longjmp breakpoint.  */
-    long_jump,
+      /* We hit the longjmp_resume breakpoint.  */
+      long_resume,
 
-    /* We hit the longjmp_resume breakpoint.  */
-    long_resume,
+      /* We hit the step_resume breakpoint.  */
+      step_resume,
 
-    /* We hit the step_resume breakpoint.  */
-    step_resume,
+      /* We hit the through_sigtramp breakpoint.  */
+      through_sig,
 
-    /* We hit the through_sigtramp breakpoint.  */
-    through_sig,
+      /* We hit the shared library event breakpoint.  */
+      shlib_event,
 
-    /* We hit the shared library event breakpoint.  */
-    shlib_event,
+      /* We caught a shared library event.  */
+      catch_shlib_event,
 
-    /* We caught a shared library event.  */
-    catch_shlib_event,
- 
-    /* This is just used to count how many enums there are.  */
-    class_last
+      /* This is just used to count how many enums there are.  */
+      class_last
     };
 
   /* Here is the table which drives this routine.  So that we can
@@ -2426,18 +2436,18 @@ bpstat_what (bs)
      back and decide something of a lower priority is better.  The
      ordering is:
 
-	kc   < clr sgl shl slr sn sr ss ts
-	sgl  < clrs shl shlr slr sn sr ss ts
-	slr  < err shl shlr sn sr ss ts
-	clr  < clrs err shl shlr sn sr ss ts
-	clrs < err shl shlr sn sr ss ts
-	ss   < shl shlr sn sr ts
-	sn   < shl shlr sr ts
-	sr   < shl shlr ts
-	shl  < shlr
-	ts   < 
-	shlr <
-       
+     kc   < clr sgl shl slr sn sr ss ts
+     sgl  < clrs shl shlr slr sn sr ss ts
+     slr  < err shl shlr sn sr ss ts
+     clr  < clrs err shl shlr sn sr ss ts
+     clrs < err shl shlr sn sr ss ts
+     ss   < shl shlr sn sr ts
+     sn   < shl shlr sr ts
+     sr   < shl shlr ts
+     shl  < shlr
+     ts   < 
+     shlr <
+
      What I think this means is that we don't need a damned table
      here.  If you just put the rows and columns in the right order,
      it'd look awfully regular.  We could simply walk the bpstat list
@@ -2453,24 +2463,36 @@ bpstat_what (bs)
      one of those and a step_resume_breakpoint is probably very rare (?).  */
 
   static const enum bpstat_what_main_action
-    table[(int)class_last][(int)BPSTAT_WHAT_LAST] =
-      {
-	/*                              old action */
-        /*       kc    ss    sn    sgl    slr   clr    clrs   sr    ts   shl   shlr
-         */
-/*no_effect*/   {kc,   ss,   sn,   sgl,   slr,  clr,   clrs,  sr,   ts,  shl,  shlr},
-/*wp_silent*/   {ss,   ss,   sn,   ss,    ss,   ss,    ss,    sr,   ts,  shl,  shlr},
-/*wp_noisy*/    {sn,   sn,   sn,   sn,    sn,   sn,    sn,    sr,   ts,  shl,  shlr},
-/*bp_nostop*/   {sgl,  ss,   sn,   sgl,   slr,  clrs,  clrs,  sr,   ts,  shl,  shlr},
-/*bp_silent*/   {ss,   ss,   sn,   ss,    ss,   ss,    ss,    sr,   ts,  shl,  shlr},
-/*bp_noisy*/    {sn,   sn,   sn,   sn,    sn,   sn,    sn,    sr,   ts,  shl,  shlr},
-/*long_jump*/   {slr,  ss,   sn,   slr,   err,  err,   err,   sr,   ts,  shl,  shlr},
-/*long_resume*/ {clr,  ss,   sn,   clrs,  err,  err,   err,   sr,   ts,  shl,  shlr},
-/*step_resume*/ {sr,   sr,   sr,   sr,    sr,   sr,    sr,    sr,   ts,  shl,  shlr},
-/*through_sig*/ {ts,   ts,   ts,   ts,    ts,   ts,    ts,    ts,   ts,  shl,  shlr},
-/*shlib*/       {shl,  shl,  shl,  shl,   shl,  shl,   shl,   shl,  ts,  shl,  shlr},
-/*catch_shlib*/ {shlr, shlr, shlr, shlr,  shlr, shlr,  shlr,  shlr, ts,  shlr, shlr}
-              };
+    table[(int) class_last][(int) BPSTAT_WHAT_LAST] =
+  {
+  /*                              old action */
+  /*       kc    ss    sn    sgl    slr   clr    clrs   sr    ts   shl   shlr
+   */
+/*no_effect */
+    {kc, ss, sn, sgl, slr, clr, clrs, sr, ts, shl, shlr},
+/*wp_silent */
+    {ss, ss, sn, ss, ss, ss, ss, sr, ts, shl, shlr},
+/*wp_noisy */
+    {sn, sn, sn, sn, sn, sn, sn, sr, ts, shl, shlr},
+/*bp_nostop */
+    {sgl, ss, sn, sgl, slr, clrs, clrs, sr, ts, shl, shlr},
+/*bp_silent */
+    {ss, ss, sn, ss, ss, ss, ss, sr, ts, shl, shlr},
+/*bp_noisy */
+    {sn, sn, sn, sn, sn, sn, sn, sr, ts, shl, shlr},
+/*long_jump */
+    {slr, ss, sn, slr, err, err, err, sr, ts, shl, shlr},
+/*long_resume */
+    {clr, ss, sn, clrs, err, err, err, sr, ts, shl, shlr},
+/*step_resume */
+    {sr, sr, sr, sr, sr, sr, sr, sr, ts, shl, shlr},
+/*through_sig */
+    {ts, ts, ts, ts, ts, ts, ts, ts, ts, shl, shlr},
+/*shlib */
+    {shl, shl, shl, shl, shl, shl, shl, shl, ts, shl, shlr},
+/*catch_shlib */
+    {shlr, shlr, shlr, shlr, shlr, shlr, shlr, shlr, ts, shlr, shlr}
+  };
 
 #undef kc
 #undef ss
@@ -2554,43 +2576,43 @@ bpstat_what (bs)
 	case bp_shlib_event:
 	  bs_class = shlib_event;
 	  break;
-        case bp_catch_load:
-        case bp_catch_unload:
-          /* Only if this catchpoint triggered should we cause the
-             step-out-of-dld behaviour.  Otherwise, we ignore this
-             catchpoint.  */
-          if (bs->stop)
-            bs_class = catch_shlib_event;
-          else
-            bs_class = no_effect;
-          break;
-        case bp_catch_fork:
-        case bp_catch_vfork:
+	case bp_catch_load:
+	case bp_catch_unload:
+	  /* Only if this catchpoint triggered should we cause the
+	     step-out-of-dld behaviour.  Otherwise, we ignore this
+	     catchpoint.  */
+	  if (bs->stop)
+	    bs_class = catch_shlib_event;
+	  else
+	    bs_class = no_effect;
+	  break;
+	case bp_catch_fork:
+	case bp_catch_vfork:
 	case bp_catch_exec:
-          if (bs->stop)
-            {
-              if (bs->print)
-                bs_class = bp_noisy;
-              else
-                bs_class = bp_silent;
-            }
-          else
-            /* There was a catchpoint, but we're not stopping.  This requires
-               no further action.  */
-            bs_class = no_effect;
-          break;
-        case bp_catch_catch:
-          if (!bs->stop || CURRENT_EXCEPTION_KIND != EX_EVENT_CATCH)
-            bs_class = bp_nostop;
-          else if (bs->stop)
-            bs_class = bs->print ? bp_noisy : bp_silent;
-          break;
-        case bp_catch_throw:
-          if (!bs->stop || CURRENT_EXCEPTION_KIND != EX_EVENT_THROW)
-            bs_class = bp_nostop;
-          else if (bs->stop)
-            bs_class = bs->print ? bp_noisy : bp_silent;
-          break;
+	  if (bs->stop)
+	    {
+	      if (bs->print)
+		bs_class = bp_noisy;
+	      else
+		bs_class = bp_silent;
+	    }
+	  else
+	    /* There was a catchpoint, but we're not stopping.  This requires
+	       no further action.  */
+	    bs_class = no_effect;
+	  break;
+	case bp_catch_catch:
+	  if (!bs->stop || CURRENT_EXCEPTION_KIND != EX_EVENT_CATCH)
+	    bs_class = bp_nostop;
+	  else if (bs->stop)
+	    bs_class = bs->print ? bp_noisy : bp_silent;
+	  break;
+	case bp_catch_throw:
+	  if (!bs->stop || CURRENT_EXCEPTION_KIND != EX_EVENT_THROW)
+	    bs_class = bp_nostop;
+	  else if (bs->stop)
+	    bs_class = bs->print ? bp_noisy : bp_silent;
+	  break;
 	case bp_call_dummy:
 	  /* Make sure the action is stop (silent or noisy), so infrun.c
 	     pops the dummy frame.  */
@@ -2598,7 +2620,7 @@ bpstat_what (bs)
 	  retval.call_dummy = 1;
 	  break;
 	}
-      current_action = table[(int)bs_class][(int)current_action];
+      current_action = table[(int) bs_class][(int) current_action];
     }
   retval.main_action = current_action;
   return retval;
@@ -2608,13 +2630,13 @@ bpstat_what (bs)
    without hardware support).  This isn't related to a specific bpstat,
    just to things like whether watchpoints are set.  */
 
-int 
+int
 bpstat_should_step ()
 {
   struct breakpoint *b;
   ALL_BREAKPOINTS (b)
     if (b->enable == enabled && b->type == bp_watchpoint)
-      return 1;
+    return 1;
   return 0;
 }
 
@@ -2625,49 +2647,49 @@ bpstat_have_active_hw_watchpoints ()
   struct breakpoint *b;
   ALL_BREAKPOINTS (b)
     if ((b->enable == enabled) &&
-        (b->inserted) &&
-        ((b->type == bp_hardware_watchpoint) ||
-         (b->type == bp_read_watchpoint) ||
-         (b->type == bp_access_watchpoint)))
-      return 1;
+	(b->inserted) &&
+	((b->type == bp_hardware_watchpoint) ||
+	 (b->type == bp_read_watchpoint) ||
+	 (b->type == bp_access_watchpoint)))
+    return 1;
   return 0;
 }
-
 
+
 /* Given a bpstat that records zero or more triggered eventpoints, this
    function returns another bpstat which contains only the catchpoints
    on that first list, if any. */
 void
 bpstat_get_triggered_catchpoints (ep_list, cp_list)
-  bpstat  ep_list;
-  bpstat *  cp_list;
-{
-  struct bpstats  root_bs[1];
-  bpstat  bs = root_bs;
-  struct breakpoint *  ep;
-  char *  dll_pathname;
- 
+     bpstat ep_list;
+     bpstat *cp_list;
+{
+  struct bpstats root_bs[1];
+  bpstat bs = root_bs;
+  struct breakpoint *ep;
+  char *dll_pathname;
+
   bpstat_clear (cp_list);
   root_bs->next = NULL;
- 
-  for (; ep_list != NULL; ep_list = ep_list->next )
+
+  for (; ep_list != NULL; ep_list = ep_list->next)
     {
       /* Is this eventpoint a catchpoint?  If not, ignore it. */
       ep = ep_list->breakpoint_at;
       if (ep == NULL)
-        break;
-      if ((ep->type != bp_catch_load) && 
-          (ep->type != bp_catch_unload) &&
-          (ep->type != bp_catch_catch) &&
-          (ep->type != bp_catch_throw))   /* pai: (temp) ADD fork/vfork here!!  */
-        continue;
- 
+	break;
+      if ((ep->type != bp_catch_load) &&
+	  (ep->type != bp_catch_unload) &&
+	  (ep->type != bp_catch_catch) &&
+	  (ep->type != bp_catch_throw))		/* pai: (temp) ADD fork/vfork here!!  */
+	continue;
+
       /* Yes; add it to the list. */
       bs = bpstat_alloc (ep, bs);
       *bs = *ep_list;
       bs->next = NULL;
       bs = root_bs->next;
- 
+
 #if defined(SOLIB_ADD)
       /* Also, for each triggered catchpoint, tag it with the name of
          the library that caused this trigger.  (We copy the name now,
@@ -2675,11 +2697,11 @@ bpstat_get_triggered_catchpoints (ep_list, cp_list)
          catchpoint triggers.  Clients who may wish to know the name
          later must get it from the catchpoint itself.) */
       if (ep->triggered_dll_pathname != NULL)
-        free (ep->triggered_dll_pathname);
+	free (ep->triggered_dll_pathname);
       if (ep->type == bp_catch_load)
-        dll_pathname = SOLIB_LOADED_LIBRARY_PATHNAME (inferior_pid);
+	dll_pathname = SOLIB_LOADED_LIBRARY_PATHNAME (inferior_pid);
       else
-        dll_pathname = SOLIB_UNLOADED_LIBRARY_PATHNAME (inferior_pid);
+	dll_pathname = SOLIB_UNLOADED_LIBRARY_PATHNAME (inferior_pid);
 #else
       dll_pathname = NULL;
 #endif
@@ -2691,7 +2713,7 @@ bpstat_get_triggered_catchpoints (ep_list, cp_list)
       else
 	ep->triggered_dll_pathname = NULL;
     }
- 
+
   *cp_list = bs;
 }
 
@@ -2699,10 +2721,12 @@ bpstat_get_triggered_catchpoints (ep_list, cp_list)
    If WATCHPOINTS is zero, process only breakpoints; if WATCHPOINTS
    is nonzero, process only watchpoints.  */
 
-typedef struct {
-  enum bptype  type;
-  char *  description;
-} ep_type_description_t;
+typedef struct
+{
+  enum bptype type;
+  char *description;
+}
+ep_type_description_t;
 
 static void
 breakpoint_1 (bnum, allflag)
@@ -2712,36 +2736,37 @@ breakpoint_1 (bnum, allflag)
   register struct breakpoint *b;
   register struct command_line *l;
   register struct symbol *sym;
-  CORE_ADDR last_addr = (CORE_ADDR)-1;
+  CORE_ADDR last_addr = (CORE_ADDR) - 1;
   int found_a_breakpoint = 0;
-  static ep_type_description_t  bptypes[] =
+  static ep_type_description_t bptypes[] =
   {
-    {bp_none,                "?deleted?"},
-    {bp_breakpoint,          "breakpoint"},
+    {bp_none, "?deleted?"},
+    {bp_breakpoint, "breakpoint"},
     {bp_hardware_breakpoint, "hw breakpoint"},
-    {bp_until,               "until"},
-    {bp_finish,              "finish"},
-    {bp_watchpoint,          "watchpoint"},
+    {bp_until, "until"},
+    {bp_finish, "finish"},
+    {bp_watchpoint, "watchpoint"},
     {bp_hardware_watchpoint, "hw watchpoint"},
-    {bp_read_watchpoint,     "read watchpoint"},
-    {bp_access_watchpoint,   "acc watchpoint"},
-    {bp_longjmp,             "longjmp"},
-    {bp_longjmp_resume,      "longjmp resume"},
-    {bp_step_resume,         "step resume"},
-    {bp_through_sigtramp,    "sigtramp"},
-    {bp_watchpoint_scope,    "watchpoint scope"},
-    {bp_call_dummy,          "call dummy"},
-    {bp_shlib_event,         "shlib events"},
-    {bp_catch_load,          "catch load"},
-    {bp_catch_unload,        "catch unload"},
-    {bp_catch_fork,          "catch fork"},
-    {bp_catch_vfork,         "catch vfork"},
-    {bp_catch_exec,          "catch exec"},
-    {bp_catch_catch,         "catch catch"},
-    {bp_catch_throw,         "catch throw"}
-   };
-
-  static char *bpdisps[] = {"del", "dstp", "dis", "keep"};
+    {bp_read_watchpoint, "read watchpoint"},
+    {bp_access_watchpoint, "acc watchpoint"},
+    {bp_longjmp, "longjmp"},
+    {bp_longjmp_resume, "longjmp resume"},
+    {bp_step_resume, "step resume"},
+    {bp_through_sigtramp, "sigtramp"},
+    {bp_watchpoint_scope, "watchpoint scope"},
+    {bp_call_dummy, "call dummy"},
+    {bp_shlib_event, "shlib events"},
+    {bp_catch_load, "catch load"},
+    {bp_catch_unload, "catch unload"},
+    {bp_catch_fork, "catch fork"},
+    {bp_catch_vfork, "catch vfork"},
+    {bp_catch_exec, "catch exec"},
+    {bp_catch_catch, "catch catch"},
+    {bp_catch_throw, "catch throw"}
+  };
+
+  static char *bpdisps[] =
+  {"del", "dstp", "dis", "keep"};
   static char bpenables[] = "nyn";
   char wrap_indent[80];
 
@@ -2749,236 +2774,236 @@ breakpoint_1 (bnum, allflag)
   ALL_BREAKPOINTS (b)
     if (bnum == -1
 	|| bnum == b->number)
-      {
+    {
 /*  We only print out user settable breakpoints unless the allflag is set. */
-	if (!allflag
-	    && b->type != bp_breakpoint
-            && b->type != bp_catch_load
-            && b->type != bp_catch_unload
-            && b->type != bp_catch_fork
-            && b->type != bp_catch_vfork
-            && b->type != bp_catch_exec
-	    && b->type != bp_catch_catch
-	    && b->type != bp_catch_throw
-	    && b->type != bp_hardware_breakpoint
-	    && b->type != bp_watchpoint
-	    && b->type != bp_read_watchpoint
-	    && b->type != bp_access_watchpoint
-	    && b->type != bp_hardware_watchpoint)
-	  continue;
+      if (!allflag
+	  && b->type != bp_breakpoint
+	  && b->type != bp_catch_load
+	  && b->type != bp_catch_unload
+	  && b->type != bp_catch_fork
+	  && b->type != bp_catch_vfork
+	  && b->type != bp_catch_exec
+	  && b->type != bp_catch_catch
+	  && b->type != bp_catch_throw
+	  && b->type != bp_hardware_breakpoint
+	  && b->type != bp_watchpoint
+	  && b->type != bp_read_watchpoint
+	  && b->type != bp_access_watchpoint
+	  && b->type != bp_hardware_watchpoint)
+	continue;
 
-	if (!found_a_breakpoint++)
-	  {
-            annotate_breakpoints_headers ();
-  
-            annotate_field (0);
-            printf_filtered ("Num ");
-            annotate_field (1);
-            printf_filtered ("Type           ");
-            annotate_field (2);
-            printf_filtered ("Disp ");
-            annotate_field (3);
-            printf_filtered ("Enb ");
-            if (addressprint)
-              {
-                annotate_field (4);
-                printf_filtered ("Address    ");
-              }
-            annotate_field (5);
-            printf_filtered ("What\n");
-  
-            annotate_breakpoints_table ();
-          }
-  
-        annotate_record ();
-        annotate_field (0);
-        printf_filtered ("%-3d ", b->number);
-        annotate_field (1);
-        if ((int)b->type > (sizeof(bptypes)/sizeof(bptypes[0])))
-          error ("bptypes table does not describe type #%d.", (int)b->type);
-        if ((int)b->type != bptypes[(int)b->type].type)
-          error ("bptypes table does not describe type #%d?", (int)b->type);
-        printf_filtered ("%-14s ", bptypes[(int)b->type].description);
-        annotate_field (2);
-        printf_filtered ("%-4s ", bpdisps[(int)b->disposition]);
-        annotate_field (3);
-	printf_filtered ("%-3c ", bpenables[(int)b->enable]);
-
-	strcpy (wrap_indent, "                           ");
-	if (addressprint)
-	  strcat (wrap_indent, "           ");
-	switch (b->type)
-	  {
-	  case bp_watchpoint:
-	  case bp_hardware_watchpoint:
-	  case bp_read_watchpoint:
-	  case bp_access_watchpoint:
-	    /* Field 4, the address, is omitted (which makes the columns
-	       not line up too nicely with the headers, but the effect
-	       is relatively readable).  */
-	    annotate_field (5);
-	    print_expression (b->exp, gdb_stdout);
-	    break;
- 
-          case bp_catch_load:
-          case bp_catch_unload:
-            /* Field 4, the address, is omitted (which makes the columns
-               not line up too nicely with the headers, but the effect
-               is relatively readable).  */
-            annotate_field (5);
-            if (b->dll_pathname == NULL)
-              printf_filtered ("<any library> ");
-            else
-              printf_filtered ("library \"%s\" ", b->dll_pathname);
-            break;
-
-          case bp_catch_fork:
-          case bp_catch_vfork:
-	    /* Field 4, the address, is omitted (which makes the columns
-	       not line up too nicely with the headers, but the effect
-	       is relatively readable).  */
-	    annotate_field (5);
-	    if (b->forked_inferior_pid != 0)
-	      printf_filtered ("process %d ", b->forked_inferior_pid);
-            break;
-
-          case bp_catch_exec:
-	    /* Field 4, the address, is omitted (which makes the columns
-	       not line up too nicely with the headers, but the effect
-	       is relatively readable).  */
-	    annotate_field (5);
-	    if (b->exec_pathname != NULL)
-	      printf_filtered ("program \"%s\" ", b->exec_pathname);
-            break;
-          case bp_catch_catch:
-	    /* Field 4, the address, is omitted (which makes the columns
-	       not line up too nicely with the headers, but the effect
-	       is relatively readable).  */
-	    annotate_field (5);
-            printf_filtered ("exception catch ");
-            break;
-          case bp_catch_throw:
-	    /* Field 4, the address, is omitted (which makes the columns
-	       not line up too nicely with the headers, but the effect
-	       is relatively readable).  */
-	    annotate_field (5);
-            printf_filtered ("exception throw ");
-            break;
-
-	  case bp_breakpoint:
-	  case bp_hardware_breakpoint:
-	  case bp_until:
-	  case bp_finish:
-	  case bp_longjmp:
-	  case bp_longjmp_resume:
-	  case bp_step_resume:
-	  case bp_through_sigtramp:
-	  case bp_watchpoint_scope:
-	  case bp_call_dummy:
-	  case bp_shlib_event:
-	    if (addressprint)
-	      {
-	        annotate_field (4);
-		/* FIXME-32x64: need a print_address_numeric with
-                   field width */
-		printf_filtered
-		  ("%s ",
-		   local_hex_string_custom
-		   ((unsigned long) b->address, "08l"));
-	      }
+      if (!found_a_breakpoint++)
+	{
+	  annotate_breakpoints_headers ();
+
+	  annotate_field (0);
+	  printf_filtered ("Num ");
+	  annotate_field (1);
+	  printf_filtered ("Type           ");
+	  annotate_field (2);
+	  printf_filtered ("Disp ");
+	  annotate_field (3);
+	  printf_filtered ("Enb ");
+	  if (addressprint)
+	    {
+	      annotate_field (4);
+	      printf_filtered ("Address    ");
+	    }
+	  annotate_field (5);
+	  printf_filtered ("What\n");
 
-	    annotate_field (5);
+	  annotate_breakpoints_table ();
+	}
 
-	    last_addr = b->address;
-	    if (b->source_file)
-	      {
-		sym = find_pc_sect_function (b->address, b->section);
-		if (sym)
-		  {
-		    fputs_filtered ("in ", gdb_stdout);
-		    fputs_filtered (SYMBOL_SOURCE_NAME (sym), gdb_stdout);
-		    wrap_here (wrap_indent);
-		    fputs_filtered (" at ", gdb_stdout);
-		  }
-		fputs_filtered (b->source_file, gdb_stdout);
-		printf_filtered (":%d", b->line_number);
-	      }
-	    else
-	      print_address_symbolic (b->address, gdb_stdout, demangle, " ");
-	    break;
-	  }
+      annotate_record ();
+      annotate_field (0);
+      printf_filtered ("%-3d ", b->number);
+      annotate_field (1);
+      if ((int) b->type > (sizeof (bptypes) / sizeof (bptypes[0])))
+	error ("bptypes table does not describe type #%d.", (int) b->type);
+      if ((int) b->type != bptypes[(int) b->type].type)
+	error ("bptypes table does not describe type #%d?", (int) b->type);
+      printf_filtered ("%-14s ", bptypes[(int) b->type].description);
+      annotate_field (2);
+      printf_filtered ("%-4s ", bpdisps[(int) b->disposition]);
+      annotate_field (3);
+      printf_filtered ("%-3c ", bpenables[(int) b->enable]);
+
+      strcpy (wrap_indent, "                           ");
+      if (addressprint)
+	strcat (wrap_indent, "           ");
+      switch (b->type)
+	{
+	case bp_watchpoint:
+	case bp_hardware_watchpoint:
+	case bp_read_watchpoint:
+	case bp_access_watchpoint:
+	  /* Field 4, the address, is omitted (which makes the columns
+	     not line up too nicely with the headers, but the effect
+	     is relatively readable).  */
+	  annotate_field (5);
+	  print_expression (b->exp, gdb_stdout);
+	  break;
 
-        if (b->thread != -1)
-            printf_filtered (" thread %d", b->thread );
+	case bp_catch_load:
+	case bp_catch_unload:
+	  /* Field 4, the address, is omitted (which makes the columns
+	     not line up too nicely with the headers, but the effect
+	     is relatively readable).  */
+	  annotate_field (5);
+	  if (b->dll_pathname == NULL)
+	    printf_filtered ("<any library> ");
+	  else
+	    printf_filtered ("library \"%s\" ", b->dll_pathname);
+	  break;
 
-	printf_filtered ("\n");
+	case bp_catch_fork:
+	case bp_catch_vfork:
+	  /* Field 4, the address, is omitted (which makes the columns
+	     not line up too nicely with the headers, but the effect
+	     is relatively readable).  */
+	  annotate_field (5);
+	  if (b->forked_inferior_pid != 0)
+	    printf_filtered ("process %d ", b->forked_inferior_pid);
+	  break;
 
-	if (b->frame)
-	  {
-            annotate_field (6);
+	case bp_catch_exec:
+	  /* Field 4, the address, is omitted (which makes the columns
+	     not line up too nicely with the headers, but the effect
+	     is relatively readable).  */
+	  annotate_field (5);
+	  if (b->exec_pathname != NULL)
+	    printf_filtered ("program \"%s\" ", b->exec_pathname);
+	  break;
+	case bp_catch_catch:
+	  /* Field 4, the address, is omitted (which makes the columns
+	     not line up too nicely with the headers, but the effect
+	     is relatively readable).  */
+	  annotate_field (5);
+	  printf_filtered ("exception catch ");
+	  break;
+	case bp_catch_throw:
+	  /* Field 4, the address, is omitted (which makes the columns
+	     not line up too nicely with the headers, but the effect
+	     is relatively readable).  */
+	  annotate_field (5);
+	  printf_filtered ("exception throw ");
+	  break;
 
-	    printf_filtered ("\tstop only in stack frame at ");
-	    print_address_numeric (b->frame, 1, gdb_stdout);
-	    printf_filtered ("\n");
-	  }
+	case bp_breakpoint:
+	case bp_hardware_breakpoint:
+	case bp_until:
+	case bp_finish:
+	case bp_longjmp:
+	case bp_longjmp_resume:
+	case bp_step_resume:
+	case bp_through_sigtramp:
+	case bp_watchpoint_scope:
+	case bp_call_dummy:
+	case bp_shlib_event:
+	  if (addressprint)
+	    {
+	      annotate_field (4);
+	      /* FIXME-32x64: need a print_address_numeric with
+	         field width */
+	      printf_filtered
+		("%s ",
+		 local_hex_string_custom
+		 ((unsigned long) b->address, "08l"));
+	    }
 
-	if (b->cond)
-	  {
-            annotate_field (7);
+	  annotate_field (5);
 
-	    printf_filtered ("\tstop only if ");
-	    print_expression (b->cond, gdb_stdout);
-	    printf_filtered ("\n");
-	  }
+	  last_addr = b->address;
+	  if (b->source_file)
+	    {
+	      sym = find_pc_sect_function (b->address, b->section);
+	      if (sym)
+		{
+		  fputs_filtered ("in ", gdb_stdout);
+		  fputs_filtered (SYMBOL_SOURCE_NAME (sym), gdb_stdout);
+		  wrap_here (wrap_indent);
+		  fputs_filtered (" at ", gdb_stdout);
+		}
+	      fputs_filtered (b->source_file, gdb_stdout);
+	      printf_filtered (":%d", b->line_number);
+	    }
+	  else
+	    print_address_symbolic (b->address, gdb_stdout, demangle, " ");
+	  break;
+	}
 
-	if (b->thread != -1)
-	  {
-	    /* FIXME should make an annotation for this */
-	    printf_filtered ("\tstop only in thread %d\n", b->thread);
-	  }
+      if (b->thread != -1)
+	printf_filtered (" thread %d", b->thread);
 
-        if (show_breakpoint_hit_counts && b->hit_count)
-	  {
-	    /* FIXME should make an annotation for this */
-            if (ep_is_catchpoint (b))
-              printf_filtered ("\tcatchpoint");
-            else
-              printf_filtered ("\tbreakpoint");
-            printf_filtered (" already hit %d time%s\n",
-                             b->hit_count, (b->hit_count == 1 ? "" : "s"));
-	  }
+      printf_filtered ("\n");
 
-	if (b->ignore_count)
-	  {
-            annotate_field (8);
+      if (b->frame)
+	{
+	  annotate_field (6);
 
-	    printf_filtered ("\tignore next %d hits\n", b->ignore_count);
-	  }
+	  printf_filtered ("\tstop only in stack frame at ");
+	  print_address_numeric (b->frame, 1, gdb_stdout);
+	  printf_filtered ("\n");
+	}
 
-	if ((l = b->commands))
-	  {
-            annotate_field (9);
+      if (b->cond)
+	{
+	  annotate_field (7);
 
-	    while (l)
-	      {
-		print_command_line (l, 4, gdb_stdout);
-		l = l->next;
-	      }
-	  }
-      }
+	  printf_filtered ("\tstop only if ");
+	  print_expression (b->cond, gdb_stdout);
+	  printf_filtered ("\n");
+	}
+
+      if (b->thread != -1)
+	{
+	  /* FIXME should make an annotation for this */
+	  printf_filtered ("\tstop only in thread %d\n", b->thread);
+	}
+
+      if (show_breakpoint_hit_counts && b->hit_count)
+	{
+	  /* FIXME should make an annotation for this */
+	  if (ep_is_catchpoint (b))
+	    printf_filtered ("\tcatchpoint");
+	  else
+	    printf_filtered ("\tbreakpoint");
+	  printf_filtered (" already hit %d time%s\n",
+			   b->hit_count, (b->hit_count == 1 ? "" : "s"));
+	}
+
+      if (b->ignore_count)
+	{
+	  annotate_field (8);
+
+	  printf_filtered ("\tignore next %d hits\n", b->ignore_count);
+	}
+
+      if ((l = b->commands))
+	{
+	  annotate_field (9);
+
+	  while (l)
+	    {
+	      print_command_line (l, 4, gdb_stdout);
+	      l = l->next;
+	    }
+	}
+    }
 
   if (!found_a_breakpoint)
     {
       if (bnum == -1)
-        printf_filtered ("No breakpoints or watchpoints.\n");
+	printf_filtered ("No breakpoints or watchpoints.\n");
       else
-        printf_filtered ("No breakpoint or watchpoint number %d.\n", bnum);
+	printf_filtered ("No breakpoint or watchpoint number %d.\n", bnum);
     }
   else
     /* Compare against (CORE_ADDR)-1 in case some compiler decides
        that a comparison of an unsigned with -1 is always false.  */
-    if (last_addr != (CORE_ADDR)-1)
-      set_next_address (last_addr);
+  if (last_addr != (CORE_ADDR) - 1)
+    set_next_address (last_addr);
 
   annotate_breakpoints_table_end ();
 }
@@ -3023,25 +3048,25 @@ describe_other_breakpoints (pc, section)
 
   ALL_BREAKPOINTS (b)
     if (b->address == pc)
-      if (overlay_debugging == 0 ||
-	  b->section == section)
-	others++;
+    if (overlay_debugging == 0 ||
+	b->section == section)
+      others++;
   if (others > 0)
     {
       printf_filtered ("Note: breakpoint%s ", (others > 1) ? "s" : "");
       ALL_BREAKPOINTS (b)
 	if (b->address == pc)
-	  if (overlay_debugging == 0 ||
-	      b->section == section)
-	    {
-	      others--;
-	      printf_filtered
-		("%d%s%s ",
-		 b->number,
-		 ((b->enable == disabled || b->enable == shlib_disabled || b->enable == call_disabled)
-		  ? " (disabled)" : ""),
-		 (others > 1) ? "," : ((others == 1) ? " and" : ""));
-	    }
+	if (overlay_debugging == 0 ||
+	    b->section == section)
+	  {
+	    others--;
+	    printf_filtered
+	      ("%d%s%s ",
+	       b->number,
+	       ((b->enable == disabled || b->enable == shlib_disabled || b->enable == call_disabled)
+		? " (disabled)" : ""),
+	       (others > 1) ? "," : ((others == 1) ? " and" : ""));
+	  }
       printf_filtered ("also set at pc ");
       print_address_numeric (pc, 1, gdb_stdout);
       printf_filtered (".\n");
@@ -3085,10 +3110,10 @@ check_duplicates (address, section)
 	&& b->enable != call_disabled
 	&& b->address == address
 	&& (overlay_debugging == 0 || b->section == section))
-      {
-	count++;
-	b->duplicate = count > 1;
-      }
+    {
+      count++;
+      b->duplicate = count > 1;
+    }
 }
 
 /* Low level routine to set a breakpoint.
@@ -3160,12 +3185,12 @@ create_longjmp_breakpoint (func_name)
   struct symtab_and_line sal;
   struct breakpoint *b;
 
-  INIT_SAL (&sal);	/* initialize to zeroes */
+  INIT_SAL (&sal);		/* initialize to zeroes */
   if (func_name != NULL)
     {
       struct minimal_symbol *m;
 
-      m = lookup_minimal_symbol_text (func_name, NULL, (struct objfile *)NULL);
+      m = lookup_minimal_symbol_text (func_name, NULL, (struct objfile *) NULL);
       if (m)
 	sal.pc = SYMBOL_VALUE_ADDRESS (m);
       else
@@ -3173,48 +3198,49 @@ create_longjmp_breakpoint (func_name)
     }
   sal.section = find_pc_overlay (sal.pc);
   b = set_raw_breakpoint (sal);
-  if (!b) return;
+  if (!b)
+    return;
 
   b->type = func_name != NULL ? bp_longjmp : bp_longjmp_resume;
   b->disposition = donttouch;
   b->enable = disabled;
   b->silent = 1;
   if (func_name)
-    b->addr_string = strsave(func_name);
+    b->addr_string = strsave (func_name);
   b->number = internal_breakpoint_number--;
 }
 
-#endif	/* #ifdef GET_LONGJMP_TARGET */
+#endif /* #ifdef GET_LONGJMP_TARGET */
 
 /* Call this routine when stepping and nexting to enable a breakpoint if we do
    a longjmp().  When we hit that breakpoint, call
    set_longjmp_resume_breakpoint() to figure out where we are going. */
 
 void
-enable_longjmp_breakpoint()
+enable_longjmp_breakpoint ()
 {
   register struct breakpoint *b;
 
   ALL_BREAKPOINTS (b)
     if (b->type == bp_longjmp)
-      {
-	b->enable = enabled;
-	check_duplicates (b->address, b->section);
-      }
+    {
+      b->enable = enabled;
+      check_duplicates (b->address, b->section);
+    }
 }
 
 void
-disable_longjmp_breakpoint()
+disable_longjmp_breakpoint ()
 {
   register struct breakpoint *b;
 
   ALL_BREAKPOINTS (b)
-    if (   b->type == bp_longjmp
+    if (b->type == bp_longjmp
 	|| b->type == bp_longjmp_resume)
-      {
-	b->enable = disabled;
-	check_duplicates (b->address, b->section);
-      }
+    {
+      b->enable = disabled;
+      check_duplicates (b->address, b->section);
+    }
 }
 
 #ifdef SOLIB_ADD
@@ -3225,7 +3251,7 @@ remove_solib_event_breakpoints ()
 
   ALL_BREAKPOINTS_SAFE (b, temp)
     if (b->type == bp_shlib_event)
-      delete_breakpoint (b);
+    delete_breakpoint (b);
 }
 
 void
@@ -3235,7 +3261,7 @@ create_solib_event_breakpoint (address)
   struct breakpoint *b;
   struct symtab_and_line sal;
 
-  INIT_SAL (&sal);	/* initialize to zeroes */
+  INIT_SAL (&sal);		/* initialize to zeroes */
   sal.pc = address;
   sal.section = find_pc_overlay (sal.pc);
   b = set_raw_breakpoint (sal);
@@ -3248,34 +3274,34 @@ void
 disable_breakpoints_in_shlibs (silent)
      int silent;
 {
-  struct breakpoint *  b;
-  int  disabled_shlib_breaks = 0;
+  struct breakpoint *b;
+  int disabled_shlib_breaks = 0;
 
   /* See also: insert_breakpoints, under DISABLE_UNSETTABLE_BREAK. */
   ALL_BREAKPOINTS (b)
-    {
+  {
 #if defined (PC_SOLIB)
-      if (((b->type == bp_breakpoint) ||
-           (b->type == bp_hardware_breakpoint)) &&
-          (b->enable != shlib_disabled) &&
-          (b->enable != call_disabled) &&
-          ! b->duplicate &&
-          PC_SOLIB (b->address))
-        {
-          b->enable = shlib_disabled;
-	  if (!silent)
-	    {
-	      if (!disabled_shlib_breaks)
-		{
-		  target_terminal_ours_for_output ();
-		  printf_filtered ("Temporarily disabling shared library breakpoints:\n");
-		}
-	      disabled_shlib_breaks = 1;
-	      printf_filtered ("%d ", b->number);
-	    }
-        }
+    if (((b->type == bp_breakpoint) ||
+	 (b->type == bp_hardware_breakpoint)) &&
+	(b->enable != shlib_disabled) &&
+	(b->enable != call_disabled) &&
+	!b->duplicate &&
+	PC_SOLIB (b->address))
+      {
+	b->enable = shlib_disabled;
+	if (!silent)
+	  {
+	    if (!disabled_shlib_breaks)
+	      {
+		target_terminal_ours_for_output ();
+		printf_filtered ("Temporarily disabling shared library breakpoints:\n");
+	      }
+	    disabled_shlib_breaks = 1;
+	    printf_filtered ("%d ", b->number);
+	  }
+      }
 #endif
-    }
+  }
   if (disabled_shlib_breaks && !silent)
     printf_filtered ("\n");
 }
@@ -3288,14 +3314,14 @@ re_enable_breakpoints_in_shlibs ()
 
   ALL_BREAKPOINTS (b)
     if (b->enable == shlib_disabled)
-      {
-	char buf[1];
+    {
+      char buf[1];
 
-	/* Do not reenable the breakpoint if the shared library
-	   is still not mapped in.  */
-	if (target_read_memory (b->address, buf, 1) == 0)
-	  b->enable = enabled;
-      }
+      /* Do not reenable the breakpoint if the shared library
+         is still not mapped in.  */
+      if (target_read_memory (b->address, buf, 1) == 0)
+	b->enable = enabled;
+    }
 }
 
 #endif
@@ -3308,21 +3334,21 @@ create_solib_load_unload_event_breakpoint (hookname, tempflag, dll_pathname, con
      char *cond_string;
      enum bptype bp_kind;
 {
-  struct breakpoint *  b;
+  struct breakpoint *b;
   struct symtabs_and_lines sals;
-  struct symtab_and_line  sal;
-  struct cleanup *  old_chain;
-  struct cleanup *  canonical_strings_chain = NULL;
-  int  i;
-  char *  addr_start = hookname;
-  char *  addr_end = NULL;
-  char **  canonical = (char **) NULL;
-  int  thread = -1;  /* All threads. */
- 
+  struct symtab_and_line sal;
+  struct cleanup *old_chain;
+  struct cleanup *canonical_strings_chain = NULL;
+  int i;
+  char *addr_start = hookname;
+  char *addr_end = NULL;
+  char **canonical = (char **) NULL;
+  int thread = -1;		/* All threads. */
+
   /* Set a breakpoint on the specified hook. */
   sals = decode_line_1 (&hookname, 1, (struct symtab *) NULL, 0, &canonical);
   addr_end = hookname;
- 
+
   if (sals.nelts == 0)
     {
       warning ("Unable to set a breakpoint on dynamic linker callback.");
@@ -3340,35 +3366,35 @@ create_solib_load_unload_event_breakpoint (hookname, tempflag, dll_pathname, con
   /* Make sure that all storage allocated in decode_line_1 gets freed in case
      the following errors out.  */
   old_chain = make_cleanup (free, sals.sals);
-  if (canonical != (char **)NULL)
+  if (canonical != (char **) NULL)
     {
       make_cleanup (free, canonical);
       canonical_strings_chain = make_cleanup (null_cleanup, 0);
       if (canonical[0] != NULL)
-        make_cleanup (free, canonical[0]);
+	make_cleanup (free, canonical[0]);
     }
- 
+
   resolve_sal_pc (&sals.sals[0]);
- 
+
   /* Remove the canonical strings from the cleanup, they are needed below.  */
-  if (canonical != (char **)NULL)
+  if (canonical != (char **) NULL)
     discard_cleanups (canonical_strings_chain);
- 
+
   b = set_raw_breakpoint (sals.sals[0]);
   set_breakpoint_count (breakpoint_count + 1);
   b->number = breakpoint_count;
   b->cond = NULL;
   b->cond_string = (cond_string == NULL) ? NULL : savestring (cond_string, strlen (cond_string));
   b->thread = thread;
- 
-  if (canonical != (char **)NULL && canonical[0] != NULL)
+
+  if (canonical != (char **) NULL && canonical[0] != NULL)
     b->addr_string = canonical[0];
   else if (addr_start)
     b->addr_string = savestring (addr_start, addr_end - addr_start);
- 
+
   b->enable = enabled;
   b->disposition = tempflag ? del : donttouch;
- 
+
   if (dll_pathname == NULL)
     b->dll_pathname = NULL;
   else
@@ -3377,37 +3403,37 @@ create_solib_load_unload_event_breakpoint (hookname, tempflag, dll_pathname, con
       strcpy (b->dll_pathname, dll_pathname);
     }
   b->type = bp_kind;
- 
+
   mention (b);
   do_cleanups (old_chain);
 }
 
 void
 create_solib_load_event_breakpoint (hookname, tempflag, dll_pathname, cond_string)
-  char *  hookname;
-  int  tempflag;
-  char *  dll_pathname;
-  char *  cond_string;
+     char *hookname;
+     int tempflag;
+     char *dll_pathname;
+     char *cond_string;
 {
   create_solib_load_unload_event_breakpoint (hookname,
-                                             tempflag,
-                                             dll_pathname,
-                                             cond_string,
-                                             bp_catch_load);
+					     tempflag,
+					     dll_pathname,
+					     cond_string,
+					     bp_catch_load);
 }
 
 void
 create_solib_unload_event_breakpoint (hookname, tempflag, dll_pathname, cond_string)
-  char *  hookname;
-  int  tempflag;
-  char *  dll_pathname;
-  char *  cond_string;
+     char *hookname;
+     int tempflag;
+     char *dll_pathname;
+     char *cond_string;
 {
   create_solib_load_unload_event_breakpoint (hookname,
-                                             tempflag,
-                                             dll_pathname,
-                                             cond_string,
-                                             bp_catch_unload);
+					     tempflag,
+					     dll_pathname,
+					     cond_string,
+					     bp_catch_unload);
 }
 
 static void
@@ -3416,15 +3442,15 @@ create_fork_vfork_event_catchpoint (tempflag, cond_string, bp_kind)
      char *cond_string;
      enum bptype bp_kind;
 {
-  struct symtab_and_line  sal;
-  struct breakpoint *  b;
-  int  thread = -1;  /* All threads. */
- 
-  INIT_SAL(&sal);
+  struct symtab_and_line sal;
+  struct breakpoint *b;
+  int thread = -1;		/* All threads. */
+
+  INIT_SAL (&sal);
   sal.pc = 0;
   sal.symtab = NULL;
   sal.line = 0;
- 
+
   b = set_raw_breakpoint (sal);
   set_breakpoint_count (breakpoint_count + 1);
   b->number = breakpoint_count;
@@ -3435,38 +3461,38 @@ create_fork_vfork_event_catchpoint (tempflag, cond_string, bp_kind)
   b->enable = enabled;
   b->disposition = tempflag ? del : donttouch;
   b->forked_inferior_pid = 0;
- 
+
   b->type = bp_kind;
- 
+
   mention (b);
 }
 
 void
 create_fork_event_catchpoint (tempflag, cond_string)
-  int  tempflag;
-  char *  cond_string;
+     int tempflag;
+     char *cond_string;
 {
   create_fork_vfork_event_catchpoint (tempflag, cond_string, bp_catch_fork);
 }
- 
+
 void
 create_vfork_event_catchpoint (tempflag, cond_string)
-  int  tempflag;
-  char *  cond_string;
+     int tempflag;
+     char *cond_string;
 {
   create_fork_vfork_event_catchpoint (tempflag, cond_string, bp_catch_vfork);
 }
 
 void
 create_exec_event_catchpoint (tempflag, cond_string)
-  int  tempflag;
-  char *  cond_string;
+     int tempflag;
+     char *cond_string;
 {
-  struct symtab_and_line  sal;
-  struct breakpoint *  b;
-  int  thread = -1;  /* All threads. */
+  struct symtab_and_line sal;
+  struct breakpoint *b;
+  int thread = -1;		/* All threads. */
 
-  INIT_SAL(&sal);
+  INIT_SAL (&sal);
   sal.pc = 0;
   sal.symtab = NULL;
   sal.line = 0;
@@ -3487,41 +3513,42 @@ create_exec_event_catchpoint (tempflag, cond_string)
 }
 
 static int
-hw_breakpoint_used_count()
+hw_breakpoint_used_count ()
 {
   register struct breakpoint *b;
   int i = 0;
 
   ALL_BREAKPOINTS (b)
-    {
-      if (b->type == bp_hardware_breakpoint && b->enable == enabled)
-	i++;
-    }
+  {
+    if (b->type == bp_hardware_breakpoint && b->enable == enabled)
+      i++;
+  }
 
   return i;
 }
 
 static int
-hw_watchpoint_used_count(type, other_type_used)
-    enum bptype type;
-    int *other_type_used;
+hw_watchpoint_used_count (type, other_type_used)
+     enum bptype type;
+     int *other_type_used;
 {
   register struct breakpoint *b;
   int i = 0;
 
   *other_type_used = 0;
   ALL_BREAKPOINTS (b)
-    {
-      if (b->enable == enabled)
-	{
-          if (b->type == type) i++;
-          else if ((b->type == bp_hardware_watchpoint ||
-	       b->type == bp_read_watchpoint ||
-	       b->type == bp_access_watchpoint)
-	       && b->enable == enabled)
-	    *other_type_used = 1;
-        }
-    }
+  {
+    if (b->enable == enabled)
+      {
+	if (b->type == type)
+	  i++;
+	else if ((b->type == bp_hardware_watchpoint ||
+		  b->type == bp_read_watchpoint ||
+		  b->type == bp_access_watchpoint)
+		 && b->enable == enabled)
+	  *other_type_used = 1;
+      }
+  }
   return i;
 }
 
@@ -3532,7 +3559,7 @@ hw_watchpoint_used_count(type, other_type_used)
    deleted automatically... */
 
 void
-set_longjmp_resume_breakpoint(pc, frame)
+set_longjmp_resume_breakpoint (pc, frame)
      CORE_ADDR pc;
      struct frame_info *frame;
 {
@@ -3540,56 +3567,56 @@ set_longjmp_resume_breakpoint(pc, frame)
 
   ALL_BREAKPOINTS (b)
     if (b->type == bp_longjmp_resume)
-      {
-	b->address = pc;
-	b->enable = enabled;
-	if (frame != NULL)
-	  b->frame = frame->frame;
-	else
-	  b->frame = 0;
-	check_duplicates (b->address, b->section);
-	return;
-      }
+    {
+      b->address = pc;
+      b->enable = enabled;
+      if (frame != NULL)
+	b->frame = frame->frame;
+      else
+	b->frame = 0;
+      check_duplicates (b->address, b->section);
+      return;
+    }
 }
 
 void
 disable_watchpoints_before_interactive_call_start ()
 {
-  struct breakpoint *  b;
+  struct breakpoint *b;
 
   ALL_BREAKPOINTS (b)
-    {
-      if (((b->type == bp_watchpoint)
-           || (b->type == bp_hardware_watchpoint)
-           || (b->type == bp_read_watchpoint)
-           || (b->type == bp_access_watchpoint)
-           || ep_is_exception_catchpoint (b))
-          && (b->enable == enabled))
-        {
-          b->enable = call_disabled;
-          check_duplicates (b->address, b->section);
-        }
-    }
+  {
+    if (((b->type == bp_watchpoint)
+	 || (b->type == bp_hardware_watchpoint)
+	 || (b->type == bp_read_watchpoint)
+	 || (b->type == bp_access_watchpoint)
+	 || ep_is_exception_catchpoint (b))
+	&& (b->enable == enabled))
+      {
+	b->enable = call_disabled;
+	check_duplicates (b->address, b->section);
+      }
+  }
 }
 
 void
 enable_watchpoints_after_interactive_call_stop ()
 {
-  struct breakpoint *  b;
+  struct breakpoint *b;
 
   ALL_BREAKPOINTS (b)
-    {
-      if (((b->type == bp_watchpoint)
-           || (b->type == bp_hardware_watchpoint)
-           || (b->type == bp_read_watchpoint)
-           || (b->type == bp_access_watchpoint)
-           || ep_is_exception_catchpoint (b))
-          && (b->enable == call_disabled))
-        {
-          b->enable = enabled;
-          check_duplicates (b->address, b->section);
-        }
-    }
+  {
+    if (((b->type == bp_watchpoint)
+	 || (b->type == bp_hardware_watchpoint)
+	 || (b->type == bp_read_watchpoint)
+	 || (b->type == bp_access_watchpoint)
+	 || ep_is_exception_catchpoint (b))
+	&& (b->enable == call_disabled))
+      {
+	b->enable = enabled;
+	check_duplicates (b->address, b->section);
+      }
+  }
 }
 
 
@@ -3618,8 +3645,8 @@ set_momentary_breakpoint (sal, frame, type)
 
   return b;
 }
-
 
+
 /* Tell the user we have just set a breakpoint B.  */
 
 static void
@@ -3654,7 +3681,7 @@ mention (b)
       print_expression (b->exp, gdb_stdout);
       break;
     case bp_access_watchpoint:
-      printf_filtered ("Hardware access (read/write) watchpoint %d: ",b->number);
+      printf_filtered ("Hardware access (read/write) watchpoint %d: ", b->number);
       print_expression (b->exp, gdb_stdout);
       break;
     case bp_breakpoint:
@@ -3668,25 +3695,25 @@ mention (b)
     case bp_catch_load:
     case bp_catch_unload:
       printf_filtered ("Catchpoint %d (%s %s)",
-                       b->number,
-                       (b->type == bp_catch_load) ? "load" : "unload",
-                       (b->dll_pathname != NULL) ? b->dll_pathname : "<any library>");
+		       b->number,
+		       (b->type == bp_catch_load) ? "load" : "unload",
+	     (b->dll_pathname != NULL) ? b->dll_pathname : "<any library>");
       break;
     case bp_catch_fork:
     case bp_catch_vfork:
       printf_filtered ("Catchpoint %d (%s)",
-                       b->number,
-                       (b->type == bp_catch_fork) ? "fork" : "vfork");
+		       b->number,
+		       (b->type == bp_catch_fork) ? "fork" : "vfork");
       break;
     case bp_catch_exec:
       printf_filtered ("Catchpoint %d (exec)",
-                       b->number);
+		       b->number);
       break;
     case bp_catch_catch:
     case bp_catch_throw:
       printf_filtered ("Catchpoint %d (%s)",
-                       b->number,
-                       (b->type == bp_catch_catch) ? "catch" : "throw");
+		       b->number,
+		       (b->type == bp_catch_catch) ? "catch" : "throw");
       break;
 
     case bp_until:
@@ -3710,16 +3737,16 @@ mention (b)
       if (b->source_file)
 	printf_filtered (": file %s, line %d.",
 			 b->source_file, b->line_number);
-      TUIDO(((TuiOpaqueFuncPtr)tui_vAllSetHasBreakAt, b, 1));
-      TUIDO(((TuiOpaqueFuncPtr)tuiUpdateAllExecInfos));
+      TUIDO (((TuiOpaqueFuncPtr) tui_vAllSetHasBreakAt, b, 1));
+      TUIDO (((TuiOpaqueFuncPtr) tuiUpdateAllExecInfos));
     }
   printf_filtered ("\n");
 }
-
 
+
 /* Set a breakpoint according to ARG (function, linenum or *address)
    flag: first bit  : 0 non-temporary, 1 temporary.
-	 second bit : 0 normal breakpoint, 1 hardware breakpoint. */
+   second bit : 0 normal breakpoint, 1 hardware breakpoint. */
 
 static void
 break_command_1 (arg, flag, from_tty)
@@ -3741,7 +3768,7 @@ break_command_1 (arg, flag, from_tty)
   char *addr_end = NULL;
   struct cleanup *old_chain;
   struct cleanup *canonical_strings_chain = NULL;
-  char **canonical = (char **)NULL;
+  char **canonical = (char **) NULL;
   int i;
   int thread;
 
@@ -3751,21 +3778,21 @@ break_command_1 (arg, flag, from_tty)
   sals.sals = NULL;
   sals.nelts = 0;
 
-  INIT_SAL (&sal);	/* initialize to zeroes */
+  INIT_SAL (&sal);		/* initialize to zeroes */
 
   /* If no arg given, or if first arg is 'if ', use the default breakpoint. */
 
-  if (!arg || (arg[0] == 'i' && arg[1] == 'f' 
+  if (!arg || (arg[0] == 'i' && arg[1] == 'f'
 	       && (arg[2] == ' ' || arg[2] == '\t')))
     {
       if (default_breakpoint_valid)
 	{
-	  sals.sals = (struct symtab_and_line *) 
+	  sals.sals = (struct symtab_and_line *)
 	    xmalloc (sizeof (struct symtab_and_line));
 	  sal.pc = default_breakpoint_address;
 	  sal.line = default_breakpoint_line;
 	  sal.symtab = default_breakpoint_symtab;
-	  sal.section  = find_pc_overlay (sal.pc);
+	  sal.section = find_pc_overlay (sal.pc);
 	  sals.sals[0] = sal;
 	  sals.nelts = 1;
 	}
@@ -3777,27 +3804,27 @@ break_command_1 (arg, flag, from_tty)
       addr_start = arg;
 
       /* Force almost all breakpoints to be in terms of the
-	 current_source_symtab (which is decode_line_1's default).  This
-	 should produce the results we want almost all of the time while
-	 leaving default_breakpoint_* alone.  */
+         current_source_symtab (which is decode_line_1's default).  This
+         should produce the results we want almost all of the time while
+         leaving default_breakpoint_* alone.  */
       if (default_breakpoint_valid
 	  && (!current_source_symtab
 	      || (arg && (*arg == '+' || *arg == '-'))))
 	sals = decode_line_1 (&arg, 1, default_breakpoint_symtab,
 			      default_breakpoint_line, &canonical);
       else
-	sals = decode_line_1 (&arg, 1, (struct symtab *)NULL, 0, &canonical);
+	sals = decode_line_1 (&arg, 1, (struct symtab *) NULL, 0, &canonical);
 
       addr_end = arg;
     }
-  
-  if (! sals.nelts) 
+
+  if (!sals.nelts)
     return;
 
   /* Make sure that all storage allocated in decode_line_1 gets freed in case
      the following `for' loop errors out.  */
   old_chain = make_cleanup (free, sals.sals);
-  if (canonical != (char **)NULL)
+  if (canonical != (char **) NULL)
     {
       make_cleanup (free, canonical);
       canonical_strings_chain = make_cleanup (null_cleanup, 0);
@@ -3832,11 +3859,11 @@ break_command_1 (arg, flag, from_tty)
 
          Give the target a chance to bless sals.sals[i].pc before we
          try to make a breakpoint for it. */
-      if (PC_REQUIRES_RUN_BEFORE_USE(sals.sals[i].pc))
-        {
-          error ("Cannot break on %s without a running program.", addr_start);
-        }
-      
+      if (PC_REQUIRES_RUN_BEFORE_USE (sals.sals[i].pc))
+	{
+	  error ("Cannot break on %s without a running program.", addr_start);
+	}
+
       tok = arg;
 
       while (tok && *tok)
@@ -3877,17 +3904,17 @@ break_command_1 (arg, flag, from_tty)
     {
       int i, target_resources_ok;
 
-      i = hw_breakpoint_used_count ();  
+      i = hw_breakpoint_used_count ();
       target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT (
-		bp_hardware_breakpoint, i + sals.nelts, 0);
+				 bp_hardware_breakpoint, i + sals.nelts, 0);
       if (target_resources_ok == 0)
 	error ("No hardware breakpoint support in the target.");
       else if (target_resources_ok < 0)
-        error ("Hardware breakpoints used exceeds limit.");
+	error ("Hardware breakpoints used exceeds limit.");
     }
 
   /* Remove the canonical strings from the cleanup, they are needed below.  */
-  if (canonical != (char **)NULL)
+  if (canonical != (char **) NULL)
     discard_cleanups (canonical_strings_chain);
 
   /* Now set all the breakpoints.  */
@@ -3906,14 +3933,14 @@ break_command_1 (arg, flag, from_tty)
       b->thread = thread;
 
       /* If a canonical line spec is needed use that instead of the
-	 command string.  */
-      if (canonical != (char **)NULL && canonical[i] != NULL)
+         command string.  */
+      if (canonical != (char **) NULL && canonical[i] != NULL)
 	b->addr_string = canonical[i];
       else if (addr_start)
 	b->addr_string = savestring (addr_start, addr_end - addr_start);
       if (cond_start)
 	b->cond_string = savestring (cond_start, cond_end - cond_start);
-				     
+
       b->enable = enabled;
       b->disposition = tempflag ? del : donttouch;
       mention (b);
@@ -3982,12 +4009,12 @@ break_at_finish_at_depth_command_1 (arg, flag, from_tty)
   if (if_arg)
     {
       extra_args = arg;
-      extra_args_len = strlen (arg); 
+      extra_args_len = strlen (arg);
     }
 
   if (selected_pc)
     {
-      if (find_pc_partial_function(selected_pc, (char **)NULL, &low, &high))
+      if (find_pc_partial_function (selected_pc, (char **) NULL, &low, &high))
 	{
 	  addr_string = (char *) xmalloc (26 + extra_args_len);
 	  if (extra_args_len)
@@ -4047,33 +4074,32 @@ break_at_finish_command_1 (arg, flag, from_tty)
   if (if_arg)
     {
       extra_args = arg;
-      extra_args_len = strlen (arg); 
+      extra_args_len = strlen (arg);
+    }
+  else if (arg)
+    {
+      /* get the stuff after the function name or address */
+      extra_args = strchr (arg, ' ');
+      if (extra_args)
+	{
+	  extra_args++;
+	  extra_args_len = strlen (extra_args);
+	}
     }
-  else
-    if (arg)
-      {
-	/* get the stuff after the function name or address */
-	extra_args = strchr (arg, ' ');
-        if (extra_args)
-	  {
-	    extra_args++;
-	    extra_args_len = strlen (extra_args);
-          }
-      }
 
   sals.sals = NULL;
   sals.nelts = 0;
 
-  beg_addr_string = addr_string;  
-  sals = decode_line_1 (&addr_string, 1, (struct symtab *)NULL, 0, 
-			(char ***)NULL);
+  beg_addr_string = addr_string;
+  sals = decode_line_1 (&addr_string, 1, (struct symtab *) NULL, 0,
+			(char ***) NULL);
 
   free (beg_addr_string);
   old_chain = make_cleanup (free, sals.sals);
   for (i = 0; (i < sals.nelts); i++)
     {
       sal = sals.sals[i];
-      if (find_pc_partial_function (sal.pc, (char **)NULL, &low, &high))
+      if (find_pc_partial_function (sal.pc, (char **) NULL, &low, &high))
 	{
 	  break_string = (char *) xmalloc (extra_args_len + 26);
 	  if (extra_args_len)
@@ -4081,7 +4107,7 @@ break_at_finish_command_1 (arg, flag, from_tty)
 	  else
 	    sprintf (break_string, "*0x%x", high);
 	  break_command_1 (break_string, flag, from_tty);
-	  free(break_string);
+	  free (break_string);
 	}
       else
 	error ("No function contains the specified address");
@@ -4091,7 +4117,7 @@ break_at_finish_command_1 (arg, flag, from_tty)
       printf_filtered ("Multiple breakpoints were set.\n");
       printf_filtered ("Use the \"delete\" command to delete unwanted breakpoints.\n");
     }
-  do_cleanups(old_chain);
+  do_cleanups (old_chain);
 }
 
 
@@ -4114,14 +4140,14 @@ resolve_sal_pc (sal)
   if (sal->section == 0 && sal->symtab != NULL)
     {
       struct blockvector *bv;
-      struct block       *b;
-      struct symbol      *sym;
-      int                 index;
+      struct block *b;
+      struct symbol *sym;
+      int index;
 
-      bv  = blockvector_for_pc_sect (sal->pc, 0, &index, sal->symtab);
+      bv = blockvector_for_pc_sect (sal->pc, 0, &index, sal->symtab);
       if (bv != NULL)
 	{
-	  b   = BLOCKVECTOR_BLOCK (bv, index);
+	  b = BLOCKVECTOR_BLOCK (bv, index);
 	  sym = block_function (b);
 	  if (sym != NULL)
 	    {
@@ -4131,11 +4157,11 @@ resolve_sal_pc (sal)
 	  else
 	    {
 	      /* It really is worthwhile to have the section, so we'll just
-		 have to look harder. This case can be executed if we have 
-		 line numbers but no functions (as can happen in assembly 
-		 source).  */
+	         have to look harder. This case can be executed if we have 
+	         line numbers but no functions (as can happen in assembly 
+	         source).  */
 
-	      struct minimal_symbol *msym; 
+	      struct minimal_symbol *msym;
 
 	      msym = lookup_minimal_symbol_by_pc (sal->pc);
 	      if (msym)
@@ -4218,7 +4244,7 @@ stopin_command (arg, from_tty)
 {
   int badInput = 0;
 
-  if (arg == (char *)NULL)
+  if (arg == (char *) NULL)
     badInput = 1;
   else if (*arg != '*')
     {
@@ -4226,22 +4252,22 @@ stopin_command (arg, from_tty)
       int hasColon = 0;
 
       /* look for a ':'.  If this is a line number specification, then say
-	 it is bad, otherwise, it should be an address or function/method
-	 name */
+         it is bad, otherwise, it should be an address or function/method
+         name */
       while (*argptr && !hasColon)
-        {
-          hasColon = (*argptr == ':');
-          argptr++;
-        }
+	{
+	  hasColon = (*argptr == ':');
+	  argptr++;
+	}
 
       if (hasColon)
-        badInput = (*argptr != ':'); /* Not a class::method */
+	badInput = (*argptr != ':');	/* Not a class::method */
       else
-        badInput = isdigit(*arg); /* a simple line number */
+	badInput = isdigit (*arg);	/* a simple line number */
     }
 
   if (badInput)
-    printf_filtered("Usage: stop in <function | address>\n");
+    printf_filtered ("Usage: stop in <function | address>\n");
   else
     break_command_1 (arg, 0, from_tty);
 }
@@ -4253,7 +4279,7 @@ stopat_command (arg, from_tty)
 {
   int badInput = 0;
 
-  if (arg == (char *)NULL || *arg == '*') /* no line number */
+  if (arg == (char *) NULL || *arg == '*')	/* no line number */
     badInput = 1;
   else
     {
@@ -4261,21 +4287,21 @@ stopat_command (arg, from_tty)
       int hasColon = 0;
 
       /* look for a ':'.  If there is a '::' then get out, otherwise
-	 it is probably a line number. */
+         it is probably a line number. */
       while (*argptr && !hasColon)
-        {
-          hasColon = (*argptr == ':');
-          argptr++;
-        }
+	{
+	  hasColon = (*argptr == ':');
+	  argptr++;
+	}
 
       if (hasColon)
-        badInput = (*argptr == ':'); /* we have class::method */
+	badInput = (*argptr == ':');	/* we have class::method */
       else
-        badInput = !isdigit(*arg); /* not a line number */
+	badInput = !isdigit (*arg);	/* not a line number */
     }
 
   if (badInput)
-    printf_filtered("Usage: stop at <line>\n");
+    printf_filtered ("Usage: stop at <line>\n");
   else
     break_command_1 (arg, 0, from_tty);
 }
@@ -4306,8 +4332,8 @@ watch_command_1 (arg, accessflag, from_tty)
   enum bptype bp_type;
   int mem_cnt = 0;
 
-  INIT_SAL (&sal);	/* initialize to zeroes */
-  
+  INIT_SAL (&sal);		/* initialize to zeroes */
+
   /* Parse arguments.  */
   innermost_block = NULL;
   exp_start = arg;
@@ -4336,27 +4362,31 @@ watch_command_1 (arg, accessflag, from_tty)
       cond_end = tok;
     }
   if (*tok)
-    error("Junk at end of command.");
+    error ("Junk at end of command.");
 
-  if (accessflag == 1) bp_type = bp_read_watchpoint;
-  else if (accessflag == 2) bp_type = bp_access_watchpoint;
-  else bp_type = bp_hardware_watchpoint;
+  if (accessflag == 1)
+    bp_type = bp_read_watchpoint;
+  else if (accessflag == 2)
+    bp_type = bp_access_watchpoint;
+  else
+    bp_type = bp_hardware_watchpoint;
 
   mem_cnt = can_use_hardware_watchpoint (val);
   if (mem_cnt == 0 && bp_type != bp_hardware_watchpoint)
     error ("Expression cannot be implemented with read/access watchpoint.");
-  if (mem_cnt != 0) { 
-    i = hw_watchpoint_used_count (bp_type, &other_type_used);
-    target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT(
-		bp_type, i + mem_cnt, other_type_used);
-    if (target_resources_ok == 0 && bp_type != bp_hardware_watchpoint)
-      error ("Target does not have this type of hardware watchpoint support.");
-    if (target_resources_ok < 0 && bp_type != bp_hardware_watchpoint)
-      error ("Target resources have been allocated for other types of watchpoints.");
-  }
+  if (mem_cnt != 0)
+    {
+      i = hw_watchpoint_used_count (bp_type, &other_type_used);
+      target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT (
+				     bp_type, i + mem_cnt, other_type_used);
+      if (target_resources_ok == 0 && bp_type != bp_hardware_watchpoint)
+	error ("Target does not have this type of hardware watchpoint support.");
+      if (target_resources_ok < 0 && bp_type != bp_hardware_watchpoint)
+	error ("Target resources have been allocated for other types of watchpoints.");
+    }
 
 #if defined(HPUXHPPA)
- /*  On HP-UX if you set a h/w
+  /*  On HP-UX if you set a h/w
      watchpoint before the "run" command, the inferior dies with a e.g.,
      SIGILL once you start it.  I initially believed this was due to a
      bad interaction between page protection traps and the initial
@@ -4370,13 +4400,13 @@ watch_command_1 (arg, accessflag, from_tty)
      Until I figure out what's happening, I'm disallowing watches altogether
      before the "run" or "attach" command.  We'll tell the user they must
      set watches after getting the program started. */
-  if (! target_has_execution)
+  if (!target_has_execution)
     {
       warning ("can't do that without a running program; try \"break main\", \"run\" first");
       return;
     }
 #endif /* HPUXHPPA */
-  
+
   /* Now set up the breakpoint.  */
   b = set_raw_breakpoint (sal);
   set_breakpoint_count (breakpoint_count + 1);
@@ -4391,7 +4421,7 @@ watch_command_1 (arg, accessflag, from_tty)
     b->cond_string = savestring (cond_start, cond_end - cond_start);
   else
     b->cond_string = 0;
-         
+
   frame = block_innermost_frame (exp_valid_block);
   if (frame)
     {
@@ -4399,7 +4429,7 @@ watch_command_1 (arg, accessflag, from_tty)
       b->watchpoint_frame = frame->frame;
     }
   else
-    b->watchpoint_frame = (CORE_ADDR)0;
+    b->watchpoint_frame = (CORE_ADDR) 0;
 
   if (mem_cnt && target_resources_ok > 0)
     b->type = bp_type;
@@ -4417,7 +4447,7 @@ watch_command_1 (arg, accessflag, from_tty)
 	  struct symtab_and_line scope_sal;
 
 	  INIT_SAL (&scope_sal);	/* initialize to zeroes */
-	  scope_sal.pc      = get_frame_pc (prev_frame);
+	  scope_sal.pc = get_frame_pc (prev_frame);
 	  scope_sal.section = find_pc_overlay (scope_sal.pc);
 
 	  scope_breakpoint = set_raw_breakpoint (scope_sal);
@@ -4461,20 +4491,20 @@ can_use_hardware_watchpoint (v)
   int found_memory_cnt = 0;
 
   /* Did the user specifically forbid us to use hardware watchpoints? */
-  if (! can_use_hw_watchpoints)
+  if (!can_use_hw_watchpoints)
     return 0;
-	
+
   /* Make sure all the intermediate values are in memory.  Also make sure
      we found at least one memory expression.  Guards against watch 0x12345,
      which is meaningless, but could cause errors if one tries to insert a 
      hardware watchpoint for the constant expression.  */
-  for ( ; v; v = v->next)
+  for (; v; v = v->next)
     {
       if (v->lval == lval_memory)
 	{
 	  if (TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT (TYPE_LENGTH (VALUE_TYPE (v))))
 	    found_memory_cnt++;
-        }
+	}
       else if (v->lval != not_lval && v->modifiable == 0)
 	return 0;
     }
@@ -4484,28 +4514,31 @@ can_use_hardware_watchpoint (v)
   return found_memory_cnt;
 }
 
-static void watch_command (arg, from_tty)
+static void
+watch_command (arg, from_tty)
      char *arg;
      int from_tty;
 {
   watch_command_1 (arg, 0, from_tty);
 }
 
-static void rwatch_command (arg, from_tty)
+static void
+rwatch_command (arg, from_tty)
      char *arg;
      int from_tty;
 {
   watch_command_1 (arg, 1, from_tty);
 }
 
-static void awatch_command (arg, from_tty)
+static void
+awatch_command (arg, from_tty)
      char *arg;
      int from_tty;
 {
   watch_command_1 (arg, 2, from_tty);
 }
-
 
+
 /* Helper routines for the until_command routine in infcmd.c.  Here
    because it uses the mechanisms of breakpoints.  */
 
@@ -4540,26 +4573,26 @@ until_break_command (arg, from_tty)
 
   /* Set a breakpoint where the user wants it and at return from
      this function */
-  
+
   if (default_breakpoint_valid)
     sals = decode_line_1 (&arg, 1, default_breakpoint_symtab,
-			  default_breakpoint_line, (char ***)NULL);
+			  default_breakpoint_line, (char ***) NULL);
   else
-    sals = decode_line_1 (&arg, 1, (struct symtab *)NULL, 0, (char ***)NULL);
-  
+    sals = decode_line_1 (&arg, 1, (struct symtab *) NULL, 0, (char ***) NULL);
+
   if (sals.nelts != 1)
     error ("Couldn't get information on specified line.");
-  
+
   sal = sals.sals[0];
-  free ((PTR)sals.sals);		/* malloc'd, so freed */
-  
+  free ((PTR) sals.sals);	/* malloc'd, so freed */
+
   if (*arg)
     error ("Junk at end of arguments.");
-  
+
   resolve_sal_pc (&sal);
-  
+
   breakpoint = set_momentary_breakpoint (sal, selected_frame, bp_until);
-  
+
   if (!async_p || !target_has_async)
     old_chain = make_cleanup ((make_cleanup_func) delete_breakpoint, breakpoint);
   else
@@ -4575,14 +4608,14 @@ until_break_command (arg, from_tty)
   if (async_p && target_has_async)
     {
       /* In this case we don't need args for the continuation, because
-	 all it needs to do is do the cleanups in the
-	 exec_cleanup_chain, which will be only those inserted by this
-	 function. We can get away by using ALL_CLEANUPS. */
+         all it needs to do is do the cleanups in the
+         exec_cleanup_chain, which will be only those inserted by this
+         function. We can get away by using ALL_CLEANUPS. */
       add_continuation (until_break_command_continuation, NULL);
     }
 
   /* Keep within the current frame */
-  
+
   if (prev_frame)
     {
       sal = find_pc_line (prev_frame->pc, 0);
@@ -4593,12 +4626,12 @@ until_break_command (arg, from_tty)
       else
 	make_exec_cleanup ((make_cleanup_func) delete_breakpoint, breakpoint);
     }
-  
+
   proceed (-1, TARGET_SIGNAL_DEFAULT, 0);
   /* Do the cleanups now, anly if we are not running asynchronously,
      of if we are, but the target is still synchronous. */
   if (!async_p || !target_has_async)
-    do_cleanups(old_chain);
+    do_cleanups (old_chain);
 }
 
 #if 0
@@ -4643,7 +4676,7 @@ struct sal_chain
 static struct symtabs_and_lines
 map_catch_names (args, function)
      char *args;
-     int (*function)();
+     int (*function) ();
 {
   register char *p = args;
   register char *p1;
@@ -4681,7 +4714,7 @@ map_catch_names (args, function)
       if (function (p))
 	{
 	  struct sal_chain *next = (struct sal_chain *)
-	    alloca (sizeof (struct sal_chain));
+	  alloca (sizeof (struct sal_chain));
 	  next->next = sal_chain;
 	  next->sal = get_catch_sal (p);
 	  sal_chain = next;
@@ -4693,7 +4726,8 @@ map_catch_names (args, function)
     win:
 #endif
       p = p1;
-      while (*p == ' ' || *p == '\t') p++;
+      while (*p == ' ' || *p == '\t')
+	p++;
     }
 }
 #endif
@@ -4770,7 +4804,7 @@ get_catch_sals (this_level_only)
 		  if (SYMBOL_CLASS (sym) == LOC_LABEL)
 		    {
 		      struct sal_chain *next = (struct sal_chain *)
-			alloca (sizeof (struct sal_chain));
+		      alloca (sizeof (struct sal_chain));
 		      next->next = sal_chain;
 		      next->sal = find_pc_line (SYMBOL_VALUE_ADDRESS (sym), 0);
 		      sal_chain = next;
@@ -4786,8 +4820,8 @@ get_catch_sals (this_level_only)
 	break;
 
       /* After handling the function's top-level block, stop.
-	 Don't continue to its superblock, the block of
-	 per-file symbols.  */
+         Don't continue to its superblock, the block of
+         per-file symbols.  */
       if (BLOCK_FUNCTION (block))
 	break;
       block = BLOCK_SUPERBLOCK (block);
@@ -4816,12 +4850,12 @@ static void
 ep_skip_leading_whitespace (s)
      char **s;
 {
-   if ((s == NULL) || (*s == NULL))
-       return;
-   while (isspace(**s))
-       *s += 1;
+  if ((s == NULL) || (*s == NULL))
+    return;
+  while (isspace (**s))
+    *s += 1;
 }
- 
+
 /* This function examines a string, and attempts to find a token
    that might be an event name in the leading characters.  If a
    possible match is found, a pointer to the last character of
@@ -4830,31 +4864,31 @@ static char *
 ep_find_event_name_end (arg)
      char *arg;
 {
-  char *  s = arg;
-  char *  event_name_end = NULL;
- 
+  char *s = arg;
+  char *event_name_end = NULL;
+
   /* If we could depend upon the presense of strrpbrk, we'd use that... */
   if (arg == NULL)
     return NULL;
- 
+
   /* We break out of the loop when we find a token delimiter.
-   Basically, we're looking for alphanumerics and underscores;
-   anything else delimites the token. */
+     Basically, we're looking for alphanumerics and underscores;
+     anything else delimites the token. */
   while (*s != '\0')
     {
-      if (! isalnum(*s) && (*s != '_'))
-        break;
+      if (!isalnum (*s) && (*s != '_'))
+	break;
       event_name_end = s;
       s++;
     }
- 
+
   return event_name_end;
 }
 
- 
+
 /* This function attempts to parse an optional "if <cond>" clause
    from the arg string.  If one is not found, it returns NULL.
- 
+
    Else, it returns a pointer to the condition string.  (It does not
    attempt to evaluate the string against a particular block.)  And,
    it updates arg to point to the first character following the parsed
@@ -4863,67 +4897,71 @@ static char *
 ep_parse_optional_if_clause (arg)
      char **arg;
 {
-  char *  cond_string;
- 
-  if (((*arg)[0] != 'i') || ((*arg)[1] != 'f') || !isspace((*arg)[2]))
+  char *cond_string;
+
+  if (((*arg)[0] != 'i') || ((*arg)[1] != 'f') || !isspace ((*arg)[2]))
     return NULL;
- 
+
   /* Skip the "if" keyword. */
   (*arg) += 2;
- 
+
   /* Skip any extra leading whitespace, and record the start of the
      condition string. */
   ep_skip_leading_whitespace (arg);
   cond_string = *arg;
- 
+
   /* Assume that the condition occupies the remainder of the arg string. */
   (*arg) += strlen (cond_string);
- 
+
   return cond_string;
 }
- 
+
 /* This function attempts to parse an optional filename from the arg
    string.  If one is not found, it returns NULL.
- 
+
    Else, it returns a pointer to the parsed filename.  (This function
    makes no attempt to verify that a file of that name exists, or is
    accessible.)  And, it updates arg to point to the first character
    following the parsed filename in the arg string.
- 
+
    Note that clients needing to preserve the returned filename for
    future access should copy it to their own buffers. */
 static char *
 ep_parse_optional_filename (arg)
      char **arg;
 {
-  static char  filename [1024];
-  char *  arg_p = *arg;
-  int  i;
-  char  c;
- 
+  static char filename[1024];
+  char *arg_p = *arg;
+  int i;
+  char c;
+
   if ((*arg_p == '\0') || isspace (*arg_p))
     return NULL;
- 
-  for (i=0; ; i++)
+
+  for (i = 0;; i++)
     {
       c = *arg_p;
       if (isspace (c))
-        c = '\0';
+	c = '\0';
       filename[i] = c;
       if (c == '\0')
-        break;
+	break;
       arg_p++;
     }
   *arg = arg_p;
- 
+
   return filename;
 }
- 
+
 /* Commands to deal with catching events, such as signals, exceptions,
    process start/exit, etc.  */
- 
-typedef enum {catch_fork, catch_vfork} catch_fork_kind;
- 
+
+typedef enum
+{
+  catch_fork, catch_vfork
+}
+catch_fork_kind;
+
 static void catch_fork_command_1 PARAMS ((catch_fork_kind fork_kind, char *arg, int tempflag, int from_tty));
 
 static void
@@ -4933,33 +4971,34 @@ catch_fork_command_1 (fork_kind, arg, tempflag, from_tty)
      int tempflag;
      int from_tty;
 {
-  char *  cond_string = NULL;
- 
+  char *cond_string = NULL;
+
   ep_skip_leading_whitespace (&arg);
- 
+
   /* The allowed syntax is:
-        catch [v]fork
-        catch [v]fork if <cond>
- 
+     catch [v]fork
+     catch [v]fork if <cond>
+
      First, check if there's an if clause. */
   cond_string = ep_parse_optional_if_clause (&arg);
- 
+
   if ((*arg != '\0') && !isspace (*arg))
     error ("Junk at end of arguments.");
- 
+
   /* If this target supports it, create a fork or vfork catchpoint
      and enable reporting of such events. */
-  switch (fork_kind) {
-    case catch_fork :
+  switch (fork_kind)
+    {
+    case catch_fork:
       create_fork_event_catchpoint (tempflag, cond_string);
       break;
-    case catch_vfork :
+    case catch_vfork:
       create_vfork_event_catchpoint (tempflag, cond_string);
       break;
-    default :
+    default:
       error ("unsupported or unknown fork kind; cannot catch it");
       break;
-  }
+    }
 }
 
 static void
@@ -4968,13 +5007,13 @@ catch_exec_command_1 (arg, tempflag, from_tty)
      int tempflag;
      int from_tty;
 {
-  char *  cond_string = NULL;
+  char *cond_string = NULL;
 
   ep_skip_leading_whitespace (&arg);
 
   /* The allowed syntax is:
-        catch exec
-        catch exec if <cond>
+     catch exec
+     catch exec if <cond>
 
      First, check if there's an if clause. */
   cond_string = ep_parse_optional_if_clause (&arg);
@@ -4986,34 +5025,34 @@ catch_exec_command_1 (arg, tempflag, from_tty)
      and enable reporting of such events. */
   create_exec_event_catchpoint (tempflag, cond_string);
 }
- 
+
 #if defined(SOLIB_ADD)
 static void
 catch_load_command_1 (arg, tempflag, from_tty)
-  char *  arg;
-  int  tempflag;
-  int  from_tty;
+     char *arg;
+     int tempflag;
+     int from_tty;
 {
-  char *  dll_pathname = NULL;
-  char *  cond_string = NULL;
- 
+  char *dll_pathname = NULL;
+  char *cond_string = NULL;
+
   ep_skip_leading_whitespace (&arg);
- 
+
   /* The allowed syntax is:
-        catch load
-        catch load if <cond>
-        catch load <filename>
-        catch load <filename> if <cond>
- 
+     catch load
+     catch load if <cond>
+     catch load <filename>
+     catch load <filename> if <cond>
+
      The user is not allowed to specify the <filename> after an
      if clause.
- 
+
      We'll ignore the pathological case of a file named "if".
- 
+
      First, check if there's an if clause.  If so, then there
      cannot be a filename. */
   cond_string = ep_parse_optional_if_clause (&arg);
- 
+
   /* If there was an if clause, then there cannot be a filename.
      Else, there might be a filename and an if clause. */
   if (cond_string == NULL)
@@ -5022,42 +5061,42 @@ catch_load_command_1 (arg, tempflag, from_tty)
       ep_skip_leading_whitespace (&arg);
       cond_string = ep_parse_optional_if_clause (&arg);
     }
- 
+
   if ((*arg != '\0') && !isspace (*arg))
     error ("Junk at end of arguments.");
- 
+
   /* Create a load breakpoint that only triggers when a load of
      the specified dll (or any dll, if no pathname was specified)
      occurs. */
   SOLIB_CREATE_CATCH_LOAD_HOOK (inferior_pid, tempflag, dll_pathname, cond_string);
 }
- 
+
 static void
 catch_unload_command_1 (arg, tempflag, from_tty)
-  char *  arg;
-  int  tempflag;
-  int  from_tty;
+     char *arg;
+     int tempflag;
+     int from_tty;
 {
-  char *  dll_pathname = NULL;
-  char *  cond_string = NULL;
- 
+  char *dll_pathname = NULL;
+  char *cond_string = NULL;
+
   ep_skip_leading_whitespace (&arg);
- 
+
   /* The allowed syntax is:
-        catch unload
-        catch unload if <cond>
-        catch unload <filename>
-        catch unload <filename> if <cond>
- 
+     catch unload
+     catch unload if <cond>
+     catch unload <filename>
+     catch unload <filename> if <cond>
+
      The user is not allowed to specify the <filename> after an
      if clause.
- 
+
      We'll ignore the pathological case of a file named "if".
- 
+
      First, check if there's an if clause.  If so, then there
      cannot be a filename. */
   cond_string = ep_parse_optional_if_clause (&arg);
- 
+
   /* If there was an if clause, then there cannot be a filename.
      Else, there might be a filename and an if clause. */
   if (cond_string == NULL)
@@ -5066,10 +5105,10 @@ catch_unload_command_1 (arg, tempflag, from_tty)
       ep_skip_leading_whitespace (&arg);
       cond_string = ep_parse_optional_if_clause (&arg);
     }
- 
+
   if ((*arg != '\0') && !isspace (*arg))
     error ("Junk at end of arguments.");
- 
+
   /* Create an unload breakpoint that only triggers when an unload of
      the specified dll (or any dll, if no pathname was specified)
      occurs. */
@@ -5080,7 +5119,7 @@ catch_unload_command_1 (arg, tempflag, from_tty)
 /* Commands to deal with catching exceptions.  */
 
 /* Set a breakpoint at the specified callback routine for an
-   exception event callback */ 
+   exception event callback */
 
 static void
 create_exception_catchpoint (tempflag, cond_string, ex_event, sal)
@@ -5089,11 +5128,11 @@ create_exception_catchpoint (tempflag, cond_string, ex_event, sal)
      enum exception_event_kind ex_event;
      struct symtab_and_line *sal;
 {
-  struct breakpoint *  b;
-  int  i;
-  int  thread = -1;  /* All threads. */
+  struct breakpoint *b;
+  int i;
+  int thread = -1;		/* All threads. */
 
-  if (!sal) /* no exception support? */
+  if (!sal)			/* no exception support? */
     return;
 
   b = set_raw_breakpoint (*sal);
@@ -5107,21 +5146,21 @@ create_exception_catchpoint (tempflag, cond_string, ex_event, sal)
   b->disposition = tempflag ? del : donttouch;
   switch (ex_event)
     {
-      case EX_EVENT_THROW:
-        b->type = bp_catch_throw;
-        break;
-      case EX_EVENT_CATCH:
-        b->type = bp_catch_catch;
-        break;
-      default: /* error condition */ 
-        b->type = bp_none;
-        b->enable = disabled;
-        error ("Internal error -- invalid catchpoint kind");
+    case EX_EVENT_THROW:
+      b->type = bp_catch_throw;
+      break;
+    case EX_EVENT_CATCH:
+      b->type = bp_catch_catch;
+      break;
+    default:			/* error condition */
+      b->type = bp_none;
+      b->enable = disabled;
+      error ("Internal error -- invalid catchpoint kind");
     }
   mention (b);
 }
 
-/* Deal with "catch catch" and "catch throw" commands */ 
+/* Deal with "catch catch" and "catch throw" commands */
 
 static void
 catch_exception_command_1 (ex_event, arg, tempflag, from_tty)
@@ -5130,11 +5169,11 @@ catch_exception_command_1 (ex_event, arg, tempflag, from_tty)
      int tempflag;
      int from_tty;
 {
-  char * cond_string = NULL;
-  struct symtab_and_line * sal = NULL;
-  
+  char *cond_string = NULL;
+  struct symtab_and_line *sal = NULL;
+
   ep_skip_leading_whitespace (&arg);
-  
+
   cond_string = ep_parse_optional_if_clause (&arg);
 
   if ((*arg != '\0') && !isspace (*arg))
@@ -5147,31 +5186,31 @@ catch_exception_command_1 (ex_event, arg, tempflag, from_tty)
   /* See if we can find a callback routine */
   sal = target_enable_exception_callback (ex_event, 1);
 
-  if (sal) 
+  if (sal)
     {
       /* We have callbacks from the runtime system for exceptions.
-         Set a breakpoint on the sal found, if no errors */ 
+         Set a breakpoint on the sal found, if no errors */
       if (sal != (struct symtab_and_line *) -1)
-        create_exception_catchpoint (tempflag, cond_string, ex_event, sal);
+	create_exception_catchpoint (tempflag, cond_string, ex_event, sal);
       else
-        return; /* something went wrong with setting up callbacks */ 
+	return;			/* something went wrong with setting up callbacks */
     }
-  else  
+  else
     {
       /* No callbacks from runtime system for exceptions.
          Try GNU C++ exception breakpoints using labels in debug info. */
       if (ex_event == EX_EVENT_CATCH)
-        {
-          handle_gnu_4_16_catch_command (arg, tempflag, from_tty);
-        }
+	{
+	  handle_gnu_4_16_catch_command (arg, tempflag, from_tty);
+	}
       else if (ex_event == EX_EVENT_THROW)
-        {
-          /* Set a breakpoint on __raise_exception () */
-          
-          fprintf_filtered (gdb_stderr, "Unsupported with this platform/compiler combination.\n");
-          fprintf_filtered (gdb_stderr, "Perhaps you can achieve the effect you want by setting\n");
-          fprintf_filtered (gdb_stderr, "a breakpoint on __raise_exception().\n");
-        }
+	{
+	  /* Set a breakpoint on __raise_exception () */
+
+	  fprintf_filtered (gdb_stderr, "Unsupported with this platform/compiler combination.\n");
+	  fprintf_filtered (gdb_stderr, "Perhaps you can achieve the effect you want by setting\n");
+	  fprintf_filtered (gdb_stderr, "a breakpoint on __raise_exception().\n");
+	}
     }
 }
 
@@ -5180,7 +5219,7 @@ catch_exception_command_1 (ex_event, arg, tempflag, from_tty)
 
 static int
 cover_target_enable_exception_callback (arg)
-  PTR arg;
+     PTR arg;
 {
   args_for_catchpoint_enable *args = arg;
   struct symtab_and_line *sal;
@@ -5190,7 +5229,7 @@ cover_target_enable_exception_callback (arg)
   else if (sal == (struct symtab_and_line *) -1)
     return -1;
   else
-    return 1; /*is valid*/
+    return 1;			/*is valid */
 }
 
 
@@ -5203,7 +5242,7 @@ cover_target_enable_exception_callback (arg)
    Note: Only the "catch" flavour of GDB 4.16 is handled here.  The
    "catch NAME" is now no longer allowed in catch_command_1().  Also,
    there was no code in GDB 4.16 for "catch throw". 
-  
+
    Called from catch_exception_command_1 () */
 
 
@@ -5223,12 +5262,12 @@ handle_gnu_4_16_catch_command (arg, tempflag, from_tty)
   char *save_arg;
   int i;
 
-  INIT_SAL (&sal);	/* initialize to zeroes */
+  INIT_SAL (&sal);		/* initialize to zeroes */
 
   /* If no arg given, or if first arg is 'if ', all active catch clauses
      are breakpointed. */
 
-  if (!arg || (arg[0] == 'i' && arg[1] == 'f' 
+  if (!arg || (arg[0] == 'i' && arg[1] == 'f'
 	       && (arg[2] == ' ' || arg[2] == '\t')))
     {
       /* Grab all active catch clauses.  */
@@ -5243,26 +5282,26 @@ handle_gnu_4_16_catch_command (arg, tempflag, from_tty)
       /* Not sure why this code has been disabled. I'm leaving
          it disabled.  We can never come here now anyway
          since we don't allow the "catch NAME" syntax.
-         pai/1997-07-11 */ 
+         pai/1997-07-11 */
 
       /* This isn't used; I don't know what it was for.  */
       sals = map_catch_names (arg, catch_breakpoint);
 #endif
     }
 
-  if (! sals.nelts) 
+  if (!sals.nelts)
     return;
 
   save_arg = arg;
   for (i = 0; i < sals.nelts; i++)
     {
       resolve_sal_pc (&sals.sals[i]);
-      
+
       while (arg && *arg)
 	{
 	  if (arg[0] == 'i' && arg[1] == 'f'
 	      && (arg[2] == ' ' || arg[2] == '\t'))
-	    cond = parse_exp_1 ((arg += 2, &arg), 
+	    cond = parse_exp_1 ((arg += 2, &arg),
 				block_for_pc (sals.sals[i].pc), 0);
 	  else
 	    error ("Junk at end of arguments.");
@@ -5280,12 +5319,12 @@ handle_gnu_4_16_catch_command (arg, tempflag, from_tty)
       b = set_raw_breakpoint (sal);
       set_breakpoint_count (breakpoint_count + 1);
       b->number = breakpoint_count;
-      b->type = bp_breakpoint; /* Important -- this is an ordinary breakpoint.
-                                  For platforms with callback support for exceptions,
-                                  create_exception_catchpoint() will create special
-                                  bp types (bp_catch_catch and bp_catch_throw), and
-                                  there is code in insert_breakpoints() and elsewhere
-                                  that depends on that. */
+      b->type = bp_breakpoint;	/* Important -- this is an ordinary breakpoint.
+				   For platforms with callback support for exceptions,
+				   create_exception_catchpoint() will create special
+				   bp types (bp_catch_catch and bp_catch_throw), and
+				   there is code in insert_breakpoints() and elsewhere
+				   that depends on that. */
 
       b->cond = cond;
       b->enable = enabled;
@@ -5299,7 +5338,7 @@ handle_gnu_4_16_catch_command (arg, tempflag, from_tty)
       printf_unfiltered ("Multiple breakpoints were set.\n");
       printf_unfiltered ("Use the \"delete\" command to delete unwanted breakpoints.\n");
     }
-  free ((PTR)sals.sals);
+  free ((PTR) sals.sals);
 }
 
 #if 0
@@ -5307,12 +5346,12 @@ handle_gnu_4_16_catch_command (arg, tempflag, from_tty)
    just to placate infrun */
 static struct breakpoint *
 create_temp_exception_breakpoint (pc)
-  CORE_ADDR pc;
+     CORE_ADDR pc;
 {
   struct symtab_and_line sal;
   struct breakpoint *b;
 
-  INIT_SAL(&sal);
+  INIT_SAL (&sal);
   sal.pc = pc;
   sal.symtab = NULL;
   sal.line = 0;
@@ -5332,27 +5371,27 @@ create_temp_exception_breakpoint (pc)
 
 static void
 catch_command_1 (arg, tempflag, from_tty)
-  char *arg;
-  int tempflag;
-  int from_tty;
+     char *arg;
+     int tempflag;
+     int from_tty;
 {
- 
+
   /* The first argument may be an event name, such as "start" or "load".
      If so, then handle it as such.  If it doesn't match an event name,
      then attempt to interpret it as an exception name.  (This latter is
      the v4.16-and-earlier GDB meaning of the "catch" command.)
- 
+
      First, try to find the bounds of what might be an event name. */
-  char *  arg1_start = arg;
-  char *  arg1_end;
-  int  arg1_length;
- 
+  char *arg1_start = arg;
+  char *arg1_end;
+  int arg1_length;
+
   if (arg1_start == NULL)
     {
-      /* Old behaviour was to use pre-v-4.16 syntax */ 
+      /* Old behaviour was to use pre-v-4.16 syntax */
       /* catch_throw_command_1 (arg1_start, tempflag, from_tty); */
       /* return; */
-      /* Now, this is not allowed */ 
+      /* Now, this is not allowed */
       error ("Catch requires an event name.");
 
     }
@@ -5360,7 +5399,7 @@ catch_command_1 (arg, tempflag, from_tty)
   if (arg1_end == NULL)
     error ("catch requires an event");
   arg1_length = arg1_end + 1 - arg1_start;
- 
+
   /* Try to match what we found against known event names. */
   if (strncmp (arg1_start, "signal", arg1_length) == 0)
     {
@@ -5368,11 +5407,11 @@ catch_command_1 (arg, tempflag, from_tty)
     }
   else if (strncmp (arg1_start, "catch", arg1_length) == 0)
     {
-      catch_exception_command_1 (EX_EVENT_CATCH, arg1_end+1, tempflag, from_tty); 
+      catch_exception_command_1 (EX_EVENT_CATCH, arg1_end + 1, tempflag, from_tty);
     }
   else if (strncmp (arg1_start, "throw", arg1_length) == 0)
     {
-      catch_exception_command_1 (EX_EVENT_THROW, arg1_end+1, tempflag, from_tty);
+      catch_exception_command_1 (EX_EVENT_THROW, arg1_end + 1, tempflag, from_tty);
     }
   else if (strncmp (arg1_start, "thread_start", arg1_length) == 0)
     {
@@ -5397,7 +5436,7 @@ catch_command_1 (arg, tempflag, from_tty)
   else if (strncmp (arg1_start, "fork", arg1_length) == 0)
     {
 #if defined(CHILD_INSERT_FORK_CATCHPOINT)
-      catch_fork_command_1 (catch_fork, arg1_end+1, tempflag, from_tty);
+      catch_fork_command_1 (catch_fork, arg1_end + 1, tempflag, from_tty);
 #else
       error ("Catch of fork not yet implemented");
 #endif
@@ -5405,7 +5444,7 @@ catch_command_1 (arg, tempflag, from_tty)
   else if (strncmp (arg1_start, "vfork", arg1_length) == 0)
     {
 #if defined(CHILD_INSERT_VFORK_CATCHPOINT)
-      catch_fork_command_1 (catch_vfork, arg1_end+1, tempflag, from_tty);
+      catch_fork_command_1 (catch_vfork, arg1_end + 1, tempflag, from_tty);
 #else
       error ("Catch of vfork not yet implemented");
 #endif
@@ -5413,7 +5452,7 @@ catch_command_1 (arg, tempflag, from_tty)
   else if (strncmp (arg1_start, "exec", arg1_length) == 0)
     {
 #if defined(CHILD_INSERT_EXEC_CATCHPOINT)
-      catch_exec_command_1 (arg1_end+1, tempflag, from_tty);
+      catch_exec_command_1 (arg1_end + 1, tempflag, from_tty);
 #else
       error ("Catch of exec not yet implemented");
 #endif
@@ -5421,7 +5460,7 @@ catch_command_1 (arg, tempflag, from_tty)
   else if (strncmp (arg1_start, "load", arg1_length) == 0)
     {
 #if defined(SOLIB_ADD)
-      catch_load_command_1 (arg1_end+1, tempflag, from_tty);
+      catch_load_command_1 (arg1_end + 1, tempflag, from_tty);
 #else
       error ("Catch of load not implemented");
 #endif
@@ -5429,7 +5468,7 @@ catch_command_1 (arg, tempflag, from_tty)
   else if (strncmp (arg1_start, "unload", arg1_length) == 0)
     {
 #if defined(SOLIB_ADD)
-      catch_unload_command_1 (arg1_end+1, tempflag, from_tty);
+      catch_unload_command_1 (arg1_end + 1, tempflag, from_tty);
 #else
       error ("Catch of load not implemented");
 #endif
@@ -5438,15 +5477,15 @@ catch_command_1 (arg, tempflag, from_tty)
     {
       error ("Catch of stop not yet implemented");
     }
- 
+
   /* This doesn't appear to be an event name */
 
   else
     {
       /* Pre-v.4.16 behaviour was to treat the argument
-         as the name of an exception */ 
+         as the name of an exception */
       /* catch_throw_command_1 (arg1_start, tempflag, from_tty); */
-      /* Now this is not allowed */ 
+      /* Now this is not allowed */
       error ("Unknown event kind specified for catch");
 
     }
@@ -5532,9 +5571,9 @@ clear_command (arg, from_tty)
     }
   else
     {
-      sals.sals = (struct symtab_and_line *) 
+      sals.sals = (struct symtab_and_line *)
 	xmalloc (sizeof (struct symtab_and_line));
-      INIT_SAL (&sal);	/* initialize to zeroes */
+      INIT_SAL (&sal);		/* initialize to zeroes */
       sal.line = default_breakpoint_line;
       sal.symtab = default_breakpoint_symtab;
       sal.pc = default_breakpoint_address;
@@ -5558,37 +5597,37 @@ clear_command (arg, from_tty)
   for (i = 0; i < sals.nelts; i++)
     {
       /* If exact pc given, clear bpts at that pc.
-	 If line given (pc == 0), clear all bpts on specified line.
-	 If defaulting, clear all bpts on default line
+         If line given (pc == 0), clear all bpts on specified line.
+         If defaulting, clear all bpts on default line
          or at default pc.
-       
-		defaulting    sal.pc != 0    tests to do
-       
-                0              1             pc
-                1              1             pc _and_ line
-                0              0             line
-                1              0             <can't happen> */
+
+         defaulting    sal.pc != 0    tests to do
+
+         0              1             pc
+         1              1             pc _and_ line
+         0              0             line
+         1              0             <can't happen> */
 
       sal = sals.sals[i];
       found = (struct breakpoint *) 0;
 
 
       while (breakpoint_chain
-             /* Why don't we check here that this is not
-		a watchpoint, etc., as we do below?
-		I can't make it fail, but don't know
-		what's stopping the failure: a watchpoint
-		of the same address as "sal.pc" should
-		wind up being deleted. */
- 
-             && (  ((sal.pc && (breakpoint_chain->address == sal.pc)) &&
-                   (overlay_debugging == 0 ||
-                    breakpoint_chain->section == sal.section))
-                || ((default_match || (0 == sal.pc))
-                   && breakpoint_chain->source_file != NULL
-                   && sal.symtab != NULL
-                   && STREQ (breakpoint_chain->source_file, sal.symtab->filename)
-                   && breakpoint_chain->line_number == sal.line)))
+      /* Why don't we check here that this is not
+         a watchpoint, etc., as we do below?
+         I can't make it fail, but don't know
+         what's stopping the failure: a watchpoint
+         of the same address as "sal.pc" should
+         wind up being deleted. */
+
+	     && (((sal.pc && (breakpoint_chain->address == sal.pc)) &&
+		  (overlay_debugging == 0 ||
+		   breakpoint_chain->section == sal.section))
+		 || ((default_match || (0 == sal.pc))
+		     && breakpoint_chain->source_file != NULL
+		     && sal.symtab != NULL
+	      && STREQ (breakpoint_chain->source_file, sal.symtab->filename)
+		     && breakpoint_chain->line_number == sal.line)))
 
 	{
 	  b1 = breakpoint_chain;
@@ -5599,28 +5638,28 @@ clear_command (arg, from_tty)
 
       ALL_BREAKPOINTS (b)
 
-      while (b->next
-             && b->next->type != bp_none
-             && b->next->type != bp_watchpoint
-             && b->next->type != bp_hardware_watchpoint
-             && b->next->type != bp_read_watchpoint
-             && b->next->type != bp_access_watchpoint
-             && (  ((sal.pc && (b->next->address == sal.pc)) &&
-                   (overlay_debugging == 0 ||
-                    b->next->section == sal.section))
-                || ((default_match || (0 == sal.pc))
-                   && b->next->source_file != NULL
-                   && sal.symtab != NULL
-                   && STREQ (b->next->source_file, sal.symtab->filename)
-                   && b->next->line_number == sal.line)))
+	while (b->next
+	       && b->next->type != bp_none
+	       && b->next->type != bp_watchpoint
+	       && b->next->type != bp_hardware_watchpoint
+	       && b->next->type != bp_read_watchpoint
+	       && b->next->type != bp_access_watchpoint
+	       && (((sal.pc && (b->next->address == sal.pc)) &&
+		    (overlay_debugging == 0 ||
+		     b->next->section == sal.section))
+		   || ((default_match || (0 == sal.pc))
+		       && b->next->source_file != NULL
+		       && sal.symtab != NULL
+		       && STREQ (b->next->source_file, sal.symtab->filename)
+		       && b->next->line_number == sal.line)))
 
 
-	  {
-	    b1 = b->next;
-	    b->next = b1->next;
-	    b1->next = found;
-	    found = b1;
-	  }
+	{
+	  b1 = b->next;
+	  b->next = b1->next;
+	  b1->next = found;
+	  found = b1;
+	}
 
       if (found == 0)
 	{
@@ -5630,19 +5669,23 @@ clear_command (arg, from_tty)
 	    error ("No breakpoint at this line.");
 	}
 
-      if (found->next) from_tty = 1; /* Always report if deleted more than one */
-      if (from_tty) printf_unfiltered ("Deleted breakpoint%s ", found->next ? "s" : "");
+      if (found->next)
+	from_tty = 1;		/* Always report if deleted more than one */
+      if (from_tty)
+	printf_unfiltered ("Deleted breakpoint%s ", found->next ? "s" : "");
       breakpoints_changed ();
       while (found)
 	{
-	  if (from_tty) printf_unfiltered ("%d ", found->number);
+	  if (from_tty)
+	    printf_unfiltered ("%d ", found->number);
 	  b1 = found->next;
 	  delete_breakpoint (found);
 	  found = b1;
 	}
-      if (from_tty) putchar_unfiltered ('\n');
+      if (from_tty)
+	putchar_unfiltered ('\n');
     }
-  free ((PTR)sals.sals);
+  free ((PTR) sals.sals);
 }
 
 /* Delete breakpoint in BS if they are `delete' breakpoints and
@@ -5656,15 +5699,15 @@ breakpoint_auto_delete (bs)
   struct breakpoint *b, *temp;
 
   for (; bs; bs = bs->next)
-    if (bs->breakpoint_at && bs->breakpoint_at->disposition == del 
+    if (bs->breakpoint_at && bs->breakpoint_at->disposition == del
 	&& bs->stop)
       delete_breakpoint (bs->breakpoint_at);
 
   ALL_BREAKPOINTS_SAFE (b, temp)
-    {
-      if (b->disposition == del_at_next_stop)
-	delete_breakpoint (b);
-    }
+  {
+    if (b->disposition == del_at_next_stop)
+      delete_breakpoint (b);
+  }
 }
 
 /* Delete a breakpoint and clean up all traces of it in the data structures. */
@@ -5701,7 +5744,7 @@ delete_breakpoint (bpt)
 
   if (bpt->inserted)
     remove_breakpoint (bpt, mark_uninserted);
-      
+
   if (breakpoint_chain == bpt)
     breakpoint_chain = bpt->next;
 
@@ -5710,14 +5753,14 @@ delete_breakpoint (bpt)
      isn't actually running.  target_enable_exception_callback for a
      null target ops vector gives an undesirable error message, so we
      check here and avoid it. Since currently (1997-09-17) only HP-UX aCC's
-     exceptions are supported in this way, it's OK for now. FIXME */ 
+     exceptions are supported in this way, it's OK for now. FIXME */
   if (ep_is_exception_catchpoint (bpt) && target_has_execution)
     {
       static char message1[] = "Error in deleting catchpoint %d:\n";
       static char message[sizeof (message1) + 30];
       args_for_catchpoint_enable args;
 
-      sprintf (message, message1, bpt->number);	/* Format possible error msg */
+      sprintf (message, message1, bpt->number);		/* Format possible error msg */
       args.kind = bpt->type == bp_catch_catch ? EX_EVENT_CATCH : EX_EVENT_THROW;
       args.enable = 0;
       catch_errors (cover_target_enable_exception_callback, &args,
@@ -5727,10 +5770,10 @@ delete_breakpoint (bpt)
 
   ALL_BREAKPOINTS (b)
     if (b->next == bpt)
-      {
-	b->next = bpt->next;
-	break;
-      }
+    {
+      b->next = bpt->next;
+      break;
+    }
 
   /* Before turning off the visuals for the bp, check to see that
      there are no other bps at the same address. */
@@ -5739,17 +5782,17 @@ delete_breakpoint (bpt)
       int clearIt;
 
       ALL_BREAKPOINTS (b)
-        {
-          clearIt = (b->address != bpt->address);
-          if (!clearIt)
-            break;
-        }
+      {
+	clearIt = (b->address != bpt->address);
+	if (!clearIt)
+	  break;
+      }
 
       if (clearIt)
-        {
-          TUIDO(((TuiOpaqueFuncPtr)tui_vAllSetHasBreakAt, bpt, 0));
-          TUIDO(((TuiOpaqueFuncPtr)tuiUpdateAllExecInfos));
-        }
+	{
+	  TUIDO (((TuiOpaqueFuncPtr) tui_vAllSetHasBreakAt, bpt, 0));
+	  TUIDO (((TuiOpaqueFuncPtr) tuiUpdateAllExecInfos));
+	}
     }
 
   check_duplicates (bpt->address, bpt->section);
@@ -5770,18 +5813,18 @@ delete_breakpoint (bpt)
 	    && b->enable != disabled
 	    && b->enable != shlib_disabled
 	    && b->enable != call_disabled)
-	  {
-	    int val;
-	    val = target_insert_breakpoint (b->address, b->shadow_contents);
-	    if (val != 0)
-	      {
-		target_terminal_ours_for_output ();
-		fprintf_unfiltered (gdb_stderr, "Cannot insert breakpoint %d:\n", b->number);
-		memory_error (val, b->address);	/* which bombs us out */
-	      }
-	    else
-	      b->inserted = 1;
-	  }
+	{
+	  int val;
+	  val = target_insert_breakpoint (b->address, b->shadow_contents);
+	  if (val != 0)
+	    {
+	      target_terminal_ours_for_output ();
+	      fprintf_unfiltered (gdb_stderr, "Cannot insert breakpoint %d:\n", b->number);
+	      memory_error (val, b->address);	/* which bombs us out */
+	    }
+	  else
+	    b->inserted = 1;
+	}
     }
 
   free_command_lines (&bpt->commands);
@@ -5826,7 +5869,7 @@ delete_breakpoint (bpt)
      bp, we mark it as deleted before freeing its storage. */
   bpt->type = bp_none;
 
-  free ((PTR)bpt);
+  free ((PTR) bpt);
 }
 
 void
@@ -5841,27 +5884,27 @@ delete_command (arg, from_tty)
       int breaks_to_delete = 0;
 
       /* Delete all breakpoints if no argument.
-	 Do not delete internal or call-dummy breakpoints, these
-	 have to be deleted with an explicit breakpoint number argument.  */
-      ALL_BREAKPOINTS (b) 
-	{
-	  if (b->type != bp_call_dummy && 
-              b->type != bp_shlib_event && 
-              b->number >= 0)
-	    breaks_to_delete = 1;
-	}
+         Do not delete internal or call-dummy breakpoints, these
+         have to be deleted with an explicit breakpoint number argument.  */
+      ALL_BREAKPOINTS (b)
+      {
+	if (b->type != bp_call_dummy &&
+	    b->type != bp_shlib_event &&
+	    b->number >= 0)
+	  breaks_to_delete = 1;
+      }
 
       /* Ask user only if there are some breakpoints to delete.  */
       if (!from_tty
 	  || (breaks_to_delete && query ("Delete all breakpoints? ")))
 	{
-	  ALL_BREAKPOINTS_SAFE (b, temp) 
-	    {
-	      if (b->type != bp_call_dummy &&
-                  b->type != bp_shlib_event &&
-                  b->number >= 0)
-		delete_breakpoint (b);
-	    }
+	  ALL_BREAKPOINTS_SAFE (b, temp)
+	  {
+	    if (b->type != bp_call_dummy &&
+		b->type != bp_shlib_event &&
+		b->number >= 0)
+	      delete_breakpoint (b);
+	  }
 	}
     }
   else
@@ -5876,7 +5919,7 @@ static int
 breakpoint_re_set_one (bint)
      PTR bint;
 {
-  struct breakpoint *b = (struct breakpoint *)bint;  /* get past catch_errs */
+  struct breakpoint *b = (struct breakpoint *) bint;	/* get past catch_errs */
   struct value *mark;
   int i;
   struct symtabs_and_lines sals;
@@ -5899,14 +5942,14 @@ breakpoint_re_set_one (bint)
 	  return 0;
 	}
       /* In case we have a problem, disable this breakpoint.  We'll restore
-	 its status if we succeed.  */
+         its status if we succeed.  */
       save_enable = b->enable;
       b->enable = disabled;
 
       set_language (b->language);
       input_radix = b->input_radix;
       s = b->addr_string;
-      sals = decode_line_1 (&s, 1, (struct symtab *)NULL, 0, (char ***)NULL);
+      sals = decode_line_1 (&s, 1, (struct symtab *) NULL, 0, (char ***) NULL);
       for (i = 0; i < sals.nelts; i++)
 	{
 	  resolve_sal_pc (&sals.sals[i]);
@@ -5917,23 +5960,23 @@ breakpoint_re_set_one (bint)
 	    {
 	      s = b->cond_string;
 	      if (b->cond)
-		free ((PTR)b->cond);
+		free ((PTR) b->cond);
 	      b->cond = parse_exp_1 (&s, block_for_pc (sals.sals[i].pc), 0);
 	    }
 
-	  /* We need to re-set the breakpoint if the address changes...*/
+	  /* We need to re-set the breakpoint if the address changes... */
 	  if (b->address != sals.sals[i].pc
-	      /* ...or new and old breakpoints both have source files, and
-		 the source file name or the line number changes...  */
+	  /* ...or new and old breakpoints both have source files, and
+	     the source file name or the line number changes...  */
 	      || (b->source_file != NULL
 		  && sals.sals[i].symtab != NULL
 		  && (!STREQ (b->source_file, sals.sals[i].symtab->filename)
 		      || b->line_number != sals.sals[i].line)
-		  )
-	      /* ...or we switch between having a source file and not having
-		 one.  */
-	      || ((b->source_file == NULL) != (sals.sals[i].symtab == NULL))
 	      )
+	  /* ...or we switch between having a source file and not having
+	     one.  */
+	      || ((b->source_file == NULL) != (sals.sals[i].symtab == NULL))
+	    )
 	    {
 	      if (b->source_file != NULL)
 		free (b->source_file);
@@ -5946,26 +5989,26 @@ breakpoint_re_set_one (bint)
 	      b->line_number = sals.sals[i].line;
 	      b->address = sals.sals[i].pc;
 
-             /* Used to check for duplicates here, but that can
-		cause trouble, as it doesn't check for disable
-                breakpoints. */
+	      /* Used to check for duplicates here, but that can
+	         cause trouble, as it doesn't check for disable
+	         breakpoints. */
 
 	      mention (b);
 
 	      /* Might be better to do this just once per breakpoint_re_set,
-		 rather than once for every breakpoint.  */
+	         rather than once for every breakpoint.  */
 	      breakpoints_changed ();
 	    }
 	  b->section = sals.sals[i].section;
 	  b->enable = save_enable;	/* Restore it, this worked. */
 
 
-          /* Now that this is re-enabled, check_duplicates
+	  /* Now that this is re-enabled, check_duplicates
 	     can be used. */
-          check_duplicates (b->address, b->section);
+	  check_duplicates (b->address, b->section);
 
 	}
-      free ((PTR)sals.sals);
+      free ((PTR) sals.sals);
       break;
 
     case bp_watchpoint:
@@ -5974,15 +6017,15 @@ breakpoint_re_set_one (bint)
     case bp_access_watchpoint:
       innermost_block = NULL;
       /* The issue arises of what context to evaluate this in.  The same
-	 one as when it was set, but what does that mean when symbols have
-	 been re-read?  We could save the filename and functionname, but
-	 if the context is more local than that, the best we could do would
-	 be something like how many levels deep and which index at that
-	 particular level, but that's going to be less stable than filenames
-	 or functionnames.  */
+         one as when it was set, but what does that mean when symbols have
+         been re-read?  We could save the filename and functionname, but
+         if the context is more local than that, the best we could do would
+         be something like how many levels deep and which index at that
+         particular level, but that's going to be less stable than filenames
+         or functionnames.  */
       /* So for now, just use a global context.  */
       if (b->exp)
-	free ((PTR)b->exp);
+	free ((PTR) b->exp);
       b->exp = parse_expression (b->exp_string);
       b->exp_valid_block = innermost_block;
       mark = value_mark ();
@@ -5997,42 +6040,42 @@ breakpoint_re_set_one (bint)
 	{
 	  s = b->cond_string;
 	  if (b->cond)
-	    free ((PTR)b->cond);
-	  b->cond = parse_exp_1 (&s, (struct block *)0, 0);
+	    free ((PTR) b->cond);
+	  b->cond = parse_exp_1 (&s, (struct block *) 0, 0);
 	}
       if (b->enable == enabled)
 	mention (b);
       value_free_to_mark (mark);
       break;
-    case bp_catch_catch:  
-    case bp_catch_throw:  
+    case bp_catch_catch:
+    case bp_catch_throw:
       break;
-    /* We needn't really do anything to reset these, since the mask
-       that requests them is unaffected by e.g., new libraries being
-       loaded. */
+      /* We needn't really do anything to reset these, since the mask
+         that requests them is unaffected by e.g., new libraries being
+         loaded. */
     case bp_catch_fork:
     case bp_catch_vfork:
     case bp_catch_exec:
       break;
- 
+
     default:
       printf_filtered ("Deleting unknown breakpoint type %d\n", b->type);
       /* fall through */
-    /* Delete longjmp breakpoints, they will be reset later by
-       breakpoint_re_set.  */
+      /* Delete longjmp breakpoints, they will be reset later by
+         breakpoint_re_set.  */
     case bp_longjmp:
     case bp_longjmp_resume:
       delete_breakpoint (b);
       break;
 
-    /* This breakpoint is special, it's set up when the inferior
-       starts and we really don't want to touch it.  */
+      /* This breakpoint is special, it's set up when the inferior
+         starts and we really don't want to touch it.  */
     case bp_shlib_event:
 
-    /* Keep temporary breakpoints, which can be encountered when we step
-       over a dlopen call and SOLIB_ADD is resetting the breakpoints.
-       Otherwise these should have been blown away via the cleanup chain
-       or by breakpoint_init_inferior when we rerun the executable.  */
+      /* Keep temporary breakpoints, which can be encountered when we step
+         over a dlopen call and SOLIB_ADD is resetting the breakpoints.
+         Otherwise these should have been blown away via the cleanup chain
+         or by breakpoint_init_inferior when we rerun the executable.  */
     case bp_until:
     case bp_finish:
     case bp_watchpoint_scope:
@@ -6052,15 +6095,15 @@ breakpoint_re_set ()
   enum language save_language;
   int save_input_radix;
   static char message1[] = "Error in re-setting breakpoint %d:\n";
-  char message[sizeof (message1) + 30 /* slop */];
-  
+  char message[sizeof (message1) + 30 /* slop */ ];
+
   save_language = current_language->la_language;
   save_input_radix = input_radix;
   ALL_BREAKPOINTS_SAFE (b, temp)
-    {
-      sprintf (message, message1, b->number);	/* Format possible error msg */
-      catch_errors (breakpoint_re_set_one, b, message, RETURN_MASK_ALL);
-    }
+  {
+    sprintf (message, message1, b->number);	/* Format possible error msg */
+    catch_errors (breakpoint_re_set_one, b, message, RETURN_MASK_ALL);
+  }
   set_language (save_language);
   input_radix = save_input_radix;
 
@@ -6090,12 +6133,12 @@ breakpoint_re_set ()
    - Else, reset it to the current thread for inferior_pid. */
 void
 breakpoint_re_set_thread (b)
-  struct breakpoint *  b;
+     struct breakpoint *b;
 {
   if (b->thread != -1)
     {
       if (in_thread_list (inferior_pid))
-        b->thread = pid_to_thread_id (inferior_pid);
+	b->thread = pid_to_thread_id (inferior_pid);
     }
 }
 
@@ -6110,22 +6153,22 @@ set_ignore_count (bptnum, count, from_tty)
 
   ALL_BREAKPOINTS (b)
     if (b->number == bptnum)
-      {
-	b->ignore_count = count;
-	if (!from_tty)
-	  return;
-	else if (count == 0)
-	  printf_filtered ("Will stop next time breakpoint %d is reached.",
-			   bptnum);
-	else if (count == 1)
-	  printf_filtered ("Will ignore next crossing of breakpoint %d.",
-			   bptnum);
-	else
-	  printf_filtered ("Will ignore next %d crossings of breakpoint %d.",
-		  count, bptnum);
-	breakpoints_changed ();
+    {
+      b->ignore_count = count;
+      if (!from_tty)
 	return;
-      }
+      else if (count == 0)
+	printf_filtered ("Will stop next time breakpoint %d is reached.",
+			 bptnum);
+      else if (count == 1)
+	printf_filtered ("Will ignore next crossing of breakpoint %d.",
+			 bptnum);
+      else
+	printf_filtered ("Will ignore next %d crossings of breakpoint %d.",
+			 count, bptnum);
+      breakpoints_changed ();
+      return;
+    }
 
   error ("No breakpoint number %d.", bptnum);
 }
@@ -6152,7 +6195,7 @@ ignore_command (args, from_tty)
 
   if (p == 0)
     error_no_arg ("a breakpoint number");
-  
+
   num = get_number (&p);
 
   if (*p == 0)
@@ -6184,18 +6227,18 @@ map_breakpoint_numbers (args, function)
   while (*p)
     {
       p1 = p;
-      
+
       num = get_number (&p1);
 
       ALL_BREAKPOINTS (b)
 	if (b->number == num)
-	  {
-	    struct breakpoint *related_breakpoint = b->related_breakpoint;
-	    function (b);
-	    if (related_breakpoint)
-	      function (related_breakpoint);
-	    goto win;
-	  }
+	{
+	  struct breakpoint *related_breakpoint = b->related_breakpoint;
+	  function (b);
+	  if (related_breakpoint)
+	    function (related_breakpoint);
+	  goto win;
+	}
       printf_unfiltered ("No breakpoint number %d.\n", num);
     win:
       p = p1;
@@ -6230,27 +6273,27 @@ disable_command (args, from_tty)
   if (args == 0)
     ALL_BREAKPOINTS (bpt)
       switch (bpt->type)
-	{
-        case bp_none:
-          warning ("attempted to disable apparently deleted breakpoint #%d?\n", bpt->number);
-          continue;
-	case bp_breakpoint:
-        case bp_catch_load:
-        case bp_catch_unload:
-        case bp_catch_fork:
-        case bp_catch_vfork:
-        case bp_catch_exec:
-	case bp_catch_catch:
-	case bp_catch_throw:
-        case bp_hardware_breakpoint:
-        case bp_watchpoint:
-        case bp_hardware_watchpoint:
-        case bp_read_watchpoint:
-        case bp_access_watchpoint:
-	  disable_breakpoint (bpt);
-	default:
-	  continue;
-	}
+      {
+      case bp_none:
+	warning ("attempted to disable apparently deleted breakpoint #%d?\n", bpt->number);
+	continue;
+      case bp_breakpoint:
+      case bp_catch_load:
+      case bp_catch_unload:
+      case bp_catch_fork:
+      case bp_catch_vfork:
+      case bp_catch_exec:
+      case bp_catch_catch:
+      case bp_catch_throw:
+      case bp_hardware_breakpoint:
+      case bp_watchpoint:
+      case bp_hardware_watchpoint:
+      case bp_read_watchpoint:
+      case bp_access_watchpoint:
+	disable_breakpoint (bpt);
+      default:
+	continue;
+      }
   else
     map_breakpoint_numbers (args, disable_breakpoint);
 }
@@ -6268,13 +6311,13 @@ do_enable_breakpoint (bpt, disposition)
   if (bpt->type == bp_hardware_breakpoint)
     {
       int i;
-      i = hw_breakpoint_used_count();
-      target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT(
-		bp_hardware_breakpoint, i+1, 0);
+      i = hw_breakpoint_used_count ();
+      target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT (
+					  bp_hardware_breakpoint, i + 1, 0);
       if (target_resources_ok == 0)
-        error ("No hardware breakpoint support in the target.");
+	error ("No hardware breakpoint support in the target.");
       else if (target_resources_ok < 0)
-        error ("Hardware breakpoints used exceeds limit.");
+	error ("Hardware breakpoints used exceeds limit.");
     }
 
   bpt->enable = enabled;
@@ -6289,11 +6332,11 @@ do_enable_breakpoint (bpt, disposition)
 	{
 	  struct frame_info *fr =
 
-          /* Ensure that we have the current frame.  Else, this
-             next query may pessimistically be answered as, "No,
-             not within current scope". */
-          get_current_frame ();
-          fr = find_frame_addr_in_frame_chain (bpt->watchpoint_frame);
+	  /* Ensure that we have the current frame.  Else, this
+	     next query may pessimistically be answered as, "No,
+	     not within current scope". */
+	  get_current_frame ();
+	  fr = find_frame_addr_in_frame_chain (bpt->watchpoint_frame);
 	  if (fr == NULL)
 	    {
 	      printf_filtered ("\
@@ -6316,28 +6359,28 @@ is valid is not currently in scope.\n", bpt->number);
 	value_fetch_lazy (bpt->val);
 
       if (bpt->type == bp_hardware_watchpoint ||
-           bpt->type == bp_read_watchpoint ||
-           bpt->type == bp_access_watchpoint)
-      {
-        int i = hw_watchpoint_used_count (bpt->type, &other_type_used);
-        int mem_cnt = can_use_hardware_watchpoint (bpt->val);
-
-        /* Hack around 'unused var' error for some targets here */
-        (void) mem_cnt, i;
-        target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT(
-                bpt->type, i + mem_cnt, other_type_used);
-        /* we can consider of type is bp_hardware_watchpoint, convert to 
-	   bp_watchpoint in the following condition */
-        if (target_resources_ok < 0)
-	  {
-             printf_filtered("\
+	  bpt->type == bp_read_watchpoint ||
+	  bpt->type == bp_access_watchpoint)
+	{
+	  int i = hw_watchpoint_used_count (bpt->type, &other_type_used);
+	  int mem_cnt = can_use_hardware_watchpoint (bpt->val);
+
+	  /* Hack around 'unused var' error for some targets here */
+	  (void) mem_cnt, i;
+	  target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT (
+				   bpt->type, i + mem_cnt, other_type_used);
+	  /* we can consider of type is bp_hardware_watchpoint, convert to 
+	     bp_watchpoint in the following condition */
+	  if (target_resources_ok < 0)
+	    {
+	      printf_filtered ("\
 Cannot enable watchpoint %d because target watch resources\n\
 have been allocated for other watchpoints.\n", bpt->number);
-	     bpt->enable = disabled;
-	     value_free_to_mark (mark);
-	     return;
-          }
-      }
+	      bpt->enable = disabled;
+	      value_free_to_mark (mark);
+	      return;
+	    }
+	}
 
       if (save_selected_frame_level >= 0)
 	select_and_print_frame (save_selected_frame, save_selected_frame_level);
@@ -6368,27 +6411,27 @@ enable_command (args, from_tty)
   if (args == 0)
     ALL_BREAKPOINTS (bpt)
       switch (bpt->type)
-	{
-        case bp_none:
-          warning ("attempted to enable apparently deleted breakpoint #%d?\n", bpt->number);
-          continue;
-	case bp_breakpoint:
-        case bp_catch_load:
-        case bp_catch_unload:
-        case bp_catch_fork:
-        case bp_catch_vfork:
-        case bp_catch_exec:
-	case bp_catch_catch:
-	case bp_catch_throw:
-	case bp_hardware_breakpoint:
-	case bp_watchpoint:
-	case bp_hardware_watchpoint:
-	case bp_read_watchpoint:
-	case bp_access_watchpoint:
-	  enable_breakpoint (bpt);
-	default:
-	  continue;
-	}
+      {
+      case bp_none:
+	warning ("attempted to enable apparently deleted breakpoint #%d?\n", bpt->number);
+	continue;
+      case bp_breakpoint:
+      case bp_catch_load:
+      case bp_catch_unload:
+      case bp_catch_fork:
+      case bp_catch_vfork:
+      case bp_catch_exec:
+      case bp_catch_catch:
+      case bp_catch_throw:
+      case bp_hardware_breakpoint:
+      case bp_watchpoint:
+      case bp_hardware_watchpoint:
+      case bp_read_watchpoint:
+      case bp_access_watchpoint:
+	enable_breakpoint (bpt);
+      default:
+	continue;
+      }
   else
     map_breakpoint_numbers (args, enable_breakpoint);
 }
@@ -6438,10 +6481,10 @@ decode_line_spec_1 (string, funfirstline)
   if (default_breakpoint_valid)
     sals = decode_line_1 (&string, funfirstline,
 			  default_breakpoint_symtab, default_breakpoint_line,
-			  (char ***)NULL);
+			  (char ***) NULL);
   else
     sals = decode_line_1 (&string, funfirstline,
-			  (struct symtab *)NULL, 0, (char ***)NULL);
+			  (struct symtab *) NULL, 0, (char ***) NULL);
   if (*string)
     error ("Junk at end of line specification: %s", string);
   return sals;
@@ -6461,7 +6504,7 @@ _initialize_breakpoint ()
 	   "Set ignore-count of breakpoint number N to COUNT.\n\
 Usage is `ignore N COUNT'.");
   if (xdb_commands)
-    add_com_alias("bc", "ignore", class_breakpoint, 1);
+    add_com_alias ("bc", "ignore", class_breakpoint, 1);
 
   add_com ("commands", class_breakpoint, commands_command,
 	   "Set commands to be executed when a breakpoint is hit.\n\
@@ -6482,8 +6525,8 @@ expression to be evaluated whenever breakpoint N is reached.  ");
 Like \"break\" except the breakpoint is only temporary,\n\
 so it will be deleted when hit.  Equivalent to \"break\" followed\n\
 by using \"enable delete\" on the breakpoint number.");
-  add_com("txbreak", class_breakpoint, tbreak_at_finish_command,
-          "Set temporary breakpoint at procedure exit.  Either there should\n\
+  add_com ("txbreak", class_breakpoint, tbreak_at_finish_command,
+	   "Set temporary breakpoint at procedure exit.  Either there should\n\
 be no argument or the argument must be a depth.\n");
 
   add_com ("hbreak", class_breakpoint, hbreak_command,
@@ -6504,8 +6547,8 @@ This is used to cancel the effect of the \"disable\" command.\n\
 With a subcommand you can enable temporarily.",
 		  &enablelist, "enable ", 1, &cmdlist);
   if (xdb_commands)
-      add_com("ab", class_breakpoint, enable_command,
-		      "Enable some breakpoints.\n\
+    add_com ("ab", class_breakpoint, enable_command,
+	     "Enable some breakpoints.\n\
 Give breakpoint numbers (separated by spaces) as arguments.\n\
 With no subcommand, breakpoints are enabled until you command otherwise.\n\
 This is used to cancel the effect of the \"disable\" command.\n\
@@ -6514,11 +6557,11 @@ With a subcommand you can enable temporarily.");
   add_com_alias ("en", "enable", class_breakpoint, 1);
 
   add_abbrev_prefix_cmd ("breakpoints", class_breakpoint, enable_command,
-		  "Enable some breakpoints.\n\
+			 "Enable some breakpoints.\n\
 Give breakpoint numbers (separated by spaces) as arguments.\n\
 This is used to cancel the effect of the \"disable\" command.\n\
 May be abbreviated to simply \"enable\".\n",
-		  &enablebreaklist, "enable breakpoints ", 1, &enablelist);
+		   &enablebreaklist, "enable breakpoints ", 1, &enablelist);
 
   add_cmd ("once", no_class, enable_once_command,
 	   "Enable breakpoints for one hit.  Give breakpoint numbers.\n\
@@ -6541,7 +6584,7 @@ If a breakpoint is hit while enabled in this fashion, it becomes disabled.",
 	   &enablelist);
 
   add_prefix_cmd ("disable", class_breakpoint, disable_command,
-	   "Disable some breakpoints.\n\
+		  "Disable some breakpoints.\n\
 Arguments are breakpoint numbers with spaces in between.\n\
 To disable all breakpoints, give no argument.\n\
 A disabled breakpoint is not forgotten, but has no effect until reenabled.",
@@ -6549,8 +6592,8 @@ A disabled breakpoint is not forgotten, but has no effect until reenabled.",
   add_com_alias ("dis", "disable", class_breakpoint, 1);
   add_com_alias ("disa", "disable", class_breakpoint, 1);
   if (xdb_commands)
-    add_com("sb", class_breakpoint, disable_command,
-	        "Disable some breakpoints.\n\
+    add_com ("sb", class_breakpoint, disable_command,
+	     "Disable some breakpoints.\n\
 Arguments are breakpoint numbers with spaces in between.\n\
 To disable all breakpoints, give no argument.\n\
 A disabled breakpoint is not forgotten, but has no effect until reenabled.");
@@ -6564,7 +6607,7 @@ This command may be abbreviated \"disable\".",
 	   &disablelist);
 
   add_prefix_cmd ("delete", class_breakpoint, delete_command,
-	   "Delete some breakpoints or auto-display expressions.\n\
+		  "Delete some breakpoints or auto-display expressions.\n\
 Arguments are breakpoint numbers with spaces in between.\n\
 To delete all breakpoints, give no argument.\n\
 \n\
@@ -6574,7 +6617,7 @@ The \"unset\" command is also an alias for \"delete\".",
   add_com_alias ("d", "delete", class_breakpoint, 1);
   if (xdb_commands)
     add_com ("db", class_breakpoint, delete_command,
-    	   "Delete some breakpoints.\n\
+	     "Delete some breakpoints.\n\
 Arguments are breakpoint numbers with spaces in between.\n\
 To delete all breakpoints, give no argument.\n");
 
@@ -6591,7 +6634,7 @@ Argument may be line number, function name, or \"*\" and an address.\n\
 If line number is specified, all breakpoints in that line are cleared.\n\
 If function is specified, breakpoints at beginning of function are cleared.\n\
 If an address is specified, breakpoints at that address are cleared.\n\n",
-"With no argument, clears all breakpoints in the line that the selected frame\n\
+		   "With no argument, clears all breakpoints in the line that the selected frame\n\
 is executing in.\n\
 \n\
 See also the \"delete\" command which clears breakpoints by number.", NULL));
@@ -6602,7 +6645,7 @@ Argument may be line number, function name, or \"*\" and an address.\n\
 If line number is specified, break at start of code for that line.\n\
 If function is specified, break at start of code for that function.\n\
 If an address is specified, break at that exact address.\n",
-"With no arg, uses current execution address of selected stack frame.\n\
+		   "With no arg, uses current execution address of selected stack frame.\n\
 This is useful for breaking on return to a stack frame.\n\
 \n\
 Multiple breakpoints at one place are permitted, and useful if conditional.\n\
@@ -6613,13 +6656,13 @@ Do \"help breakpoints\" for info on other commands dealing with breakpoints.", N
   add_com_alias ("bre", "break", class_run, 1);
   add_com_alias ("brea", "break", class_run, 1);
 
-  add_com("xbreak", class_breakpoint, break_at_finish_command,
-          concat("Set breakpoint at procedure exit. \n\
+  add_com ("xbreak", class_breakpoint, break_at_finish_command,
+	   concat ("Set breakpoint at procedure exit. \n\
 Argument may be function name, or \"*\" and an address.\n\
 If function is specified, break at end of code for that function.\n\
 If an address is specified, break at the end of the function that contains \n\
 that exact address.\n",
-"With no arg, uses current execution address of selected stack frame.\n\
+		   "With no arg, uses current execution address of selected stack frame.\n\
 This is useful for breaking on return to a stack frame.\n\
 \n\
 Multiple breakpoints at one place are permitted, and useful if conditional.\n\
@@ -6635,21 +6678,21 @@ Do \"help breakpoints\" for info on other commands dealing with breakpoints.", N
       add_com_alias ("ba", "break", class_breakpoint, 1);
       add_com_alias ("bu", "ubreak", class_breakpoint, 1);
       add_com ("bx", class_breakpoint, break_at_finish_at_depth_command,
-          "Set breakpoint at procedure exit.  Either there should\n\
+	       "Set breakpoint at procedure exit.  Either there should\n\
 be no argument or the argument must be a depth.\n");
     }
 
   if (dbx_commands)
     {
-      add_abbrev_prefix_cmd("stop", class_breakpoint, stop_command, 
-           "Break in function/address or break at a line in the current file.",
-           &stoplist, "stop ", 1, &cmdlist);
-      add_cmd("in", class_breakpoint, stopin_command,
-              "Break in function or address.\n", &stoplist);
-      add_cmd("at", class_breakpoint, stopat_command,
-              "Break at a line in the current file.\n", &stoplist);
-      add_com("status", class_info, breakpoints_info, 
-	    concat ("Status of user-settable breakpoints, or breakpoint number NUMBER.\n\
+      add_abbrev_prefix_cmd ("stop", class_breakpoint, stop_command,
+	"Break in function/address or break at a line in the current file.",
+			     &stoplist, "stop ", 1, &cmdlist);
+      add_cmd ("in", class_breakpoint, stopin_command,
+	       "Break in function or address.\n", &stoplist);
+      add_cmd ("at", class_breakpoint, stopat_command,
+	       "Break at a line in the current file.\n", &stoplist);
+      add_com ("status", class_info, breakpoints_info,
+	       concat ("Status of user-settable breakpoints, or breakpoint number NUMBER.\n\
 The \"Type\" column indicates one of:\n\
 \tbreakpoint     - normal breakpoint\n\
 \twatchpoint     - watchpoint\n\
@@ -6657,7 +6700,7 @@ The \"Disp\" column contains one of \"keep\", \"del\", or \"dis\" to indicate\n\
 the disposition of the breakpoint after it gets hit.  \"dis\" means that the\n\
 breakpoint will be disabled.  The \"Address\" and \"What\" columns indicate the\n\
 address and file/line number respectively.\n\n",
-"Convenience variable \"$_\" and default examine address for \"x\"\n\
+		       "Convenience variable \"$_\" and default examine address for \"x\"\n\
 are set to the address of the last breakpoint listed.\n\n\
 Convenience variable \"$bpnum\" contains the number of the last\n\
 breakpoint set.", NULL));
@@ -6672,14 +6715,14 @@ The \"Disp\" column contains one of \"keep\", \"del\", or \"dis\" to indicate\n\
 the disposition of the breakpoint after it gets hit.  \"dis\" means that the\n\
 breakpoint will be disabled.  The \"Address\" and \"What\" columns indicate the\n\
 address and file/line number respectively.\n\n",
-"Convenience variable \"$_\" and default examine address for \"x\"\n\
+		    "Convenience variable \"$_\" and default examine address for \"x\"\n\
 are set to the address of the last breakpoint listed.\n\n\
 Convenience variable \"$bpnum\" contains the number of the last\n\
 breakpoint set.", NULL));
 
   if (xdb_commands)
-    add_com("lb", class_breakpoint, breakpoints_info,
-	    concat ("Status of user-settable breakpoints, or breakpoint number NUMBER.\n\
+    add_com ("lb", class_breakpoint, breakpoints_info,
+	     concat ("Status of user-settable breakpoints, or breakpoint number NUMBER.\n\
 The \"Type\" column indicates one of:\n\
 \tbreakpoint     - normal breakpoint\n\
 \twatchpoint     - watchpoint\n\
@@ -6687,13 +6730,13 @@ The \"Disp\" column contains one of \"keep\", \"del\", or \"dis\" to indicate\n\
 the disposition of the breakpoint after it gets hit.  \"dis\" means that the\n\
 breakpoint will be disabled.  The \"Address\" and \"What\" columns indicate the\n\
 address and file/line number respectively.\n\n",
-"Convenience variable \"$_\" and default examine address for \"x\"\n\
+		     "Convenience variable \"$_\" and default examine address for \"x\"\n\
 are set to the address of the last breakpoint listed.\n\n\
 Convenience variable \"$bpnum\" contains the number of the last\n\
 breakpoint set.", NULL));
 
   add_cmd ("breakpoints", class_maintenance, maintenance_info_breakpoints,
-	    concat ("Status of all breakpoints, or breakpoint number NUMBER.\n\
+	   concat ("Status of all breakpoints, or breakpoint number NUMBER.\n\
 The \"Type\" column indicates one of:\n\
 \tbreakpoint     - normal breakpoint\n\
 \twatchpoint     - watchpoint\n\
@@ -6701,18 +6744,18 @@ The \"Type\" column indicates one of:\n\
 \tlongjmp resume - internal breakpoint at the target of longjmp()\n\
 \tuntil          - internal breakpoint used by the \"until\" command\n\
 \tfinish         - internal breakpoint used by the \"finish\" command\n",
-"The \"Disp\" column contains one of \"keep\", \"del\", or \"dis\" to indicate\n\
+		   "The \"Disp\" column contains one of \"keep\", \"del\", or \"dis\" to indicate\n\
 the disposition of the breakpoint after it gets hit.  \"dis\" means that the\n\
 breakpoint will be disabled.  The \"Address\" and \"What\" columns indicate the\n\
 address and file/line number respectively.\n\n",
-"Convenience variable \"$_\" and default examine address for \"x\"\n\
+		   "Convenience variable \"$_\" and default examine address for \"x\"\n\
 are set to the address of the last breakpoint listed.\n\n\
 Convenience variable \"$bpnum\" contains the number of the last\n\
 breakpoint set.", NULL),
 	   &maintenanceinfolist);
 
   add_com ("catch", class_breakpoint, catch_command,
-         "Set catchpoints to catch events.\n\
+	   "Set catchpoints to catch events.\n\
 Raised signals may be caught:\n\
 \tcatch signal              - all signals\n\
 \tcatch signal <signame>    - a particular signal\n\
@@ -6745,15 +6788,15 @@ C++ exceptions may be caught:\n\
 Do \"help set follow-fork-mode\" for info on debugging your program\n\
 after a fork or vfork is caught.\n\n\
 Do \"help breakpoints\" for info on other commands dealing with breakpoints.");
- 
+
   add_com ("tcatch", class_breakpoint, tcatch_command,
-         "Set temporary catchpoints to catch events.\n\
+	   "Set temporary catchpoints to catch events.\n\
 Args like \"catch\" command.\n\
 Like \"catch\" except the catchpoint is only temporary,\n\
 so it will be deleted when hit.  Equivalent to \"catch\" followed\n\
 by using \"enable delete\" on the catchpoint number.");
- 
-add_com ("watch", class_breakpoint, watch_command,
+
+  add_com ("watch", class_breakpoint, watch_command,
 
 	   "Set a watchpoint for an expression.\n\
 A watchpoint stops execution of your program whenever the value of\n\
@@ -6774,13 +6817,13 @@ an expression is either read or written.");
 
 
   c = add_set_cmd ("can-use-hw-watchpoints", class_support, var_zinteger,
-                   (char *) &can_use_hw_watchpoints,
-                   "Set debugger's willingness to use watchpoint hardware.\n\
+		   (char *) &can_use_hw_watchpoints,
+		   "Set debugger's willingness to use watchpoint hardware.\n\
 If zero, gdb will not use hardware for new watchpoints, even if\n\
 such is available.  (However, any hardware watchpoints that were\n\
 created before setting this to nonzero, will continue to use watchpoint\n\
 hardware.)",
-               &setlist);
+		   &setlist);
   add_show_from_set (c, &showlist);
 
   can_use_hw_watchpoints = 1;