* target.h (struct thread_resume): Delete leave_stopped member.

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

diff --git a/gdb/stack.c b/gdb/stack.c
index d0bbc87b1cbecd5f58d38340b7d23206b969eb20..dfe3900e7c090332ce9d79d06f5d4bf6c15b73aa 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1,14 +1,14 @@
 /* Print and select stack frames for GDB, the GNU debugger.
 
 /* Print and select stack frames for GDB, the GNU debugger.
 

-   Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
-   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
+   2009 Free Software Foundation, Inc.

 
    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
 
    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
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -17,9 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "value.h"
 
 #include "defs.h"
 #include "value.h"


@@ -45,6 +43,9 @@
 #include "regcache.h"
 #include "solib.h"
 #include "valprint.h"
 #include "regcache.h"
 #include "solib.h"
 #include "valprint.h"

+#include "gdbthread.h"
+#include "cp-support.h"
+#include "disasm.h"

 
 #include "gdb_assert.h"
 #include <ctype.h>
 
 #include "gdb_assert.h"
 #include <ctype.h>


@@ -52,6 +53,13 @@
 
 void (*deprecated_selected_frame_level_changed_hook) (int);
 
 
 void (*deprecated_selected_frame_level_changed_hook) (int);
 

+/* The possible choices of "set print frame-arguments, and the value
+   of this setting.  */
+
+static const char *print_frame_arguments_choices[] =
+  {"all", "scalars", "none", NULL};
+static const char *print_frame_arguments = "scalars";
+

 /* Prototypes for local functions. */
 
 static void print_frame_local_vars (struct frame_info *, int,
 /* Prototypes for local functions. */
 
 static void print_frame_local_vars (struct frame_info *, int,


@@ -106,9 +114,11 @@ print_stack_frame (struct frame_info *frame, int print_level,
   args.frame = frame;
   args.print_level = print_level;
   args.print_what = print_what;
   args.frame = frame;
   args.print_level = print_level;
   args.print_what = print_what;

+  /* For mi, alway print location and address.  */
+  args.print_what = ui_out_is_mi_like_p (uiout) ? LOC_AND_ADDRESS : print_what;

   args.print_args = 1;
 
   args.print_args = 1;
 

-  catch_errors (print_stack_frame_stub, &args, "", RETURN_MASK_ALL);
+  catch_errors (print_stack_frame_stub, &args, "", RETURN_MASK_ERROR);

 }  
 
 struct print_args_args
 }  
 
 struct print_args_args


@@ -148,14 +158,54 @@ print_frame_nameless_args (struct frame_info *frame, long start, int num,
     }
 }
 
     }
 }
 

+/* Return non-zero if the debugger should print the value of the provided
+   symbol parameter (SYM).  */
+
+static int
+print_this_frame_argument_p (struct symbol *sym)
+{
+  struct type *type;
+  
+  /* If the user asked to print no argument at all, then obviously
+     do not print this argument.  */
+
+  if (strcmp (print_frame_arguments, "none") == 0)
+    return 0;
+
+  /* If the user asked to print all arguments, then we should print
+     that one.  */
+
+  if (strcmp (print_frame_arguments, "all") == 0)
+    return 1;
+
+  /* The user asked to print only the scalar arguments, so do not
+     print the non-scalar ones.  */
+
+  type = check_typedef (SYMBOL_TYPE (sym));
+  while (TYPE_CODE (type) == TYPE_CODE_REF)
+    type = check_typedef (TYPE_TARGET_TYPE (type));
+  switch (TYPE_CODE (type))
+    {
+      case TYPE_CODE_ARRAY:
+      case TYPE_CODE_STRUCT:
+      case TYPE_CODE_UNION:
+      case TYPE_CODE_SET:
+      case TYPE_CODE_STRING:
+      case TYPE_CODE_BITSTRING:
+        return 0;
+      default:
+        return 1;
+    }
+}
+

 /* Print the arguments of frame FRAME on STREAM, given the function
    FUNC running in that frame (as a symbol), where NUM is the number
    of arguments according to the stack frame (or -1 if the number of
    arguments is unknown).  */
 
 /* Print the arguments of frame FRAME on STREAM, given the function
    FUNC running in that frame (as a symbol), where NUM is the number
    of arguments according to the stack frame (or -1 if the number of
    arguments is unknown).  */
 

