* gdb.fortran/types.exp: Escape brackets in expect patterns

[binutils.git] / gdb / infcmd.c

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index f387ba0308cbe3c668a96e27374489eaaaab52d1..eddd89a228c8bf2d6227cfe9c5093c12838a8cf3 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1,29 +1,28 @@
-/* Memory-access and commands for inferior process, for GDB.
-   Copyright (C) 1986, 1987, 1988, 1989 Free Software Foundation, Inc.
+/* Memory-access and commands for "inferior" process, for GDB.
+   Copyright 1986, 1987, 1988, 1989, 1991, 1992, 1995, 1996 Free Software Foundation, Inc.

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

-GDB is free software; you can redistribute it and/or modify
+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
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 1, or (at your option)
-any later version.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.

 
 

-GDB is distributed in the hope that it will be useful,
+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
 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 GDB; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 

-#include <stdio.h>
+#include "defs.h"

 #include <signal.h>
 #include <sys/param.h>
 #include <signal.h>
 #include <sys/param.h>

-#include <string.h>
-#include "defs.h"
-#include "param.h"
+#include "gdb_string.h"

 #include "symtab.h"
 #include "symtab.h"

+#include "gdbtypes.h"

 #include "frame.h"
 #include "inferior.h"
 #include "environ.h"
 #include "frame.h"
 #include "inferior.h"
 #include "environ.h"


@@ -31,10 +30,63 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "target.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "target.h"

+#include "language.h"
+
+static void continue_command PARAMS ((char *, int));
+
+static void until_next_command PARAMS ((int));
+
+static void until_command PARAMS ((char *, int));
+
+static void path_info PARAMS ((char *, int));
+
+static void path_command PARAMS ((char *, int));
+
+static void unset_command PARAMS ((char *, int));
+
+static void float_info PARAMS ((char *, int));
+
+static void detach_command PARAMS ((char *, int));
+
+static void nofp_registers_info PARAMS ((char *, int));
+
+static void all_registers_info PARAMS ((char *, int));
+
+static void registers_info PARAMS ((char *, int));
+
+#if !defined (DO_REGISTERS_INFO)
+static void do_registers_info PARAMS ((int, int));
+#endif
+
+static void unset_environment_command PARAMS ((char *, int));
+
+static void set_environment_command PARAMS ((char *, int));
+
+static void environment_info PARAMS ((char *, int));
+
+static void program_info PARAMS ((char *, int));
+
+static void finish_command PARAMS ((char *, int));
+
+static void signal_command PARAMS ((char *, int));
+
+static void jump_command PARAMS ((char *, int));
+
+static void step_1 PARAMS ((int, int, char *));

 
 

-extern char *sys_siglist[];
+static void nexti_command PARAMS ((char *, int));

 
 

-extern void until_break_command ();    /* breakpoint.c */
+static void stepi_command PARAMS ((char *, int));
+
+static void next_command PARAMS ((char *, int));
+
+static void step_command PARAMS ((char *, int));
+
+static void run_command PARAMS ((char *, int));
+
+#ifdef CALL_DUMMY_BREAKPOINT_OFFSET
+static void breakpoint_auto_delete_contents PARAMS ((PTR));
+#endif

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


@@ -57,16 +109,12 @@ int inferior_pid;
 
 /* Last signal that the inferior received (why it stopped).  */
 
 
 /* Last signal that the inferior received (why it stopped).  */
 

-int stop_signal;
+enum target_signal stop_signal;

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

-/* Stack frame when program stopped.  */
-
-FRAME_ADDR stop_frame_address;
-

 /* Chain containing status of breakpoint(s) that we have stopped at.  */
 
 bpstat stop_bpstat;
 /* Chain containing status of breakpoint(s) that we have stopped at.  */
 
 bpstat stop_bpstat;


@@ -100,9 +148,14 @@ CORE_ADDR step_range_end; /* Exclusive */
    This is how we know when we step into a subroutine call,
    and how to set the frame for the breakpoint used to step out.  */
 
    This is how we know when we step into a subroutine call,
    and how to set the frame for the breakpoint used to step out.  */
 

-FRAME_ADDR step_frame_address;
+CORE_ADDR step_frame_address;
+
+/* Our notion of the current stack pointer.  */
+
+CORE_ADDR step_sp;

 
 /* 1 means step over all subroutine calls.
 
 /* 1 means step over all subroutine calls.

+   0 means don't step over calls (used by stepi).

    -1 means step over calls to undebuggable functions.  */
 
 int step_over_calls;
    -1 means step over calls to undebuggable functions.  */
 
 int step_over_calls;


@@ -118,9 +171,6 @@ int step_multi;
 
 struct environ *inferior_environ;
 
 
 struct environ *inferior_environ;
 

-CORE_ADDR read_pc ();
-void breakpoint_clear_ignore_counts ();
-

 \f
 /* ARGSUSED */
 void
 \f
 /* ARGSUSED */
 void


@@ -143,41 +193,55 @@ run_command (args, from_tty)
 
   dont_repeat ();
 
 
   dont_repeat ();
 

-  if (inferior_pid)
+  if (inferior_pid != 0 && target_has_execution)

     {
       if (
          !query ("The program being debugged has been started already.\n\
 Start it from the beginning? "))
        error ("Program not restarted.");
     {
       if (
          !query ("The program being debugged has been started already.\n\
 Start it from the beginning? "))
        error ("Program not restarted.");

-      target_kill ((char *)0, 0);
+      target_kill ();

     }
 
     }
 

+  clear_breakpoint_hit_counts ();
+

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

-  /* The exec file is re-read every time we do an inferior_died, so
+  /* The exec file is re-read every time we do a generic_mourn_inferior, so

      we just have to worry about the symbol file.  */
   reread_symbols ();
 
      we just have to worry about the symbol file.  */
   reread_symbols ();
 

+  /* We keep symbols from add-symbol-file, on the grounds that the
+     user might want to add some symbols before running the program
+     (right?).  But sometimes (dynamic loading where the user manually
+     introduces the new symbols with add-symbol-file), the code which
+     the symbols describe does not persist between runs.  Currently
+     the user has to manually nuke all symbols between runs if they
+     want them to go away (PR 2207).  This is probably reasonable.  */
+

   if (args)
     {
       char *cmd;
   if (args)
     {
       char *cmd;

-      cmd = concat ("set args ", args, "");
+      cmd = concat ("set args ", args, NULL);

       make_cleanup (free, cmd);
       execute_command (cmd, from_tty);
     }
 
   if (from_tty)
     {
       make_cleanup (free, cmd);
       execute_command (cmd, from_tty);
     }
 
   if (from_tty)
     {

-      printf ("Starting program: %s %s\n",
-             exec_file? exec_file: "", inferior_args);
-      fflush (stdout);
+      puts_filtered("Starting program: ");
+      if (exec_file)
+       puts_filtered(exec_file);
+      puts_filtered(" ");
+      puts_filtered(inferior_args);
+      puts_filtered("\n");
+      gdb_flush (gdb_stdout);

     }
 
   target_create_inferior (exec_file, inferior_args,
                          environ_vector (inferior_environ));
 }
 \f
     }
 
   target_create_inferior (exec_file, inferior_args,
                          environ_vector (inferior_environ));
 }
 \f