-/* Note that currently the "number of argumentss according to the
+/* Note that currently the "number of arguments according to the

    stack frame" is only known on VAX where i refers to the "number of
    stack frame" is only known on VAX where i refers to the "number of

-   ints of argumentss according to the stack frame".  */
+   ints of arguments according to the stack frame".  */

 
 static void
 print_frame_args (struct symbol *func, struct frame_info *frame,
 
 static void
 print_frame_args (struct symbol *func, struct frame_info *frame,


@@ -188,6 +238,9 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
          /* Keep track of the highest stack argument offset seen, and
             skip over any kinds of symbols we don't care about.  */
 
          /* Keep track of the highest stack argument offset seen, and
             skip over any kinds of symbols we don't care about.  */
 

+         if (!SYMBOL_IS_ARGUMENT (sym))
+           continue;
+

          switch (SYMBOL_CLASS (sym))
            {
            case LOC_ARG:
          switch (SYMBOL_CLASS (sym))
            {
            case LOC_ARG:


@@ -215,16 +268,12 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
 
              /* We care about types of symbols, but don't need to
                 keep track of stack offsets in them.  */
 
              /* We care about types of symbols, but don't need to
                 keep track of stack offsets in them.  */

-           case LOC_REGPARM:
+           case LOC_REGISTER:

            case LOC_REGPARM_ADDR:
            case LOC_REGPARM_ADDR:

-           case LOC_LOCAL_ARG:
-           case LOC_BASEREG_ARG:
-           case LOC_COMPUTED_ARG:
-             break;
-
-           /* Other types of symbols we just skip over.  */
+           case LOC_COMPUTED:
+           case LOC_OPTIMIZED_OUT:

            default:
            default:

-             continue;
+             break;

            }
 
          /* We have to look up the symbol because arguments can have
            }
 
          /* We have to look up the symbol because arguments can have


@@ -240,12 +289,14 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
             parameter names occur on the RS/6000, for traceback
             tables.  FIXME, should we even print them?  */
 
             parameter names occur on the RS/6000, for traceback
             tables.  FIXME, should we even print them?  */
 

-         if (*DEPRECATED_SYMBOL_NAME (sym))
+         if (*SYMBOL_LINKAGE_NAME (sym))

            {
              struct symbol *nsym;
            {
              struct symbol *nsym;

-             nsym = lookup_symbol (DEPRECATED_SYMBOL_NAME (sym),
-                                   b, VAR_DOMAIN, NULL, NULL);
-             if (SYMBOL_CLASS (nsym) == LOC_REGISTER)
+             nsym = lookup_symbol (SYMBOL_LINKAGE_NAME (sym),
+                                   b, VAR_DOMAIN, NULL);
+             gdb_assert (nsym != NULL);
+             if (SYMBOL_CLASS (nsym) == LOC_REGISTER
+                 && !SYMBOL_IS_ARGUMENT (nsym))

                {
                  /* There is a LOC_ARG/LOC_REGISTER pair.  This means
                     that it was passed on the stack and loaded into a
                {
                  /* There is a LOC_ARG/LOC_REGISTER pair.  This means
                     that it was passed on the stack and loaded into a


@@ -303,23 +354,43 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
          annotate_arg_name_end ();
          ui_out_text (uiout, "=");
 
          annotate_arg_name_end ();
          ui_out_text (uiout, "=");
 

-         /* Avoid value_print because it will deref ref parameters.
-            We just want to print their addresses.  Print ??? for
-            args whose address we do not know.  We pass 2 as
-            "recurse" to val_print because our standard indentation
-            here is 4 spaces, and val_print indents 2 for each
-            recurse.  */
-         val = read_var_value (sym, frame);
-
-         annotate_arg_value (val == NULL ? NULL : value_type (val));
+          if (print_this_frame_argument_p (sym))
+            {
+             /* Avoid value_print because it will deref ref parameters.
+                We just want to print their addresses.  Print ??? for
+                args whose address we do not know.  We pass 2 as
+                "recurse" to val_print because our standard indentation
+                here is 4 spaces, and val_print indents 2 for each
+                recurse.  */
+             val = read_var_value (sym, frame);
+
+             annotate_arg_value (val == NULL ? NULL : value_type (val));
+
+             if (val)
+               {
+                  const struct language_defn *language;
+                 struct value_print_options opts;
+
+                  /* Use the appropriate language to display our symbol,
+                     unless the user forced the language to a specific
+                     language.  */
+                  if (language_mode == language_mode_auto)
+                    language = language_def (SYMBOL_LANGUAGE (sym));
+                  else
+                    language = current_language;
+
+                 get_raw_print_options (&opts);
+                 opts.deref_ref = 0;
+                 common_val_print (val, stb->stream, 2,
+                                   &opts, language);
+                 ui_out_field_stream (uiout, "value", stb);
+               }
+             else
+               ui_out_text (uiout, "???");
+            }
+          else
+            ui_out_text (uiout, "...");

 
 

-         if (val)
-           {
-             common_val_print (val, stb->stream, 0, 0, 2, Val_no_prettyprint);
-             ui_out_field_stream (uiout, "value", stb);
-           }
-         else
-           ui_out_text (uiout, "???");

 
          /* Invoke ui_out_tuple_end.  */
          do_cleanups (list_chain);
 
          /* Invoke ui_out_tuple_end.  */
          do_cleanups (list_chain);


@@ -337,7 +408,7 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
       long start;
 
       if (highest_offset == -1)
       long start;
 
       if (highest_offset == -1)

-       start = FRAME_ARGS_SKIP;
+       start = gdbarch_frame_args_skip (get_frame_arch (frame));

       else
        start = highest_offset;
 
       else
        start = highest_offset;
 


@@ -354,11 +425,12 @@ static int
 print_args_stub (void *args)
 {
   struct print_args_args *p = args;
 print_args_stub (void *args)
 {
   struct print_args_args *p = args;

+  struct gdbarch *gdbarch = get_frame_arch (p->frame);

   int numargs;
 
   int numargs;
 

-  if (FRAME_NUM_ARGS_P ())
+  if (gdbarch_frame_num_args_p (gdbarch))

     {
     {

-      numargs = FRAME_NUM_ARGS (p->frame);
+      numargs = gdbarch_frame_num_args (gdbarch, p->frame);

       gdb_assert (numargs >= 0);
     }
   else
       gdb_assert (numargs >= 0);
     }
   else


@@ -385,6 +457,58 @@ set_current_sal_from_frame (struct frame_info *frame, int center)
     }
 }
 
     }
 }
 

+/* If ON, GDB will display disassembly of the next source line when
+   execution of the program being debugged stops.
+   If AUTO (which is the default), or there's no line info to determine
+   the source line of the next instruction, display disassembly of next
+   instruction instead.  */
+
+static enum auto_boolean disassemble_next_line;
+
+static void
+show_disassemble_next_line (struct ui_file *file, int from_tty,
+                                struct cmd_list_element *c,
+                                const char *value)
+{
+  fprintf_filtered (file, _("\
+Debugger's willingness to use disassemble-next-line is %s.\n"),
+                    value);
+}
+
+/* Show assembly codes; stub for catch_errors.  */
+
+struct gdb_disassembly_stub_args
+{
+  int how_many;
+  CORE_ADDR low;
+  CORE_ADDR high;
+};
+
+static void
+gdb_disassembly_stub (void *args)
+{
+  struct gdb_disassembly_stub_args *p = args;
+  gdb_disassembly (uiout, 0, 0, p->how_many, p->low, p->high);
+}
+
+/* Use TRY_CATCH to catch the exception from the gdb_disassembly
+   because it will be broken by filter sometime.  */
+
+static void
+do_gdb_disassembly (int how_many, CORE_ADDR low, CORE_ADDR high)
+{
+  volatile struct gdb_exception exception;
+  struct gdb_disassembly_stub_args args;
+
+  args.how_many = how_many;
+  args.low = low;
+  args.high = high;
+  TRY_CATCH (exception, RETURN_MASK_ALL)
+    {
+      gdb_disassembly_stub (&args);
+    }
+}
+

 /* Print information about frame FRAME.  The output is format according
    to PRINT_LEVEL and PRINT_WHAT and PRINT ARGS.  The meaning of
    PRINT_WHAT is:
 /* Print information about frame FRAME.  The output is format according
    to PRINT_LEVEL and PRINT_WHAT and PRINT ARGS.  The meaning of
    PRINT_WHAT is:


@@ -462,6 +586,13 @@ print_frame_info (struct frame_info *frame, int print_level,
 
   source_print = (print_what == SRC_LINE || print_what == SRC_AND_LOC);
 
 
   source_print = (print_what == SRC_LINE || print_what == SRC_AND_LOC);
 

+  /* If disassemble-next-line is set to auto or on and doesn't have
+     the line debug messages for $pc, output the next instruction.  */
+  if ((disassemble_next_line == AUTO_BOOLEAN_AUTO
+       || disassemble_next_line == AUTO_BOOLEAN_TRUE)
+      && source_print && !sal.symtab)
+    do_gdb_disassembly (1, get_frame_pc (frame), get_frame_pc (frame) + 1);
+

   if (source_print && sal.symtab)
     {
       int done = 0;
   if (source_print && sal.symtab)
     {
       int done = 0;


@@ -479,6 +610,8 @@ print_frame_info (struct frame_info *frame, int print_level,
                                                      sal.line + 1, 0);
          else
            {
                                                      sal.line + 1, 0);
          else
            {

+             struct value_print_options opts;
+             get_user_print_options (&opts);

              /* We used to do this earlier, but that is clearly
                 wrong. This function is used by many different
                 parts of gdb, including normal_stop in infrun.c,
              /* We used to do this earlier, but that is clearly
                 wrong. This function is used by many different
                 parts of gdb, including normal_stop in infrun.c,


@@ -487,7 +620,7 @@ print_frame_info (struct frame_info *frame, int print_level,
                 line. Only the command line really wants this
                 behavior. Other UIs probably would like the
                 ability to decide for themselves if it is desired.  */
                 line. Only the command line really wants this
                 behavior. Other UIs probably would like the
                 ability to decide for themselves if it is desired.  */

-             if (addressprint && mid_statement)
+             if (opts.addressprint && mid_statement)

                {
                  ui_out_field_core_addr (uiout, "addr", get_frame_pc (frame));
                  ui_out_text (uiout, "\t");
                {
                  ui_out_field_core_addr (uiout, "addr", get_frame_pc (frame));
                  ui_out_text (uiout, "\t");


@@ -496,6 +629,11 @@ print_frame_info (struct frame_info *frame, int print_level,
              print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
            }
        }
              print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
            }
        }

+
+      /* If disassemble-next-line is set to on and there is line debug
+         messages, output assembly codes for next line.  */
+      if (disassemble_next_line == AUTO_BOOLEAN_TRUE)
+       do_gdb_disassembly (-1, get_frame_pc (frame), sal.end);

     }
 
   if (print_what != LOCATION)
     }
 
   if (print_what != LOCATION)


@@ -506,19 +644,16 @@ print_frame_info (struct frame_info *frame, int print_level,
   gdb_flush (gdb_stdout);
 }
 
   gdb_flush (gdb_stdout);
 }
 

-static void
-print_frame (struct frame_info *frame, int print_level,
-            enum print_what print_what, int print_args,
-            struct symtab_and_line sal)
+/* Attempt to obtain the FUNNAME and FUNLANG of the function corresponding
+   to FRAME.  */
+void
+find_frame_funname (struct frame_info *frame, char **funname,
+                   enum language *funlang)

 {
   struct symbol *func;
 {
   struct symbol *func;

-  char *funname = NULL;
-  enum language funlang = language_unknown;
-  struct ui_stream *stb;
-  struct cleanup *old_chain, *list_chain;

 
 

-  stb = ui_out_stream_new (uiout);
-  old_chain = make_cleanup_ui_out_stream_delete (stb);
+  *funname = NULL;
+  *funlang = language_unknown;

 
   func = find_pc_function (get_frame_address_in_block (frame));
   if (func)
 
   func = find_pc_function (get_frame_address_in_block (frame));
   if (func)


@@ -551,34 +686,26 @@ print_frame (struct frame_info *frame, int print_level,
          /* We also don't know anything about the function besides
             its address and name.  */
          func = 0;
          /* We also don't know anything about the function besides
             its address and name.  */
          func = 0;

-         funname = DEPRECATED_SYMBOL_NAME (msymbol);
-         funlang = SYMBOL_LANGUAGE (msymbol);
+         *funname = SYMBOL_PRINT_NAME (msymbol);
+         *funlang = SYMBOL_LANGUAGE (msymbol);

        }
       else
        {
        }
       else
        {

-         funname = DEPRECATED_SYMBOL_NAME (func);
-         funlang = SYMBOL_LANGUAGE (func);
-         if (funlang == language_cplus)
+         *funname = SYMBOL_PRINT_NAME (func);
+         *funlang = SYMBOL_LANGUAGE (func);
+         if (*funlang == language_cplus)

            {
              /* It seems appropriate to use SYMBOL_PRINT_NAME() here,
                 to display the demangled name that we already have
                 stored in the symbol table, but we stored a version
                 with DMGL_PARAMS turned on, and here we don't want to
            {
              /* It seems appropriate to use SYMBOL_PRINT_NAME() here,
                 to display the demangled name that we already have
                 stored in the symbol table, but we stored a version
                 with DMGL_PARAMS turned on, and here we don't want to

-                display parameters. So call the demangler again, with
-                DMGL_ANSI only.
-
-                Yes, printf_symbol_filtered() will again try to
-                demangle the name on the fly, but the issue is that
-                if cplus_demangle() fails here, it will fail there
-                too. So we want to catch the failure (where DEMANGLED
-                is NULL below) here, while we still have our hands on
-                the function symbol.)  */
-             char *demangled = cplus_demangle (funname, DMGL_ANSI);
-             if (demangled == NULL)
-               /* If the demangler fails, try the demangled name from
-                  the symbol table. That'll have parameters, but
-                  that's preferable to displaying a mangled name.  */
-               funname = SYMBOL_PRINT_NAME (func);
+                display parameters.  So remove the parameters.  */
+             char *func_only = cp_remove_params (*funname);
+             if (func_only)
+               {
+                 *funname = func_only;
+                 make_cleanup (xfree, func_only);
+               }

            }
        }
     }
            }
        }
     }


@@ -589,10 +716,27 @@ print_frame (struct frame_info *frame, int print_level,
 
       if (msymbol != NULL)
        {
 
       if (msymbol != NULL)
        {

-         funname = DEPRECATED_SYMBOL_NAME (msymbol);
-         funlang = SYMBOL_LANGUAGE (msymbol);
+         *funname = SYMBOL_PRINT_NAME (msymbol);
+         *funlang = SYMBOL_LANGUAGE (msymbol);

        }
     }
        }
     }

+}
+
+static void
+print_frame (struct frame_info *frame, int print_level,
+            enum print_what print_what, int print_args,
+            struct symtab_and_line sal)
+{
+  char *funname = NULL;
+  enum language funlang = language_unknown;
+  struct ui_stream *stb;
+  struct cleanup *old_chain, *list_chain;
+  struct value_print_options opts;
+
+  stb = ui_out_stream_new (uiout);
+  old_chain = make_cleanup_ui_out_stream_delete (stb);
+
+  find_frame_funname (frame, &funname, &funlang);

 
   annotate_frame_begin (print_level ? frame_relative_level (frame) : 0,
                        get_frame_pc (frame));
 
   annotate_frame_begin (print_level ? frame_relative_level (frame) : 0,
                        get_frame_pc (frame));


@@ -605,7 +749,8 @@ print_frame (struct frame_info *frame, int print_level,
       ui_out_field_fmt_int (uiout, 2, ui_left, "level",
                            frame_relative_level (frame));
     }
       ui_out_field_fmt_int (uiout, 2, ui_left, "level",
                            frame_relative_level (frame));
     }

-  if (addressprint)
+  get_user_print_options (&opts);
+  if (opts.addressprint)

     if (get_frame_pc (frame) != sal.pc || !sal.symtab
        || print_what == LOC_AND_ADDRESS)
       {
     if (get_frame_pc (frame) != sal.pc || !sal.symtab
        || print_what == LOC_AND_ADDRESS)
       {


@@ -627,10 +772,10 @@ print_frame (struct frame_info *frame, int print_level,
       struct print_args_args args;
       struct cleanup *args_list_chain;
       args.frame = frame;
       struct print_args_args args;
       struct cleanup *args_list_chain;
       args.frame = frame;

-      args.func = func;
+      args.func = find_pc_function (get_frame_address_in_block (frame));

       args.stream = gdb_stdout;
       args_list_chain = make_cleanup_ui_out_list_begin_end (uiout, "args");
       args.stream = gdb_stdout;
       args_list_chain = make_cleanup_ui_out_list_begin_end (uiout, "args");

-      catch_errors (print_args_stub, &args, "", RETURN_MASK_ALL);
+      catch_errors (print_args_stub, &args, "", RETURN_MASK_ERROR);

       /* FIXME: ARGS must be a list. If one argument is a string it
          will have " that will not be properly escaped.  */
       /* Invoke ui_out_tuple_end.  */
       /* FIXME: ARGS must be a list. If one argument is a string it
          will have " that will not be properly escaped.  */
       /* Invoke ui_out_tuple_end.  */


@@ -663,7 +808,7 @@ print_frame (struct frame_info *frame, int print_level,
 #ifdef PC_SOLIB
       char *lib = PC_SOLIB (get_frame_pc (frame));
 #else
 #ifdef PC_SOLIB
       char *lib = PC_SOLIB (get_frame_pc (frame));
 #else

-      char *lib = solib_address (get_frame_pc (frame));
+      char *lib = solib_name_from_address (get_frame_pc (frame));

 #endif
       if (lib)
        {
 #endif
       if (lib)
        {


@@ -680,14 +825,6 @@ print_frame (struct frame_info *frame, int print_level,
   do_cleanups (old_chain);
 }
 \f
   do_cleanups (old_chain);
 }
 \f

-/* Show the frame info.  If this is the tui, it will be shown in the
-   source display otherwise, nothing is done.  */
-
-void
-show_stack_frame (struct frame_info *frame)
-{
-}
-\f

 
 /* Read a frame specification in whatever the appropriate format is
    from FRAME_EXP.  Call error(), printing MESSAGE, if the
 
 /* Read a frame specification in whatever the appropriate format is
    from FRAME_EXP.  Call error(), printing MESSAGE, if the


@@ -773,7 +910,7 @@ parse_frame_specification_1 (const char *frame_exp, const char *message,
   {
     int i;
     for (i = 0; i < numargs; i++)
   {
     int i;
     for (i = 0; i < numargs; i++)

-      addrs[i] = value_as_address (args[0]);
+      addrs[i] = value_as_address (args[i]);

   }
 
   /* Assume that the single arg[0] is an address, use that to identify
   }
 
   /* Assume that the single arg[0] is an address, use that to identify


@@ -833,18 +970,21 @@ frame_info (char *addr_exp, int from_tty)
   enum language funlang = language_unknown;
   const char *pc_regname;
   int selected_frame_p;
   enum language funlang = language_unknown;
   const char *pc_regname;
   int selected_frame_p;

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

 
   fi = parse_frame_specification_1 (addr_exp, "No stack.", &selected_frame_p);
 
   fi = parse_frame_specification_1 (addr_exp, "No stack.", &selected_frame_p);

+  gdbarch = get_frame_arch (fi);

 
   /* Name of the value returned by get_frame_pc().  Per comments, "pc"
      is not a good name.  */
 
   /* Name of the value returned by get_frame_pc().  Per comments, "pc"
      is not a good name.  */

-  if (PC_REGNUM >= 0)
-    /* OK, this is weird.  The PC_REGNUM hardware register's value can
+  if (gdbarch_pc_regnum (gdbarch) >= 0)
+    /* OK, this is weird.  The gdbarch_pc_regnum hardware register's value can

        easily not match that of the internal value returned by
        get_frame_pc().  */
        easily not match that of the internal value returned by
        get_frame_pc().  */

-    pc_regname = REGISTER_NAME (PC_REGNUM);
+    pc_regname = gdbarch_register_name (gdbarch, gdbarch_pc_regnum (gdbarch));

   else
   else

-    /* But then, this is weird to.  Even without PC_REGNUM, an
+    /* But then, this is weird to.  Even without gdbarch_pc_regnum, an

        architectures will often have a hardware register called "pc",
        and that register's value, again, can easily not match
        get_frame_pc().  */
        architectures will often have a hardware register called "pc",
        and that register's value, again, can easily not match
        get_frame_pc().  */


@@ -857,27 +997,21 @@ frame_info (char *addr_exp, int from_tty)
   s = find_pc_symtab (get_frame_pc (fi));
   if (func)
     {
   s = find_pc_symtab (get_frame_pc (fi));
   if (func)
     {

-      /* It seems appropriate to use SYMBOL_PRINT_NAME() here, to
-        display the demangled name that we already have stored in the
-        symbol table, but we stored a version with DMGL_PARAMS turned
-        on, and here we don't want to display parameters. So call the
-        demangler again, with DMGL_ANSI only.
-
-        Yes, printf_symbol_filtered() will again try to demangle the
-        name on the fly, but the issue is that if cplus_demangle()
-        fails here, it will fail there too. So we want to catch the
-        failure (where DEMANGLED is NULL below) here, while we still
-        have our hands on the function symbol.)  */
-      funname = DEPRECATED_SYMBOL_NAME (func);
+      funname = SYMBOL_PRINT_NAME (func);

       funlang = SYMBOL_LANGUAGE (func);
       if (funlang == language_cplus)
        {
       funlang = SYMBOL_LANGUAGE (func);
       if (funlang == language_cplus)
        {

-         char *demangled = cplus_demangle (funname, DMGL_ANSI);
-         /* If the demangler fails, try the demangled name from the
-            symbol table. That'll have parameters, but that's
-            preferable to displaying a mangled name.  */
-         if (demangled == NULL)
-           funname = SYMBOL_PRINT_NAME (func);
+         /* It seems appropriate to use SYMBOL_PRINT_NAME() here,
+            to display the demangled name that we already have
+            stored in the symbol table, but we stored a version
+            with DMGL_PARAMS turned on, and here we don't want to
+            display parameters.  So remove the parameters.  */
+         char *func_only = cp_remove_params (funname);
+         if (func_only)
+           {
+             funname = func_only;
+             make_cleanup (xfree, func_only);
+           }

        }
     }
   else
        }
     }
   else


@@ -887,7 +1021,7 @@ frame_info (char *addr_exp, int from_tty)
       msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
       if (msymbol != NULL)
        {
       msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
       if (msymbol != NULL)
        {

-         funname = DEPRECATED_SYMBOL_NAME (msymbol);
+         funname = SYMBOL_PRINT_NAME (msymbol);

          funlang = SYMBOL_LANGUAGE (msymbol);
        }
     }
          funlang = SYMBOL_LANGUAGE (msymbol);
        }
     }


@@ -902,10 +1036,10 @@ frame_info (char *addr_exp, int from_tty)
     {
       printf_filtered (_("Stack frame at "));
     }
     {
       printf_filtered (_("Stack frame at "));
     }

-  deprecated_print_address_numeric (get_frame_base (fi), 1, gdb_stdout);
+  fputs_filtered (paddress (get_frame_base (fi)), gdb_stdout);

   printf_filtered (":\n");
   printf_filtered (" %s = ", pc_regname);
   printf_filtered (":\n");
   printf_filtered (" %s = ", pc_regname);

-  deprecated_print_address_numeric (get_frame_pc (fi), 1, gdb_stdout);
+  fputs_filtered (paddress (get_frame_pc (fi)), gdb_stdout);

 
   wrap_here ("   ");
   if (funname)
 
   wrap_here ("   ");
   if (funname)


@@ -920,14 +1054,24 @@ frame_info (char *addr_exp, int from_tty)
   puts_filtered ("; ");
   wrap_here ("    ");
   printf_filtered ("saved %s ", pc_regname);
   puts_filtered ("; ");
   wrap_here ("    ");
   printf_filtered ("saved %s ", pc_regname);

-  deprecated_print_address_numeric (frame_pc_unwind (fi), 1, gdb_stdout);
+  fputs_filtered (paddress (frame_pc_unwind (fi)), gdb_stdout);

   printf_filtered ("\n");
 
   printf_filtered ("\n");
 

+  if (calling_frame_info == NULL)
+    {
+      enum unwind_stop_reason reason;
+
+      reason = get_frame_unwind_stop_reason (fi);
+      if (reason != UNWIND_NO_REASON)
+       printf_filtered (_(" Outermost frame: %s\n"),
+                        frame_stop_reason_string (reason));
+    }
+

   if (calling_frame_info)
     {
       printf_filtered (" called by frame at ");
   if (calling_frame_info)
     {
       printf_filtered (" called by frame at ");

-      deprecated_print_address_numeric (get_frame_base (calling_frame_info),
-                            1, gdb_stdout);
+      fputs_filtered (paddress (get_frame_base (calling_frame_info)),
+                     gdb_stdout);

     }
   if (get_next_frame (fi) && calling_frame_info)
     puts_filtered (",");
     }
   if (get_next_frame (fi) && calling_frame_info)
     puts_filtered (",");


@@ -935,11 +1079,12 @@ frame_info (char *addr_exp, int from_tty)
   if (get_next_frame (fi))
     {
       printf_filtered (" caller of frame at ");
   if (get_next_frame (fi))
     {
       printf_filtered (" caller of frame at ");

-      deprecated_print_address_numeric (get_frame_base (get_next_frame (fi)), 1,
-                            gdb_stdout);
+      fputs_filtered (paddress (get_frame_base (get_next_frame (fi))),
+                     gdb_stdout);

     }
   if (get_next_frame (fi) || calling_frame_info)
     puts_filtered ("\n");
     }
   if (get_next_frame (fi) || calling_frame_info)
     puts_filtered ("\n");

+

   if (s)
     printf_filtered (" source language %s.\n",
                     language_str (s->language));
   if (s)
     printf_filtered (" source language %s.\n",
                     language_str (s->language));


@@ -955,17 +1100,17 @@ frame_info (char *addr_exp, int from_tty)
     else
       {
        printf_filtered (" Arglist at ");
     else
       {
        printf_filtered (" Arglist at ");

-       deprecated_print_address_numeric (arg_list, 1, gdb_stdout);
+       fputs_filtered (paddress (arg_list), gdb_stdout);

        printf_filtered (",");
 
        printf_filtered (",");
 

-       if (!FRAME_NUM_ARGS_P ())
+       if (!gdbarch_frame_num_args_p (gdbarch))

          {
            numargs = -1;
            puts_filtered (" args: ");
          }
        else
          {
          {
            numargs = -1;
            puts_filtered (" args: ");
          }
        else
          {

-           numargs = FRAME_NUM_ARGS (fi);
+           numargs = gdbarch_frame_num_args (gdbarch, fi);

            gdb_assert (numargs >= 0);
            if (numargs == 0)
              puts_filtered (" no args.");
            gdb_assert (numargs >= 0);
            if (numargs == 0)
              puts_filtered (" no args.");


@@ -987,7 +1132,7 @@ frame_info (char *addr_exp, int from_tty)
     else
       {
        printf_filtered (" Locals at ");
     else
       {
        printf_filtered (" Locals at ");

-       deprecated_print_address_numeric (arg_list, 1, gdb_stdout);
+       fputs_filtered (paddress (arg_list), gdb_stdout);

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


@@ -1008,48 +1153,53 @@ frame_info (char *addr_exp, int from_tty)
        at one stage the frame cached the previous frame's SP instead
        of its address, hence it was easiest to just display the cached
        value.  */
        at one stage the frame cached the previous frame's SP instead
        of its address, hence it was easiest to just display the cached
        value.  */

-    if (SP_REGNUM >= 0)
+    if (gdbarch_sp_regnum (gdbarch) >= 0)

       {
        /* Find out the location of the saved stack pointer with out
            actually evaluating it.  */
       {
        /* Find out the location of the saved stack pointer with out
            actually evaluating it.  */

-       frame_register_unwind (fi, SP_REGNUM, &optimized, &lval, &addr,
+       frame_register_unwind (fi, gdbarch_sp_regnum (gdbarch),
+                              &optimized, &lval, &addr,

                               &realnum, NULL);
        if (!optimized && lval == not_lval)
          {
            gdb_byte value[MAX_REGISTER_SIZE];
            CORE_ADDR sp;
                               &realnum, NULL);
        if (!optimized && lval == not_lval)
          {
            gdb_byte value[MAX_REGISTER_SIZE];
            CORE_ADDR sp;

-           frame_register_unwind (fi, SP_REGNUM, &optimized, &lval, &addr,
+           frame_register_unwind (fi, gdbarch_sp_regnum (gdbarch),
+                                  &optimized, &lval, &addr,

                                   &realnum, value);
            /* NOTE: cagney/2003-05-22: This is assuming that the
                stack pointer was packed as an unsigned integer.  That
                may or may not be valid.  */
                                   &realnum, value);
            /* NOTE: cagney/2003-05-22: This is assuming that the
                stack pointer was packed as an unsigned integer.  That
                may or may not be valid.  */

-           sp = extract_unsigned_integer (value, register_size (current_gdbarch, SP_REGNUM));
+           sp = extract_unsigned_integer (value,
+                                          register_size (gdbarch,
+                                          gdbarch_sp_regnum (gdbarch)));

            printf_filtered (" Previous frame's sp is ");
            printf_filtered (" Previous frame's sp is ");

-           deprecated_print_address_numeric (sp, 1, gdb_stdout);
+           fputs_filtered (paddress (sp), gdb_stdout);

            printf_filtered ("\n");
            need_nl = 0;
          }
        else if (!optimized && lval == lval_memory)
          {
            printf_filtered (" Previous frame's sp at ");
            printf_filtered ("\n");
            need_nl = 0;
          }
        else if (!optimized && lval == lval_memory)
          {
            printf_filtered (" Previous frame's sp at ");

-           deprecated_print_address_numeric (addr, 1, gdb_stdout);
+           fputs_filtered (paddress (addr), gdb_stdout);

            printf_filtered ("\n");
            need_nl = 0;
          }
        else if (!optimized && lval == lval_register)
          {
            printf_filtered (" Previous frame's sp in %s\n",
            printf_filtered ("\n");
            need_nl = 0;
          }
        else if (!optimized && lval == lval_register)
          {
            printf_filtered (" Previous frame's sp in %s\n",

-                            REGISTER_NAME (realnum));
+                            gdbarch_register_name (gdbarch, realnum));

            need_nl = 0;
          }
        /* else keep quiet.  */
       }
 
     count = 0;
            need_nl = 0;
          }
        /* else keep quiet.  */
       }
 
     count = 0;

-    numregs = NUM_REGS + NUM_PSEUDO_REGS;
+    numregs = gdbarch_num_regs (gdbarch)
+             + gdbarch_num_pseudo_regs (gdbarch);

     for (i = 0; i < numregs; i++)
     for (i = 0; i < numregs; i++)

-      if (i != SP_REGNUM
-         && gdbarch_register_reggroup_p (current_gdbarch, i, all_reggroup))
+      if (i != gdbarch_sp_regnum (gdbarch)
+         && gdbarch_register_reggroup_p (gdbarch, i, all_reggroup))

        {
          /* Find out the location of the saved register without
              fetching the corresponding value.  */
        {
          /* Find out the location of the saved register without
              fetching the corresponding value.  */


@@ -1064,14 +1214,17 @@ frame_info (char *addr_exp, int from_tty)
              else
                puts_filtered (",");
              wrap_here (" ");
              else
                puts_filtered (",");
              wrap_here (" ");

-             printf_filtered (" %s at ", REGISTER_NAME (i));
-             deprecated_print_address_numeric (addr, 1, gdb_stdout);
+             printf_filtered (" %s at ",
+                              gdbarch_register_name (gdbarch, i));
+             fputs_filtered (paddress (addr), gdb_stdout);

              count++;
            }
        }
     if (count || need_nl)
       puts_filtered ("\n");
   }
              count++;
            }
        }
     if (count || need_nl)
       puts_filtered ("\n");
   }

+
+  do_cleanups (back_to);

 }
 
 /* Print briefly all stack frames or just the innermost COUNT_EXP
 }
 
 /* Print briefly all stack frames or just the innermost COUNT_EXP


@@ -1163,11 +1316,26 @@ backtrace_command_1 (char *count_exp, int show_locals, int from_tty)
       print_frame_info (fi, 1, LOCATION, 1);
       if (show_locals)
        print_frame_local_vars (fi, 1, gdb_stdout);
       print_frame_info (fi, 1, LOCATION, 1);
       if (show_locals)
        print_frame_local_vars (fi, 1, gdb_stdout);

+
+      /* Save the last frame to check for error conditions.  */
+      trailing = fi;

     }
 
   /* If we've stopped before the end, mention that.  */
   if (fi && from_tty)
     printf_filtered (_("(More stack frames follow...)\n"));
     }
 
   /* If we've stopped before the end, mention that.  */
   if (fi && from_tty)
     printf_filtered (_("(More stack frames follow...)\n"));

+
+  /* If we've run out of frames, and the reason appears to be an error
+     condition, print it.  */
+  if (fi == NULL && trailing != NULL)
+    {
+      enum unwind_stop_reason reason;
+
+      reason = get_frame_unwind_stop_reason (trailing);
+      if (reason > UNWIND_FIRST_ERROR)
+       printf_filtered (_("Backtrace stopped: %s\n"),
+                        frame_stop_reason_string (reason));
+    }

 }
 
 struct backtrace_command_args
 }
 
 struct backtrace_command_args