-void
+static void

 continue_command (proc_count_exp, from_tty)
      char *proc_count_exp;
      int from_tty;
 continue_command (proc_count_exp, from_tty)
      char *proc_count_exp;
      int from_tty;


@@ -203,26 +267,25 @@ continue_command (proc_count_exp, from_tty)
          /* set_ignore_count prints a message ending with a period.
             So print two spaces before "Continuing.".  */
          if (from_tty)
          /* set_ignore_count prints a message ending with a period.
             So print two spaces before "Continuing.".  */
          if (from_tty)

-           printf ("  ");
+           printf_filtered ("  ");

          num = bpstat_num (&bs);
        }
     }
 
   if (from_tty)
          num = bpstat_num (&bs);
        }
     }
 
   if (from_tty)

-    printf ("Continuing.\n");
+    printf_filtered ("Continuing.\n");

 
   clear_proceed_status ();
 
 
   clear_proceed_status ();
 

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

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

-static void step_1 ();

 
 /* ARGSUSED */
 static void
 step_command (count_string, from_tty)
 
 /* ARGSUSED */
 static void
 step_command (count_string, from_tty)

-     char * count_string;
+     char *count_string;

      int from_tty;
 {
   step_1 (0, 0, count_string);
      int from_tty;
 {
   step_1 (0, 0, count_string);


@@ -233,7 +296,7 @@ step_command (count_string, from_tty)
 /* ARGSUSED */
 static void
 next_command (count_string, from_tty)
 /* ARGSUSED */
 static void
 next_command (count_string, from_tty)

-     char * count_string;
+     char *count_string;

      int from_tty;
 {
   step_1 (1, 0, count_string);
      int from_tty;
 {
   step_1 (1, 0, count_string);


@@ -244,7 +307,7 @@ next_command (count_string, from_tty)
 /* ARGSUSED */
 static void
 stepi_command (count_string, from_tty)
 /* ARGSUSED */
 static void
 stepi_command (count_string, from_tty)

-     char * count_string;
+     char *count_string;

      int from_tty;
 {
   step_1 (0, 1, count_string);
      int from_tty;
 {
   step_1 (0, 1, count_string);


@@ -253,7 +316,7 @@ stepi_command (count_string, from_tty)
 /* ARGSUSED */
 static void
 nexti_command (count_string, from_tty)
 /* ARGSUSED */
 static void
 nexti_command (count_string, from_tty)

-     char * count_string;
+     char *count_string;

      int from_tty;
 {
   step_1 (1, 1, count_string);
      int from_tty;
 {
   step_1 (1, 1, count_string);


@@ -266,51 +329,52 @@ step_1 (skip_subroutines, single_inst, count_string)
      char *count_string;
 {
   register int count = 1;
      char *count_string;
 {
   register int count = 1;

-  FRAME fr;
+  struct frame_info *frame;
+  struct cleanup *cleanups = 0;

 
   ERROR_NO_INFERIOR;
   count = count_string ? parse_and_eval_address (count_string) : 1;
 
 
   ERROR_NO_INFERIOR;
   count = count_string ? parse_and_eval_address (count_string) : 1;
 

+  if (!single_inst || skip_subroutines) /* leave si command alone */
+    {
+      enable_longjmp_breakpoint();
+      cleanups = make_cleanup(disable_longjmp_breakpoint, 0);
+    }
+

   for (; count > 0; count--)
     {
       clear_proceed_status ();
 
   for (; count > 0; count--)
     {
       clear_proceed_status ();
 

-
-      fr = get_current_frame ();
-      if (!fr)                         /* Avoid coredump here.  Why tho? */
+      frame = get_current_frame ();
+      if (!frame)                      /* Avoid coredump here.  Why tho? */

        error ("No current frame");
        error ("No current frame");

-      step_frame_address = FRAME_FP (fr);
+      step_frame_address = FRAME_FP (frame);
+      step_sp = read_sp ();

 
       if (! single_inst)
        {
          find_pc_line_pc_range (stop_pc, &step_range_start, &step_range_end);
          if (step_range_end == 0)
            {
 
       if (! single_inst)
        {
          find_pc_line_pc_range (stop_pc, &step_range_start, &step_range_end);
          if (step_range_end == 0)
            {

-             int misc;
+             char *name;
+             if (find_pc_partial_function (stop_pc, &name, &step_range_start,
+                                           &step_range_end) == 0)
+               error ("Cannot find bounds of current function");

 
 

-             misc = find_pc_misc_function (stop_pc);

              target_terminal_ours ();
              target_terminal_ours ();

-             printf ("Current function has no line number information.\n");
-             fflush (stdout);
-
-             /* No info or after _etext ("Can't happen") */
-             if (misc == -1 || misc == misc_function_count - 1)
-               error ("No data available on pc function.");
-
-             printf ("Single stepping until function exit.\n");
-             fflush (stdout);
-
-             step_range_start = misc_function_vector[misc].address;
-             step_range_end = misc_function_vector[misc + 1].address;
+             printf_filtered ("\
+Single stepping until exit from function %s, \n\
+which has no line number information.\n", name);

            }
        }
       else
        {
            }
        }
       else
        {

-         /* Say we are stepping, but stop after one insn whatever it does.
-            Don't step through subroutine calls even to undebuggable
-            functions.  */
+         /* Say we are stepping, but stop after one insn whatever it does.  */

          step_range_start = step_range_end = 1;
          if (!skip_subroutines)
          step_range_start = step_range_end = 1;
          if (!skip_subroutines)

+           /* It is stepi.
+              Don't step over function calls, not even to functions lacking
+              line numbers.  */

            step_over_calls = 0;
        }
 
            step_over_calls = 0;
        }
 


@@ -318,14 +382,20 @@ step_1 (skip_subroutines, single_inst, count_string)
        step_over_calls = 1;
 
       step_multi = (count > 1);
        step_over_calls = 1;
 
       step_multi = (count > 1);

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

       if (! stop_step)
        break;
       if (! stop_step)
        break;

+
+      /* FIXME: On nexti, this may have already been done (when we hit the
+        step resume break, I think).  Probably this should be moved to
+        wait_for_inferior (near the top).  */

 #if defined (SHIFT_INST_REGS)
 #if defined (SHIFT_INST_REGS)

-      write_register (NNPC_REGNUM, read_register (NPC_REGNUM));
-      write_register (NPC_REGNUM, read_register (PC_REGNUM));
+      SHIFT_INST_REGS();

 #endif
     }
 #endif
     }

+
+  if (!single_inst || skip_subroutines)
+    do_cleanups(cleanups);

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


@@ -338,6 +408,8 @@ jump_command (arg, from_tty)
   register CORE_ADDR addr;
   struct symtabs_and_lines sals;
   struct symtab_and_line sal;
   register CORE_ADDR addr;
   struct symtabs_and_lines sals;
   struct symtab_and_line sal;

+  struct symbol *fn;
+  struct symbol *sfn;

 
   ERROR_NO_INFERIOR;
 
 
   ERROR_NO_INFERIOR;
 


@@ -351,33 +423,37 @@ jump_command (arg, from_tty)
     }
 
   sal = sals.sals[0];
     }
 
   sal = sals.sals[0];

-  free (sals.sals);
+  free ((PTR)sals.sals);

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

-  if (sal.pc == 0)
-    sal.pc = find_line_pc (sal.symtab, sal.line);
-
-  {
-    struct symbol *fn = get_frame_function (get_current_frame ());
-    struct symbol *sfn = find_pc_function (sal.pc);
-    if (fn != 0 && sfn != fn
-       && ! query ("Line %d is not in `%s'.  Jump anyway? ",
-                   sal.line, SYMBOL_NAME (fn)))
-      error ("Not confirmed.");
-  }
+  resolve_sal_pc (&sal);                       /* May error out */

 
 

-  if (sal.pc == 0)
-    error ("No line %d in file \"%s\".", sal.line, sal.symtab->filename);
+  /* See if we are trying to jump to another function. */
+  fn = get_frame_function (get_current_frame ());
+  sfn = find_pc_function (sal.pc);
+  if (fn != NULL && sfn != fn)
+    {
+      if (!query ("Line %d is not in `%s'.  Jump anyway? ", sal.line,
+                 SYMBOL_SOURCE_NAME (fn)))
+       {
+         error ("Not confirmed.");
+         /* NOTREACHED */
+       }
+    }

 
 

-  addr = ADDR_BITS_SET (sal.pc);
+  addr = sal.pc;

 
   if (from_tty)
 
   if (from_tty)

-    printf ("Continuing at 0x%x.\n", addr);
+    {
+      printf_filtered ("Continuing at ");
+      print_address_numeric (addr, 1, gdb_stdout);
+      printf_filtered (".\n");
+    }

 
   clear_proceed_status ();
 
   clear_proceed_status ();

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

 }
 
 /* Continue program giving it specified signal.  */
 }
 
 /* Continue program giving it specified signal.  */


@@ -387,7 +463,7 @@ signal_command (signum_exp, from_tty)
      char *signum_exp;
      int from_tty;
 {
      char *signum_exp;
      int from_tty;
 {

-  register int signum;
+  enum target_signal oursig;

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


@@ -395,15 +471,53 @@ signal_command (signum_exp, from_tty)
   if (!signum_exp)
     error_no_arg ("signal number");
 
   if (!signum_exp)
     error_no_arg ("signal number");
 

-  signum = parse_and_eval_address (signum_exp);
+  /* It would be even slicker to make signal names be valid expressions,
+     (the type could be "enum $signal" or some such), then the user could
+     assign them to convenience variables.  */
+  oursig = target_signal_from_name (signum_exp);
+
+  if (oursig == TARGET_SIGNAL_UNKNOWN)
+    {
+      /* No, try numeric.  */
+      int num = parse_and_eval_address (signum_exp);
+
+      if (num == 0)
+       oursig = TARGET_SIGNAL_0;
+      else
+       oursig = target_signal_from_command (num);
+    }

 
   if (from_tty)
 
   if (from_tty)

-    printf ("Continuing with signal %d.\n", signum);
+    {
+      if (oursig == TARGET_SIGNAL_0)
+       printf_filtered ("Continuing with no signal.\n");
+      else
+       printf_filtered ("Continuing with signal %s.\n",
+                        target_signal_to_name (oursig));
+    }

 
   clear_proceed_status ();
 
   clear_proceed_status ();

-  proceed (stop_pc, signum, 0);
+  /* "signal 0" should not get stuck if we are stopped at a breakpoint.
+     FIXME: Neither should "signal foo" but when I tried passing
+     (CORE_ADDR)-1 unconditionally I got a testsuite failure which I haven't
+     tried to track down yet.  */
+  proceed (oursig == TARGET_SIGNAL_0 ? (CORE_ADDR) -1 : stop_pc, oursig, 0);
+}
+
+/* Call breakpoint_auto_delete on the current contents of the bpstat
+   pointed to by arg (which is really a bpstat *).  */
+
+#ifdef CALL_DUMMY_BREAKPOINT_OFFSET
+
+static void
+breakpoint_auto_delete_contents (arg)
+     PTR arg;
+{
+  breakpoint_auto_delete (*(bpstat *)arg);

 }
 
 }
 

+#endif /* CALL_DUMMY_BREAKPOINT_OFFSET */
+

 /* Execute a "stack dummy", a piece of code stored in the stack
    by the debugger to be executed in the inferior.
 
 /* Execute a "stack dummy", a piece of code stored in the stack
    by the debugger to be executed in the inferior.
 


@@ -416,38 +530,78 @@ signal_command (signum_exp, from_tty)
 
    The dummy's frame is automatically popped whenever that break is hit.
    If that is the first time the program stops, run_stack_dummy
 
    The dummy's frame is automatically popped whenever that break is hit.
    If that is the first time the program stops, run_stack_dummy

-   returns to its caller with that frame already gone.
-   Otherwise, the caller never gets returned to.  */
+   returns to its caller with that frame already gone and returns 0.
+   Otherwise, run_stack-dummy returns 1 (the frame will eventually be popped
+   when we do hit that breakpoint).  */

 
 

-/* 4 => return instead of letting the stack dummy run.  */
+/* DEBUG HOOK:  4 => return instead of letting the stack dummy run.  */

 
 static int stack_dummy_testing = 0;
 
 
 static int stack_dummy_testing = 0;
 

-void
+int

 run_stack_dummy (addr, buffer)
      CORE_ADDR addr;
      char buffer[REGISTER_BYTES];
 {
 run_stack_dummy (addr, buffer)
      CORE_ADDR addr;
      char buffer[REGISTER_BYTES];
 {

+  struct cleanup *old_cleanups = make_cleanup (null_cleanup, 0);
+

   /* Now proceed, having reached the desired place.  */
   clear_proceed_status ();
   if (stack_dummy_testing & 4)
     {
       POP_FRAME;
   /* Now proceed, having reached the desired place.  */
   clear_proceed_status ();
   if (stack_dummy_testing & 4)
     {
       POP_FRAME;

-      return;
+      return(0);

     }
     }

+#ifdef CALL_DUMMY_BREAKPOINT_OFFSET
+  {
+    struct breakpoint *bpt;
+    struct symtab_and_line sal;
+
+#if CALL_DUMMY_LOCATION != AT_ENTRY_POINT
+    sal.pc = addr - CALL_DUMMY_START_OFFSET + CALL_DUMMY_BREAKPOINT_OFFSET;
+#else
+    sal.pc = CALL_DUMMY_ADDRESS ();
+#endif
+    sal.symtab = NULL;
+    sal.line = 0;
+
+    /* Set up a FRAME for the dummy frame so we can pass it to
+       set_momentary_breakpoint.  We need to give the breakpoint a
+       frame in case there is only one copy of the dummy (e.g.
+       CALL_DUMMY_LOCATION == AFTER_TEXT_END).  */
+    flush_cached_frames ();
+    set_current_frame (create_new_frame (read_fp (), sal.pc));
+
+    /* If defined, CALL_DUMMY_BREAKPOINT_OFFSET is where we need to put
+       a breakpoint instruction.  If not, the call dummy already has the
+       breakpoint instruction in it.
+
+       addr is the address of the call dummy plus the CALL_DUMMY_START_OFFSET,
+       so we need to subtract the CALL_DUMMY_START_OFFSET.  */
+    bpt = set_momentary_breakpoint (sal,
+                                   get_current_frame (),
+                                   bp_call_dummy);
+    bpt->disposition = del;
+
+    /* If all error()s out of proceed ended up calling normal_stop (and
+       perhaps they should; it already does in the special case of error
+       out of resume()), then we wouldn't need this.  */
+    make_cleanup (breakpoint_auto_delete_contents, &stop_bpstat);
+  }
+#endif /* CALL_DUMMY_BREAKPOINT_OFFSET.  */
+

   proceed_to_finish = 1;       /* We want stop_registers, please... */
   proceed_to_finish = 1;       /* We want stop_registers, please... */

-  proceed (addr, 0, 0);
+  proceed (addr, TARGET_SIGNAL_0, 0);
+
+  discard_cleanups (old_cleanups);

 
   if (!stop_stack_dummy)
 
   if (!stop_stack_dummy)

-    /* This used to say
-       "Cannot continue previously requested operation".  */
-    error ("\
-The program being debugged stopped while in a function called from GDB.\n\
-The expression which contained the function call has been discarded.");
+    return 1;

 
   /* On return, the stack dummy has been popped already.  */
 
 
   /* On return, the stack dummy has been popped already.  */
 

-  bcopy (stop_registers, buffer, sizeof stop_registers);
+  memcpy (buffer, stop_registers, sizeof stop_registers);
+  return 0;

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


@@ -455,15 +609,15 @@ The expression which contained the function call has been discarded.");
 
    Note that eventually this command should probably be changed so
    that only source lines are printed out when we hit the breakpoint
 
    Note that eventually this command should probably be changed so
    that only source lines are printed out when we hit the breakpoint

-   we set.  I'm going to postpone this until after a hopeful rewrite
-   of wait_for_inferior and the proceed status code. -- randy */
+   we set.  This may involve changes to wait_for_inferior and the
+   proceed status code.  */

 
 /* ARGSUSED */
 
 /* ARGSUSED */

-void
+static void

 until_next_command (from_tty)
      int from_tty;
 {
 until_next_command (from_tty)
      int from_tty;
 {

-  FRAME frame;
+  struct frame_info *frame;

   CORE_ADDR pc;
   struct symbol *func;
   struct symtab_and_line sal;
   CORE_ADDR pc;
   struct symbol *func;
   struct symtab_and_line sal;


@@ -481,12 +635,12 @@ until_next_command (from_tty)
   
   if (!func)
     {
   
   if (!func)
     {

-      int misc_func = find_pc_misc_function (pc);
+      struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (pc);

       
       

-      if (misc_func != -1)
+      if (msymbol == NULL)

        error ("Execution is not within a known function.");
       
        error ("Execution is not within a known function.");
       

-      step_range_start = misc_function_vector[misc_func].address;
+      step_range_start = SYMBOL_VALUE_ADDRESS (msymbol);

       step_range_end = pc;
     }
   else
       step_range_end = pc;
     }
   else


@@ -499,13 +653,14 @@ until_next_command (from_tty)
   
   step_over_calls = 1;
   step_frame_address = FRAME_FP (frame);
   
   step_over_calls = 1;
   step_frame_address = FRAME_FP (frame);

-  
+  step_sp = read_sp ();
+

   step_multi = 0;              /* Only one call to proceed */
   
   step_multi = 0;              /* Only one call to proceed */
   

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

 }
 
 }
 

-void 
+static void 

 until_command (arg, from_tty)
      char *arg;
      int from_tty;
 until_command (arg, from_tty)
      char *arg;
      int from_tty;


@@ -527,9 +682,10 @@ finish_command (arg, from_tty)
      int from_tty;
 {
   struct symtab_and_line sal;
      int from_tty;
 {
   struct symtab_and_line sal;

-  register FRAME frame;
-  struct frame_info *fi;
+  register struct frame_info *frame;

   register struct symbol *function;
   register struct symbol *function;

+  struct breakpoint *breakpoint;
+  struct cleanup *old_chain;

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


@@ -544,29 +700,34 @@ finish_command (arg, from_tty)
 
   clear_proceed_status ();
 
 
   clear_proceed_status ();
 

-  fi = get_frame_info (frame);
-  sal = find_pc_line (fi->pc, 0);
-  sal.pc = fi->pc;
-  set_momentary_breakpoint (sal, frame);
+  sal = find_pc_line (frame->pc, 0);
+  sal.pc = frame->pc;
+
+  breakpoint = set_momentary_breakpoint (sal, frame, bp_finish);
+
+  old_chain = make_cleanup(delete_breakpoint, breakpoint);

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

-  fi = get_frame_info (selected_frame);
-  function = find_pc_function (fi->pc);
+  function = find_pc_function (selected_frame->pc);

 
 

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

   if (from_tty)
     {
   if (from_tty)
     {

-      printf ("Run till exit from ");
-      print_selected_frame ();
+      printf_filtered ("Run till exit from ");
+      print_stack_frame (selected_frame, selected_frame_level, 0);

     }
 
   proceed_to_finish = 1;               /* We want stop_registers, please... */
     }
 
   proceed_to_finish = 1;               /* We want stop_registers, please... */

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

 
 

-  if (bpstat_momentary_breakpoint (stop_bpstat) && function != 0)
+  /* Did we stop at our breakpoint? */
+  if (bpstat_find_breakpoint(stop_bpstat, breakpoint) != NULL
+      && function != 0)

     {
       struct type *value_type;
     {
       struct type *value_type;

-      register value val;
+      register value_ptr val;

       CORE_ADDR funcaddr;
 
       value_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (function));
       CORE_ADDR funcaddr;
 
       value_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (function));


@@ -579,15 +740,16 @@ finish_command (arg, from_tty)
       funcaddr = BLOCK_START (SYMBOL_BLOCK_VALUE (function));
 
       val = value_being_returned (value_type, stop_registers,
       funcaddr = BLOCK_START (SYMBOL_BLOCK_VALUE (function));
 
       val = value_being_returned (value_type, stop_registers,

-             using_struct_return (value_of_variable (function),
+             using_struct_return (value_of_variable (function, NULL),

                                   funcaddr,
                                   funcaddr,

-                                  value_type,
+                                  check_typedef (value_type),

                BLOCK_GCC_COMPILED (SYMBOL_BLOCK_VALUE (function))));
 
                BLOCK_GCC_COMPILED (SYMBOL_BLOCK_VALUE (function))));
 

-      printf ("Value returned is $%d = ", record_latest_value (val));
-      value_print (val, stdout, 0, Val_no_prettyprint);
-      putchar ('\n');
+      printf_filtered ("Value returned is $%d = ", record_latest_value (val));
+      value_print (val, gdb_stdout, 0, Val_no_prettyprint);
+      printf_filtered ("\n");

     }
     }

+  do_cleanups(old_chain);

 }
 \f
 /* ARGSUSED */
 }
 \f
 /* ARGSUSED */


@@ -601,14 +763,15 @@ program_info (args, from_tty)
   
   if (!target_has_execution)
     {
   
   if (!target_has_execution)
     {

-      printf ("The program being debugged is not being run.\n");
+      printf_filtered ("The program being debugged is not being run.\n");

       return;
     }
 
   target_files_info ();
       return;
     }
 
   target_files_info ();

-  printf ("Program stopped at 0x%x.\n", stop_pc);
+  printf_filtered ("Program stopped at %s.\n",
+                  local_hex_string((unsigned long) stop_pc));

   if (stop_step)
   if (stop_step)

-    printf ("It stopped after being stepped.\n");
+    printf_filtered ("It stopped after being stepped.\n");

   else if (num != 0)
     {
       /* There may be several breakpoints in the same place, so this
   else if (num != 0)
     {
       /* There may be several breakpoints in the same place, so this


@@ -616,49 +779,60 @@ program_info (args, from_tty)
       while (num != 0)
        {
          if (num < 0)
       while (num != 0)
        {
          if (num < 0)

-           printf ("It stopped at a breakpoint that has since been deleted.\n");
+           printf_filtered ("It stopped at a breakpoint that has since been deleted.\n");

          else
          else

-           printf ("It stopped at breakpoint %d.\n", num);
+           printf_filtered ("It stopped at breakpoint %d.\n", num);

          num = bpstat_num (&bs);
        }
     }
          num = bpstat_num (&bs);
        }
     }

-  else if (stop_signal) {
-#ifdef PRINT_RANDOM_SIGNAL
-    PRINT_RANDOM_SIGNAL (stop_signal);
-#else
-    printf ("It stopped with signal %d (%s).\n",
-           stop_signal, 
-           (stop_signal > NSIG)? "unknown": sys_siglist[stop_signal]);
-#endif
-  }
+  else if (stop_signal != TARGET_SIGNAL_0)
+    {
+      printf_filtered ("It stopped with signal %s, %s.\n",
+                      target_signal_to_name (stop_signal),
+                      target_signal_to_string (stop_signal));
+    }

 
   if (!from_tty)
 
   if (!from_tty)

-    printf ("Type \"info stack\" or \"info registers\" for more information.\n");
+    printf_filtered ("Type \"info stack\" or \"info registers\" for more information.\n");

 }
 \f
 static void
 }
 \f
 static void

-environment_info (var)
+environment_info (var, from_tty)

      char *var;
      char *var;

+     int from_tty;

 {
   if (var)
     {
       register char *val = get_in_environ (inferior_environ, var);
       if (val)
 {
   if (var)
     {
       register char *val = get_in_environ (inferior_environ, var);
       if (val)

-       printf ("%s = %s\n", var, val);
+       {
+         puts_filtered (var);
+         puts_filtered (" = ");
+         puts_filtered (val);
+         puts_filtered ("\n");
+       }

       else
       else

-       printf ("Environment variable \"%s\" not defined.\n", var);
+       {
+         puts_filtered ("Environment variable \"");
+         puts_filtered (var);
+         puts_filtered ("\" not defined.\n");
+       }

     }
   else
     {
       register char **vector = environ_vector (inferior_environ);
       while (*vector)
     }
   else
     {
       register char **vector = environ_vector (inferior_environ);
       while (*vector)

-       printf ("%s\n", *vector++);
+       {
+         puts_filtered (*vector++);
+         puts_filtered ("\n");
+       }

     }
 }
 
 static void
     }
 }
 
 static void

-set_environment_command (arg)
+set_environment_command (arg, from_tty)

      char *arg;
      char *arg;

+     int from_tty;

 {
   register char *p, *val, *var;
   int nullset = 0;
 {
   register char *p, *val, *var;
   int nullset = 0;


@@ -673,15 +847,16 @@ set_environment_command (arg)
   if (p != 0 && val != 0)
     {
       /* We have both a space and an equals.  If the space is before the
   if (p != 0 && val != 0)
     {
       /* We have both a space and an equals.  If the space is before the

-        equals and the only thing between the two is more space, use
-        the equals */
+        equals, walk forward over the spaces til we see a nonspace 
+        (possibly the equals). */

       if (p > val)
        while (*val == ' ')
          val++;
 
       if (p > val)
        while (*val == ' ')
          val++;
 

-      /* Take the smaller of the two.  If there was space before the
-        "=", they will be the same right now. */
-      p = arg + min (p - arg, val - arg);
+      /* Now if the = is after the char following the spaces,
+        take the char following the spaces.  */
+      if (p > val)
+       p = val - 1;

     }
   else if (val != 0 && p == 0)
     p = val;
     }
   else if (val != 0 && p == 0)
     p = val;


@@ -708,7 +883,7 @@ set_environment_command (arg)
   var = savestring (arg, p - arg);
   if (nullset)
     {
   var = savestring (arg, p - arg);
   if (nullset)
     {

-      printf ("Setting environment variable \"%s\" to null value.\n", var);
+      printf_filtered ("Setting environment variable \"%s\" to null value.\n", var);

       set_in_environ (inferior_environ, var, "");
     }
   else
       set_in_environ (inferior_environ, var, "");
     }
   else


@@ -737,29 +912,34 @@ unset_environment_command (var, from_tty)
 
 /* Handle the execution path (PATH variable) */
 
 
 /* Handle the execution path (PATH variable) */
 

-const static char path_var_name[] = "PATH";
+static const char path_var_name[] = "PATH";

 
 /* ARGSUSED */
 
 /* ARGSUSED */

-void
+static void

 path_info (args, from_tty)
      char *args;
      int from_tty;
 {
 path_info (args, from_tty)
      char *args;
      int from_tty;
 {

-  printf ("Executable and object file path: %s\n", 
-      get_in_environ (inferior_environ, path_var_name));
+  puts_filtered ("Executable and object file path: ");
+  puts_filtered (get_in_environ (inferior_environ, path_var_name));
+  puts_filtered ("\n");

 }
 
 /* Add zero or more directories to the front of the execution path.  */
 
 }
 
 /* Add zero or more directories to the front of the execution path.  */
 

-void
+static void

 path_command (dirname, from_tty)
      char *dirname;
      int from_tty;
 {
   char *exec_path;
 path_command (dirname, from_tty)
      char *dirname;
      int from_tty;
 {
   char *exec_path;

-
+  char *env;

   dont_repeat ();
   dont_repeat ();

-  exec_path = strsave (get_in_environ (inferior_environ, path_var_name));
+  env = get_in_environ (inferior_environ, path_var_name);
+  /* Can be null if path is not set */
+  if (!env)
+    env = "";
+  exec_path = strsave (env);

   mod_path (dirname, &exec_path);
   set_in_environ (inferior_environ, path_var_name, exec_path);
   free (exec_path);
   mod_path (dirname, &exec_path);
   set_in_environ (inferior_environ, path_var_name, exec_path);
   free (exec_path);


@@ -767,76 +947,94 @@ path_command (dirname, from_tty)
     path_info ((char *)NULL, from_tty);
 }
 \f
     path_info ((char *)NULL, from_tty);
 }
 \f

-CORE_ADDR
-read_pc ()
-{
-  return ADDR_BITS_REMOVE ((CORE_ADDR) read_register (PC_REGNUM));
-}
-
-void
-write_pc (val)
-     CORE_ADDR val;
-{
-  write_register (PC_REGNUM, (long) val);
-#ifdef NPC_REGNUM
-  write_register (NPC_REGNUM, (long) val+4);
-#endif
-  pc_changed = 0;
-}
+/* The array of register names.  */

 
 char *reg_names[] = REGISTER_NAMES;
 
 /* Print out the machine register regnum. If regnum is -1,
 
 char *reg_names[] = REGISTER_NAMES;
 
 /* Print out the machine register regnum. If regnum is -1,

-   print all registers.
+   print all registers (fpregs == 1) or all non-float registers
+   (fpregs == 0).
+

    For most machines, having all_registers_info() print the
    register(s) one per line is good enough. If a different format
    For most machines, having all_registers_info() print the
    register(s) one per line is good enough. If a different format

-   is required, (eg, for SPARC or Pyramid 90x, which both have
+   is required, (eg, for MIPS or Pyramid 90x, which both have

    lots of regs), or there is an existing convention for showing
    lots of regs), or there is an existing convention for showing

-   all the registers, define the macro DO_REGISTERS_INFO(regnum)
+   all the registers, define the macro DO_REGISTERS_INFO(regnum, fp)

    to provide that format.  */  
    to provide that format.  */  

+

 #if !defined (DO_REGISTERS_INFO)
 #if !defined (DO_REGISTERS_INFO)

-#define DO_REGISTERS_INFO(regnum) do_registers_info(regnum)
-static void do_registers_info (regnum)
+
+#define DO_REGISTERS_INFO(regnum, fp) do_registers_info(regnum, fp)
+
+static void
+do_registers_info (regnum, fpregs)

      int regnum;
      int regnum;

+     int fpregs;

 {
   register int i;
 {
   register int i;

+  int numregs = ARCH_NUM_REGS;

 
 

-  if (regnum == -1)
-    printf_filtered (
-      "Register       Contents (relative to selected stack frame)\n\n");
-
-  for (i = 0; i < NUM_REGS; i++)
+  for (i = 0; i < numregs; i++)

     {
       char raw_buffer[MAX_REGISTER_RAW_SIZE];
       char virtual_buffer[MAX_REGISTER_VIRTUAL_SIZE];
 
     {
       char raw_buffer[MAX_REGISTER_RAW_SIZE];
       char virtual_buffer[MAX_REGISTER_VIRTUAL_SIZE];
 

-      if (regnum != -1 && i != regnum)
+      /* Decide between printing all regs, nonfloat regs, or specific reg.  */
+      if (regnum == -1) {
+       if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT && !fpregs)
+         continue;
+      } else {
+        if (i != regnum)
+         continue;
+      }
+
+      /* If the register name is empty, it is undefined for this
+        processor, so don't display anything.  */
+      if (reg_names[i] == NULL || *(reg_names[i]) == '\0')

        continue;
 
        continue;
 

-      fputs_filtered (reg_names[i], stdout);
-      print_spaces_filtered (15 - strlen (reg_names[i]), stdout);
+      fputs_filtered (reg_names[i], gdb_stdout);
+      print_spaces_filtered (15 - strlen (reg_names[i]), gdb_stdout);

 
 

-      /* Get the data in raw format, then convert also to virtual format.  */
+      /* Get the data in raw format.  */

       if (read_relative_register_raw_bytes (i, raw_buffer))
        {
          printf_filtered ("Invalid register contents\n");
          continue;
        }
       if (read_relative_register_raw_bytes (i, raw_buffer))
        {
          printf_filtered ("Invalid register contents\n");
          continue;
        }

-      
-      target_convert_to_virtual (i, raw_buffer, virtual_buffer);
+
+      /* Convert raw data to virtual format if necessary.  */
+#ifdef REGISTER_CONVERTIBLE
+      if (REGISTER_CONVERTIBLE (i))
+       {
+         REGISTER_CONVERT_TO_VIRTUAL (i, REGISTER_VIRTUAL_TYPE (i),
+                                      raw_buffer, virtual_buffer);
+       }
+      else
+#endif
+       memcpy (virtual_buffer, raw_buffer,
+               REGISTER_VIRTUAL_SIZE (i));

 
       /* If virtual format is floating, print it that way, and in raw hex.  */
 
       /* If virtual format is floating, print it that way, and in raw hex.  */

-      if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT
-         && ! INVALID_FLOAT (virtual_buffer, REGISTER_VIRTUAL_SIZE (i)))
+      if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT)

        {
          register int j;
 
        {
          register int j;
 

-         val_print (REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0,
-                    stdout, 0, 1, 0, Val_pretty_default);
+#ifdef INVALID_FLOAT
+         if (INVALID_FLOAT (virtual_buffer, REGISTER_VIRTUAL_SIZE (i)))
+           printf_filtered ("<invalid float>");
+         else
+#endif
+           val_print (REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0,
+                      gdb_stdout, 0, 1, 0, Val_pretty_default);

 
          printf_filtered ("\t(raw 0x");
          for (j = 0; j < REGISTER_RAW_SIZE (i); j++)
 
          printf_filtered ("\t(raw 0x");
          for (j = 0; j < REGISTER_RAW_SIZE (i); j++)

-           printf_filtered ("%02x", (unsigned char)raw_buffer[j]);
+           {
+             register int idx = TARGET_BYTE_ORDER == BIG_ENDIAN ? j
+               : REGISTER_RAW_SIZE (i) - 1 - j;
+             printf_filtered ("%02x", (unsigned char)raw_buffer[idx]);
+           }

          printf_filtered (")");
        }
 
          printf_filtered (")");
        }
 


@@ -844,7 +1042,7 @@ static void do_registers_info (regnum)
 
       /* Else if virtual format is too long for printf,
         print in hex a byte at a time.  */
 
       /* Else if virtual format is too long for printf,
         print in hex a byte at a time.  */

-      else if (REGISTER_VIRTUAL_SIZE (i) > sizeof (long))
+      else if (REGISTER_VIRTUAL_SIZE (i) > (int) sizeof (long))

        {
          register int j;
          printf_filtered ("0x");
        {
          register int j;
          printf_filtered ("0x");


@@ -855,10 +1053,10 @@ static void do_registers_info (regnum)
       else
        {
          val_print (REGISTER_VIRTUAL_TYPE (i), raw_buffer, 0,
       else
        {
          val_print (REGISTER_VIRTUAL_TYPE (i), raw_buffer, 0,

-                    stdout, 'x', 1, 0, Val_pretty_default);
+                    gdb_stdout, 'x', 1, 0, Val_pretty_default);

          printf_filtered ("\t");
          val_print (REGISTER_VIRTUAL_TYPE (i), raw_buffer, 0,
          printf_filtered ("\t");
          val_print (REGISTER_VIRTUAL_TYPE (i), raw_buffer, 0,

-                    stdout,   0, 1, 0, Val_pretty_default);
+                    gdb_stdout,   0, 1, 0, Val_pretty_default);

        }
 
       /* The SPARC wants to print even-numbered float regs as doubles
        }
 
       /* The SPARC wants to print even-numbered float regs as doubles


@@ -873,34 +1071,64 @@ static void do_registers_info (regnum)
 #endif /* no DO_REGISTERS_INFO.  */
 
 static void
 #endif /* no DO_REGISTERS_INFO.  */
 
 static void

-registers_info (addr_exp)
+registers_info (addr_exp, fpregs)

      char *addr_exp;
      char *addr_exp;

+     int fpregs;

 {
 {

-  int regnum;
+  int regnum, numregs;
+  register char *end;

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

+  if (selected_frame == NULL)
+    error ("No selected frame.");

 
 

-  if (addr_exp)
+  if (!addr_exp)

     {
     {

-      if (*addr_exp >= '0' && *addr_exp <= '9')
-       regnum = atoi (addr_exp);
-      else
-       {
-         register char *p = addr_exp;
-         if (p[0] == '$')
-           p++;
-         for (regnum = 0; regnum < NUM_REGS; regnum++)
-           if (!strcmp (p, reg_names[regnum]))
-             break;
-         if (regnum == NUM_REGS)
-           error ("%s: invalid register name.", addr_exp);
-       }
+      DO_REGISTERS_INFO(-1, fpregs);
+      return;

     }
     }

-  else
-    regnum = -1;

 
 

-  DO_REGISTERS_INFO(regnum);
+  do
+    {      
+      if (addr_exp[0] == '$')
+       addr_exp++;
+      end = addr_exp;
+      while (*end != '\0' && *end != ' ' && *end != '\t')
+       ++end;
+      numregs = ARCH_NUM_REGS;
+      for (regnum = 0; regnum < numregs; regnum++)
+       if (!strncmp (addr_exp, reg_names[regnum], end - addr_exp)
+           && strlen (reg_names[regnum]) == end - addr_exp)
+         goto found;
+      if (*addr_exp >= '0' && *addr_exp <= '9')
+       regnum = atoi (addr_exp);               /* Take a number */
+      if (regnum >= numregs)           /* Bad name, or bad number */
+       error ("%.*s: invalid register", end - addr_exp, addr_exp);
+
+found:
+      DO_REGISTERS_INFO(regnum, fpregs);
+
+      addr_exp = end;
+      while (*addr_exp == ' ' || *addr_exp == '\t')
+       ++addr_exp;
+    } while (*addr_exp != '\0');
+}
+
+static void
+all_registers_info (addr_exp, from_tty)
+     char *addr_exp;
+     int from_tty;
+{
+  registers_info (addr_exp, 1);
+}
+
+static void
+nofp_registers_info (addr_exp, from_tty)
+     char *addr_exp;
+     int from_tty;
+{
+  registers_info (addr_exp, 0);

 }
 \f
 /*
 }
 \f
 /*


@@ -914,19 +1142,61 @@ registers_info (addr_exp)
  */
 
 /*
  */
 
 /*

- * attach_command --
- * takes a program started up outside of gdb and ``attaches'' to it.
- * This stops it cold in its tracks and allows us to start tracing it.
- * For this to work, we must be able to send the process a
- * signal and we must have the same effective uid as the program.
- */
+   attach_command --
+   takes a program started up outside of gdb and ``attaches'' to it.
+   This stops it cold in its tracks and allows us to start debugging it.
+   and wait for the trace-trap that results from attaching.  */
+

 void
 attach_command (args, from_tty)
      char *args;
      int from_tty;
 {
 void
 attach_command (args, from_tty)
      char *args;
      int from_tty;
 {

+#ifdef SOLIB_ADD
+  extern int auto_solib_add;
+#endif
+

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

+
+  if (target_has_execution)
+    {
+      if (query ("A program is being debugged already.  Kill it? "))
+       target_kill ();
+      else
+       error ("Not killed.");
+    }
+

   target_attach (args, from_tty);
   target_attach (args, from_tty);

+
+  /* Set up the "saved terminal modes" of the inferior
+     based on what modes we are starting it with.  */
+  target_terminal_init ();
+
+  /* Install inferior's terminal modes.  */
+  target_terminal_inferior ();
+
+  /* Set up execution context to know that we should return from
+     wait_for_inferior as soon as the target reports a stop.  */
+  init_wait_for_inferior ();
+  clear_proceed_status ();
+  stop_soon_quietly = 1;
+
+  /* No traps are generated when attaching to inferior under Mach 3
+     or GNU hurd.  */
+#ifndef ATTACH_NO_WAIT
+  wait_for_inferior ();
+#endif
+
+#ifdef SOLIB_ADD
+  if (auto_solib_add)
+    {
+      /* Add shared library symbols from the newly attached process, if any.  */
+      SOLIB_ADD ((char *)0, from_tty, (struct target_ops *)0);
+      re_enable_breakpoints_in_shlibs ();
+    }
+#endif
+
+  normal_stop ();

 }
 
 /*
 }
 
 /*


@@ -951,26 +1221,25 @@ detach_command (args, from_tty)
 
 /* ARGSUSED */
 static void
 
 /* ARGSUSED */
 static void

-float_info (addr_exp)
+float_info (addr_exp, from_tty)

      char *addr_exp;
      char *addr_exp;

+     int from_tty;

 {
 #ifdef FLOAT_INFO
        FLOAT_INFO;
 #else
 {
 #ifdef FLOAT_INFO
        FLOAT_INFO;
 #else

-       printf ("No floating point info available for this processor.\n");
+       printf_filtered ("No floating point info available for this processor.\n");

 #endif
 }
 \f
 #endif
 }
 \f

-struct cmd_list_element *unsetlist = NULL;
-

 /* ARGSUSED */
 static void
 unset_command (args, from_tty)
      char *args;
      int from_tty;
 {
 /* ARGSUSED */
 static void
 unset_command (args, from_tty)
      char *args;
      int from_tty;
 {

-  printf ("\"unset\" must be followed by the name of an unset subcommand.\n");
-  help_list (unsetlist, "unset ", -1, stdout);
+  printf_filtered ("\"unset\" must be followed by the name of an unset subcommand.\n");
+  help_list (unsetlist, "unset ", -1, gdb_stdout);

 }
 
 void
 }
 
 void


@@ -1022,12 +1291,13 @@ This path is equivalent to the $PATH shell variable.  It is a list of\n\
 directories, separated by colons.  These directories are searched to find\n\
 fully linked executable files and separately compiled object files as needed.");
 
 directories, separated by colons.  These directories are searched to find\n\
 fully linked executable files and separately compiled object files as needed.");
 

-  add_info ("path", path_info,
+  c = add_cmd ("paths", no_class, path_info,

            "Current search path for finding object files.\n\
 $cwd in the path means the current working directory.\n\
 This path is equivalent to the $PATH shell variable.  It is a list of\n\
 directories, separated by colons.  These directories are searched to find\n\
            "Current search path for finding object files.\n\
 $cwd in the path means the current working directory.\n\
 This path is equivalent to the $PATH shell variable.  It is a list of\n\
 directories, separated by colons.  These directories are searched to find\n\

-fully linked executable files and separately compiled object files as needed.");
+fully linked executable files and separately compiled object files as needed.", &showlist);
+  c->completer = noop_completer;

 
  add_com ("attach", class_run, attach_command,
           "Attach to a process or file outside of GDB.\n\
 
  add_com ("attach", class_run, attach_command,
           "Attach to a process or file outside of GDB.\n\


@@ -1045,7 +1315,8 @@ If a process, it is no longer traced, and it continues its execution.  If you\n\
 were debugging a file, the file is closed and gdb no longer accesses it.");
 
   add_com ("signal", class_run, signal_command,
 were debugging a file, the file is closed and gdb no longer accesses it.");
 
   add_com ("signal", class_run, signal_command,

-          "Continue program giving it signal number SIGNUMBER.");
+          "Continue program giving it signal specified by the argument.\n\
+An argument of \"0\" means continue program without giving it a signal.");

 
   add_com ("stepi", class_run, stepi_command,
           "Step one instruction exactly.\n\
 
   add_com ("stepi", class_run, stepi_command,
           "Step one instruction exactly.\n\


@@ -1086,8 +1357,9 @@ for an address to start at.");
 
   add_com ("continue", class_run, continue_command,
           "Continue program being debugged, after signal or breakpoint.\n\
 
   add_com ("continue", class_run, continue_command,
           "Continue program being debugged, after signal or breakpoint.\n\

-If proceeding from breakpoint, a number N may be used as an argument:\n\
-then the same breakpoint won't break until the Nth time it is reached.");
+If proceeding from breakpoint, a number N may be used as an argument,\n\
+which means to set the ignore count of that breakpoint to N - 1 (so that\n\
+the breakpoint won't break until the Nth time it is reached).");

   add_com_alias ("c", "cont", class_run, 1);
   add_com_alias ("fg", "cont", class_run, 1);
 
   add_com_alias ("c", "cont", class_run, 1);
   add_com_alias ("fg", "cont", class_run, 1);
 


@@ -1095,13 +1367,17 @@ then the same breakpoint won't break until the Nth time it is reached.");
           "Start debugged program.  You may specify arguments to give it.\n\
 Args may include \"*\", or \"[...]\"; they are expanded using \"sh\".\n\
 Input and output redirection with \">\", \"<\", or \">>\" are also allowed.\n\n\
           "Start debugged program.  You may specify arguments to give it.\n\
 Args may include \"*\", or \"[...]\"; they are expanded using \"sh\".\n\
 Input and output redirection with \">\", \"<\", or \">>\" are also allowed.\n\n\

-With no arguments, uses arguments last specified (with \"run\" or \"set args\".\n\
+With no arguments, uses arguments last specified (with \"run\" or \"set args\").\n\

 To cancel previous arguments and run with no arguments,\n\
 use \"set args\" without arguments.");
   add_com_alias ("r", "run", class_run, 1);
 
 To cancel previous arguments and run with no arguments,\n\
 use \"set args\" without arguments.");
   add_com_alias ("r", "run", class_run, 1);
 

-  add_info ("registers", registers_info,
-           "List of registers and their contents, for selected stack frame.\n\
+  add_info ("registers", nofp_registers_info,
+    "List of integer registers and their contents, for selected stack frame.\n\
+Register name as argument means describe only that register.");
+
+  add_info ("all-registers", all_registers_info,
+"List of all registers and their contents, for selected stack frame.\n\

 Register name as argument means describe only that register.");
 
   add_info ("program", program_info,
 Register name as argument means describe only that register.");
 
   add_info ("program", program_info,