@@ -1199,7 +1367,7 @@ backtrace_command (char *arg, int from_tty)
       char **argv;
       int i;
 
       char **argv;
       int i;
 

-      argv = buildargv (arg);
+      argv = gdb_buildargv (arg);

       old_chain = make_cleanup_freeargv (argv);
       argc = 0;
       for (i = 0; argv[i]; i++)
       old_chain = make_cleanup_freeargv (argv);
       argc = 0;
       for (i = 0; argv[i]; i++)


@@ -1280,15 +1448,11 @@ print_block_frame_locals (struct block *b, struct frame_info *frame,
        case LOC_LOCAL:
        case LOC_REGISTER:
        case LOC_STATIC:
        case LOC_LOCAL:
        case LOC_REGISTER:
        case LOC_STATIC:

-       case LOC_BASEREG:

        case LOC_COMPUTED:
        case LOC_COMPUTED:

+         if (SYMBOL_IS_ARGUMENT (sym))
+           break;

          values_printed = 1;
          values_printed = 1;

-         for (j = 0; j < num_tabs; j++)
-           fputs_filtered ("\t", stream);
-         fputs_filtered (SYMBOL_PRINT_NAME (sym), stream);
-         fputs_filtered (" = ", stream);
-         print_variable_value (sym, frame, stream);
-         fprintf_filtered (stream, "\n");
+         print_variable_and_value (NULL, sym, frame, stream, 4 * num_tabs);

          break;
 
        default:
          break;
 
        default:


@@ -1312,7 +1476,7 @@ print_block_frame_labels (struct block *b, int *have_default,
 
   ALL_BLOCK_SYMBOLS (b, iter, sym)
     {
 
   ALL_BLOCK_SYMBOLS (b, iter, sym)
     {

-      if (strcmp (DEPRECATED_SYMBOL_NAME (sym), "default") == 0)
+      if (strcmp (SYMBOL_LINKAGE_NAME (sym), "default") == 0)

        {
          if (*have_default)
            continue;
        {
          if (*have_default)
            continue;


@@ -1321,13 +1485,15 @@ print_block_frame_labels (struct block *b, int *have_default,
       if (SYMBOL_CLASS (sym) == LOC_LABEL)
        {
          struct symtab_and_line sal;
       if (SYMBOL_CLASS (sym) == LOC_LABEL)
        {
          struct symtab_and_line sal;

+         struct value_print_options opts;

          sal = find_pc_line (SYMBOL_VALUE_ADDRESS (sym), 0);
          values_printed = 1;
          fputs_filtered (SYMBOL_PRINT_NAME (sym), stream);
          sal = find_pc_line (SYMBOL_VALUE_ADDRESS (sym), 0);
          values_printed = 1;
          fputs_filtered (SYMBOL_PRINT_NAME (sym), stream);

-         if (addressprint)
+         get_user_print_options (&opts);
+         if (opts.addressprint)

            {
              fprintf_filtered (stream, " ");
            {
              fprintf_filtered (stream, " ");

-             deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (sym), 1, stream);
+             fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (sym)), stream);

            }
          fprintf_filtered (stream, " in file %s, line %d\n",
                            sal.symtab->filename, sal.line);
            }
          fprintf_filtered (stream, " in file %s, line %d\n",
                            sal.symtab->filename, sal.line);


@@ -1377,6 +1543,9 @@ static void
 print_frame_label_vars (struct frame_info *frame, int this_level_only,
                        struct ui_file *stream)
 {
 print_frame_label_vars (struct frame_info *frame, int this_level_only,
                        struct ui_file *stream)
 {

+#if 1
+  fprintf_filtered (stream, "print_frame_label_vars disabled.\n");
+#else

   struct blockvector *bl;
   struct block *block = get_frame_block (frame, 0);
   int values_printed = 0;
   struct blockvector *bl;
   struct block *block = get_frame_block (frame, 0);
   int values_printed = 0;


@@ -1437,6 +1606,7 @@ print_frame_label_vars (struct frame_info *frame, int this_level_only,
 
   if (!values_printed && !this_level_only)
     fprintf_filtered (stream, _("No catches.\n"));
 
   if (!values_printed && !this_level_only)
     fprintf_filtered (stream, _("No catches.\n"));

+#endif

 }
 
 void
 }
 
 void


@@ -1451,22 +1621,9 @@ catch_info (char *ignore, int from_tty)
 {
   struct symtab_and_line *sal;
 
 {
   struct symtab_and_line *sal;
 

-  /* Check for target support for exception handling */
-  sal = target_enable_exception_callback (EX_EVENT_CATCH, 1);
-  if (sal)
-    {
-      /* Currently not handling this.  Ideally, here we should
-         interact with the C++ runtime system to find the list of
-         active handlers, etc.  */
-      fprintf_filtered (gdb_stdout, _("\
-Info catch not supported with this target/compiler combination.\n"));
-    }
-  else
-    {
-      /* Assume g++ compiled code; old GDB 4.16 behaviour.  */
-      print_frame_label_vars (get_selected_frame (_("No frame selected.")),
-                             0, gdb_stdout);
-    }
+  /* Assume g++ compiled code; old GDB 4.16 behaviour.  */
+  print_frame_label_vars (get_selected_frame (_("No frame selected.")),
+                          0, gdb_stdout);

 }
 
 static void
 }
 
 static void


@@ -1487,18 +1644,10 @@ print_frame_arg_vars (struct frame_info *frame, struct ui_file *stream)
   b = SYMBOL_BLOCK_VALUE (func);
   ALL_BLOCK_SYMBOLS (b, iter, sym)
     {
   b = SYMBOL_BLOCK_VALUE (func);
   ALL_BLOCK_SYMBOLS (b, iter, sym)
     {

-      switch (SYMBOL_CLASS (sym))
+      /* Don't worry about things which aren't arguments.  */
+      if (SYMBOL_IS_ARGUMENT (sym))

        {
        {

-       case LOC_ARG:
-       case LOC_LOCAL_ARG:
-       case LOC_REF_ARG:
-       case LOC_REGPARM:
-       case LOC_REGPARM_ADDR:
-       case LOC_BASEREG_ARG:
-       case LOC_COMPUTED_ARG:

          values_printed = 1;
          values_printed = 1;

-         fputs_filtered (SYMBOL_PRINT_NAME (sym), stream);
-         fputs_filtered (" = ", stream);

 
          /* We have to look up the symbol because arguments can have
             two entries (one a parameter, one a local) and the one we
 
          /* We have to look up the symbol because arguments can have
             two entries (one a parameter, one a local) and the one we


@@ -1511,15 +1660,10 @@ print_frame_arg_vars (struct frame_info *frame, struct ui_file *stream)
             float).  There are also LOC_ARG/LOC_REGISTER pairs which
             are not combined in symbol-reading.  */
 
             float).  There are also LOC_ARG/LOC_REGISTER pairs which
             are not combined in symbol-reading.  */
 

-         sym2 = lookup_symbol (DEPRECATED_SYMBOL_NAME (sym),
-                               b, VAR_DOMAIN, NULL, NULL);
-         print_variable_value (sym2, frame, stream);
-         fprintf_filtered (stream, "\n");
-         break;
-
-       default:
-         /* Don't worry about things which aren't arguments.  */
-         break;
+         sym2 = lookup_symbol (SYMBOL_LINKAGE_NAME (sym),
+                               b, VAR_DOMAIN, NULL);
+         print_variable_and_value (SYMBOL_PRINT_NAME (sym), sym2,
+                                   frame, stream, 0);

        }
     }
 
        }
     }
 


@@ -1563,27 +1707,10 @@ select_and_print_frame (struct frame_info *frame)
 struct block *
 get_selected_block (CORE_ADDR *addr_in_block)
 {
 struct block *
 get_selected_block (CORE_ADDR *addr_in_block)
 {

-  if (!target_has_stack)
+  if (!has_stack_frames ())

     return 0;
 
     return 0;
 

-  /* NOTE: cagney/2002-11-28: Why go to all this effort to not create
-     a selected/current frame?  Perhaps this function is called,
-     indirectly, by WFI in "infrun.c" where avoiding the creation of
-     an inner most frame is very important (it slows down single
-     step).  I suspect, though that this was true in the deep dark
-     past but is no longer the case.  A mindless look at all the
-     callers tends to support this theory.  I think we should be able
-     to assume that there is always a selcted frame.  */
-  /* gdb_assert (deprecated_selected_frame != NULL); So, do you feel
-     lucky? */
-  if (!deprecated_selected_frame)
-    {
-      CORE_ADDR pc = read_pc ();
-      if (addr_in_block != NULL)
-       *addr_in_block = pc;
-      return block_for_pc (pc);
-    }
-  return get_frame_block (deprecated_selected_frame, addr_in_block);
+  return get_frame_block (get_selected_frame (NULL), addr_in_block);

 }
 
 /* Find a frame a certain number of levels away from FRAME.
 }
 
 /* Find a frame a certain number of levels away from FRAME.


@@ -1727,11 +1854,13 @@ down_command (char *count_exp, int from_tty)
 void
 return_command (char *retval_exp, int from_tty)
 {
 void
 return_command (char *retval_exp, int from_tty)
 {

+  struct frame_info *thisframe;

   struct symbol *thisfun;
   struct value *return_value = NULL;
   const char *query_prefix = "";
 
   struct symbol *thisfun;
   struct value *return_value = NULL;
   const char *query_prefix = "";
 

-  thisfun = get_frame_function (get_selected_frame ("No selected frame."));
+  thisframe = get_selected_frame ("No selected frame.");
+  thisfun = get_frame_function (thisframe);

 
   /* Compute the return value.  If the computation triggers an error,
      let it bail.  If the return type can't be handled, set
 
   /* Compute the return value.  If the computation triggers an error,
      let it bail.  If the return type can't be handled, set


@@ -1739,18 +1868,27 @@ return_command (char *retval_exp, int from_tty)
      message.  */
   if (retval_exp)
     {
      message.  */
   if (retval_exp)
     {

+      struct expression *retval_expr = parse_expression (retval_exp);
+      struct cleanup *old_chain = make_cleanup (xfree, retval_expr);

       struct type *return_type = NULL;
 
       /* Compute the return value.  Should the computation fail, this
          call throws an error.  */
       struct type *return_type = NULL;
 
       /* Compute the return value.  Should the computation fail, this
          call throws an error.  */

-      return_value = parse_and_eval (retval_exp);
+      return_value = evaluate_expression (retval_expr);

 
       /* Cast return value to the return type of the function.  Should
          the cast fail, this call throws an error.  */
       if (thisfun != NULL)
        return_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (thisfun));
       if (return_type == NULL)
 
       /* Cast return value to the return type of the function.  Should
          the cast fail, this call throws an error.  */
       if (thisfun != NULL)
        return_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (thisfun));
       if (return_type == NULL)

-       return_type = builtin_type_int;
+       {
+         if (retval_expr->elts[0].opcode != UNOP_CAST)
+           error (_("Return value type not available for selected "
+                    "stack frame.\n"
+                    "Please use an explicit cast of the value to return."));
+         return_type = value_type (return_value);
+       }
+      do_cleanups (old_chain);

       CHECK_TYPEDEF (return_type);
       return_value = value_cast (return_type, return_value);
 
       CHECK_TYPEDEF (return_type);
       return_value = value_cast (return_type, return_value);
 


@@ -1766,23 +1904,8 @@ return_command (char *retval_exp, int from_tty)
            is discarded, side effects such as "return i++" still
            occur.  */
        return_value = NULL;
            is discarded, side effects such as "return i++" still
            occur.  */
        return_value = NULL;

-      /* FIXME: cagney/2004-01-17: If the architecture implements both
-         return_value and extract_returned_value_address, should allow
-         "return" to work - don't set return_value to NULL.  */
-      else if (!gdbarch_return_value_p (current_gdbarch)
-              && (TYPE_CODE (return_type) == TYPE_CODE_STRUCT
-                  || TYPE_CODE (return_type) == TYPE_CODE_UNION))
-       {
-         /* NOTE: cagney/2003-10-20: Compatibility hack for legacy
-            code.  Old architectures don't expect STORE_RETURN_VALUE
-            to be called with with a small struct that needs to be
-            stored in registers.  Don't start doing it now.  */
-         query_prefix = "\
-A structure or union return type is not supported by this architecture.\n\
-If you continue, the return value that you specified will be ignored.\n";
-         return_value = NULL;
-       }
-      else if (using_struct_return (return_type, 0))
+      else if (thisfun != NULL
+              && using_struct_return (SYMBOL_TYPE (thisfun), return_type))

        {
          query_prefix = "\
 The location at which to store the function's return value is unknown.\n\
        {
          query_prefix = "\
 The location at which to store the function's return value is unknown.\n\


@@ -1807,37 +1930,21 @@ If you continue, the return value that you specified will be ignored.\n";
        error (_("Not confirmed"));
     }
 
        error (_("Not confirmed"));
     }
 

-  /* NOTE: cagney/2003-01-18: Is this silly?  Rather than pop each
-     frame in turn, should this code just go straight to the relevant
-     frame and pop that?  */
+  /* Discard the selected frame and all frames inner-to it.  */
+  frame_pop (get_selected_frame (NULL));

 
 

-  /* First discard all frames inner-to the selected frame (making the
-     selected frame current).  */
-  {
-    struct frame_id selected_id = get_frame_id (get_selected_frame (NULL));
-    while (!frame_id_eq (selected_id, get_frame_id (get_current_frame ())))
-      {
-       if (frame_id_inner (selected_id, get_frame_id (get_current_frame ())))
-         /* Caught in the safety net, oops!  We've gone way past the
-             selected frame.  */
-         error (_("Problem while popping stack frames (corrupt stack?)"));
-       frame_pop (get_current_frame ());
-      }
-  }
-
-  /* Second discard the selected frame (which is now also the current
-     frame).  */
-  frame_pop (get_current_frame ());
-
-  /* Store RETURN_VAUE in the just-returned register set.  */
+  /* Store RETURN_VALUE in the just-returned register set.  */

   if (return_value != NULL)
     {
       struct type *return_type = value_type (return_value);
   if (return_value != NULL)
     {
       struct type *return_type = value_type (return_value);

-      gdb_assert (gdbarch_return_value (current_gdbarch, return_type,
-                                       NULL, NULL, NULL)
+      struct gdbarch *gdbarch = get_regcache_arch (get_current_regcache ());
+      struct type *func_type = thisfun == NULL ? NULL : SYMBOL_TYPE (thisfun);
+
+      gdb_assert (gdbarch_return_value (gdbarch, func_type, return_type, NULL,
+                                       NULL, NULL)

                  == RETURN_VALUE_REGISTER_CONVENTION);
                  == RETURN_VALUE_REGISTER_CONVENTION);

-      gdbarch_return_value (current_gdbarch, return_type,
-                           current_regcache, NULL /*read*/,
+      gdbarch_return_value (gdbarch, func_type, return_type,
+                           get_current_regcache (), NULL /*read*/,

                            value_contents (return_value) /*write*/);
     }
 
                            value_contents (return_value) /*write*/);
     }
 


@@ -1907,7 +2014,7 @@ func_command (char *arg, int from_tty)
 
   if (!found)
     printf_filtered (_("'%s' not within current stack frame.\n"), arg);
 
   if (!found)
     printf_filtered (_("'%s' not within current stack frame.\n"), arg);

-  else if (frame != deprecated_selected_frame)
+  else if (frame != get_selected_frame (NULL))

     select_and_print_frame (frame);
 }
 
     select_and_print_frame (frame);
 }
 


@@ -1916,7 +2023,7 @@ func_command (char *arg, int from_tty)
 enum language
 get_frame_language (void)
 {
 enum language
 get_frame_language (void)
 {

-  struct frame_info *frame = deprecated_selected_frame;
+  struct frame_info *frame = deprecated_safe_get_selected_frame ();

 
   if (frame)
     {
 
   if (frame)
     {


@@ -2030,6 +2137,26 @@ Usage: func <name>\n"));
   add_info ("catch", catch_info,
            _("Exceptions that can be caught in the current stack frame."));
 
   add_info ("catch", catch_info,
            _("Exceptions that can be caught in the current stack frame."));
 

+  add_setshow_enum_cmd ("frame-arguments", class_stack,
+                       print_frame_arguments_choices, &print_frame_arguments,
+                       _("Set printing of non-scalar frame arguments"),
+                       _("Show printing of non-scalar frame arguments"),
+                       NULL, NULL, NULL, &setprintlist, &showprintlist);
+
+  add_setshow_auto_boolean_cmd ("disassemble-next-line", class_stack,
+                               &disassemble_next_line, _("\
+Set whether to disassemble next source line when execution stops."), _("\
+Show whether to disassemble next source line when execution stops."), _("\
+If ON, GDB will display disassembly of the next source line when\n\
+execution of the program being debugged stops.\n\
+If AUTO (which is the default), or there's no line info to determine\n\
+the source line of the next instruction, display disassembly of next\n\
+instruction instead."),
+                               NULL,
+                               show_disassemble_next_line,
+                               &setlist, &showlist);
+  disassemble_next_line = AUTO_BOOLEAN_AUTO;
+

 #if 0
   add_cmd ("backtrace-limit", class_stack, set_backtrace_limit_command, _(\
 "Specify maximum number of frames for \"backtrace\" to print by default."),
 #if 0
   add_cmd ("backtrace-limit", class_stack, set_backtrace_limit_command, _(\
 "Specify maximum number of frames for \"backtrace\" to print by default."),