2012-03-27 Pedro Alves <palves@redhat.com>

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

diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 9a2a9ec1a2ed9827a4e56c6849e02680f6943e7a..f537dd6cd23f7a5035df5a8b66149adf1a2887b1 100644 (file)
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -1,12 +1,13 @@
 /* MI Command Set - stack commands.
 /* MI Command Set - stack commands.

-   Copyright 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002-2005, 2007-2012 Free Software Foundation,
+   Inc.

    Contributed by Cygnus Solutions (a Red Hat company).
 
    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
    Contributed by Cygnus Solutions (a Red Hat company).
 
    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,


@@ -15,9 +16,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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "target.h"
 
 #include "defs.h"
 #include "target.h"


@@ -30,15 +29,23 @@
 #include "stack.h"
 #include "dictionary.h"
 #include "gdb_string.h"
 #include "stack.h"
 #include "dictionary.h"
 #include "gdb_string.h"

+#include "language.h"
+#include "valprint.h"
+#include "exceptions.h"

 
 

-static void list_args_or_locals (int locals, int values, struct frame_info *fi);
+enum what_to_list { locals, arguments, all };

 
 

-/* Print a list of the stack frames. Args can be none, in which case
+static void list_args_or_locals (enum what_to_list what, 
+                                enum print_values values,
+                                struct frame_info *fi);
+
+/* Print a list of the stack frames.  Args can be none, in which case

    we want to print the whole backtrace, or a pair of numbers
    specifying the frame numbers at which to start and stop the
    we want to print the whole backtrace, or a pair of numbers
    specifying the frame numbers at which to start and stop the

-   display. If the two numbers are equal, a single frame will be
-   displayed. */
-enum mi_cmd_result
+   display.  If the two numbers are equal, a single frame will be
+   displayed.  */
+
+void

 mi_cmd_stack_list_frames (char *command, char **argv, int argc)
 {
   int frame_low;
 mi_cmd_stack_list_frames (char *command, char **argv, int argc)
 {
   int frame_low;


@@ -47,11 +54,8 @@ mi_cmd_stack_list_frames (char *command, char **argv, int argc)
   struct cleanup *cleanup_stack;
   struct frame_info *fi;
 
   struct cleanup *cleanup_stack;
   struct frame_info *fi;
 

-  if (!target_has_stack)
-    error ("mi_cmd_stack_list_frames: No stack.");
-

   if (argc > 2 || argc == 1)
   if (argc > 2 || argc == 1)

-    error ("mi_cmd_stack_list_frames: Usage: [FRAME_LOW FRAME_HIGH]");
+    error (_("-stack-list-frames: Usage: [FRAME_LOW FRAME_HIGH]"));

 
   if (argc == 2)
     {
 
   if (argc == 2)
     {


@@ -61,65 +65,53 @@ mi_cmd_stack_list_frames (char *command, char **argv, int argc)
   else
     {
       /* Called with no arguments, it means we want the whole
   else
     {
       /* Called with no arguments, it means we want the whole

-         backtrace. */
+         backtrace.  */

       frame_low = -1;
       frame_high = -1;
     }
 
   /* Let's position fi on the frame at which to start the
      display. Could be the innermost frame if the whole stack needs
       frame_low = -1;
       frame_high = -1;
     }
 
   /* Let's position fi on the frame at which to start the
      display. Could be the innermost frame if the whole stack needs

-     displaying, or if frame_low is 0. */
+     displaying, or if frame_low is 0.  */

   for (i = 0, fi = get_current_frame ();
        fi && i < frame_low;
        i++, fi = get_prev_frame (fi));
 
   if (fi == NULL)
   for (i = 0, fi = get_current_frame ();
        fi && i < frame_low;
        i++, fi = get_prev_frame (fi));
 
   if (fi == NULL)

-    error ("mi_cmd_stack_list_frames: Not enough frames in stack.");
+    error (_("-stack-list-frames: Not enough frames in stack."));

 
 

-  cleanup_stack = make_cleanup_ui_out_list_begin_end (uiout, "stack");
+  cleanup_stack = make_cleanup_ui_out_list_begin_end (current_uiout, "stack");

 
 

-  /* Now let;s print the frames up to frame_high, or until there are
-     frames in the stack. */
+  /* Now let's print the frames up to frame_high, or until there are
+     frames in the stack.  */

   for (;
        fi && (i <= frame_high || frame_high == -1);
        i++, fi = get_prev_frame (fi))
     {
       QUIT;
   for (;
        fi && (i <= frame_high || frame_high == -1);
        i++, fi = get_prev_frame (fi))
     {
       QUIT;

-      /* level == i: always print the level 'i'
-         source == LOC_AND_ADDRESS: print the location and the address 
-         always, even for level 0.
-         args == 0: don't print the arguments. */
-      print_frame_info (fi /* frame info */ ,
-                       i /* level */ ,
-                       LOC_AND_ADDRESS /* source */ ,
-                       0 /* args */ );
+      /* Print the location and the address always, even for level 0.
+         If args is 0, don't print the arguments.  */
+      print_frame_info (fi, 1, LOC_AND_ADDRESS, 0 /* args */ );

     }
 
   do_cleanups (cleanup_stack);
     }
 
   do_cleanups (cleanup_stack);

-  if (i < frame_high)
-    error ("mi_cmd_stack_list_frames: Not enough frames in stack.");
-
-  return MI_CMD_DONE;

 }
 
 }
 

-enum mi_cmd_result
+void

 mi_cmd_stack_info_depth (char *command, char **argv, int argc)
 {
   int frame_high;
   int i;
   struct frame_info *fi;
 
 mi_cmd_stack_info_depth (char *command, char **argv, int argc)
 {
   int frame_high;
   int i;
   struct frame_info *fi;
 

-  if (!target_has_stack)
-    error ("mi_cmd_stack_info_depth: No stack.");
-

   if (argc > 1)
   if (argc > 1)

-    error ("mi_cmd_stack_info_depth: Usage: [MAX_DEPTH]");
+    error (_("-stack-info-depth: Usage: [MAX_DEPTH]"));

 
   if (argc == 1)
     frame_high = atoi (argv[0]);
   else
     /* Called with no arguments, it means we want the real depth of
 
   if (argc == 1)
     frame_high = atoi (argv[0]);
   else
     /* Called with no arguments, it means we want the real depth of

-       the stack. */
+       the stack.  */

     frame_high = -1;
 
   for (i = 0, fi = get_current_frame ();
     frame_high = -1;
 
   for (i = 0, fi = get_current_frame ();


@@ -127,44 +119,49 @@ mi_cmd_stack_info_depth (char *command, char **argv, int argc)
        i++, fi = get_prev_frame (fi))
     QUIT;
 
        i++, fi = get_prev_frame (fi))
     QUIT;
 

-  ui_out_field_int (uiout, "depth", i);
+  ui_out_field_int (current_uiout, "depth", i);
+}

 
 

-  return MI_CMD_DONE;
+static enum print_values
+parse_print_values (char *name)
+{
+   if (strcmp (name, "0") == 0
+       || strcmp (name, mi_no_values) == 0)
+     return PRINT_NO_VALUES;
+   else if (strcmp (name, "1") == 0
+           || strcmp (name, mi_all_values) == 0)
+     return PRINT_ALL_VALUES;
+   else if (strcmp (name, "2") == 0
+           || strcmp (name, mi_simple_values) == 0)
+     return PRINT_SIMPLE_VALUES;
+   else
+     error (_("Unknown value for PRINT_VALUES: must be: \
+0 or \"%s\", 1 or \"%s\", 2 or \"%s\""),
+           mi_no_values, mi_all_values, mi_simple_values);

 }
 
 }
 

-/* Print a list of the locals for the current frame. With argument of
+/* Print a list of the locals for the current frame.  With argument of

    0, print only the names, with argument of 1 print also the
    0, print only the names, with argument of 1 print also the

-   values. */
-enum mi_cmd_result
+   values.  */
+
+void

 mi_cmd_stack_list_locals (char *command, char **argv, int argc)
 {
   struct frame_info *frame;
 mi_cmd_stack_list_locals (char *command, char **argv, int argc)
 {
   struct frame_info *frame;

-  enum print_values print_values;

 
   if (argc != 1)
 
   if (argc != 1)

-    error ("mi_cmd_stack_list_locals: Usage: PRINT_VALUES");
-
-   frame = get_selected_frame ();
-
-   if (strcmp (argv[0], "0") == 0
-       || strcmp (argv[0], "--no-values") == 0)
-     print_values = PRINT_NO_VALUES;
-   else if (strcmp (argv[0], "1") == 0
-           || strcmp (argv[0], "--all-values") == 0)
-     print_values = PRINT_ALL_VALUES;
-   else if (strcmp (argv[0], "2") == 0
-           || strcmp (argv[0], "--simple-values") == 0)
-     print_values = PRINT_SIMPLE_VALUES;
-   else
-     error ("Unknown value for PRINT_VALUES: must be: 0 or \"--no-values\", 1 or \"--all-values\", 2 or \"--simple-values\"");
-  list_args_or_locals (1, print_values, frame);
-  return MI_CMD_DONE;
+    error (_("-stack-list-locals: Usage: PRINT_VALUES"));
+
+   frame = get_selected_frame (NULL);
+
+   list_args_or_locals (locals, parse_print_values (argv[0]), frame);

 }
 
 }
 

-/* Print a list of the arguments for the current frame. With argument
+/* Print a list of the arguments for the current frame.  With argument

    of 0, print only the names, with argument of 1 print also the
    of 0, print only the names, with argument of 1 print also the

-   values. */
-enum mi_cmd_result
+   values.  */
+
+void

 mi_cmd_stack_list_args (char *command, char **argv, int argc)
 {
   int frame_low;
 mi_cmd_stack_list_args (char *command, char **argv, int argc)
 {
   int frame_low;


@@ -172,9 +169,12 @@ mi_cmd_stack_list_args (char *command, char **argv, int argc)
   int i;
   struct frame_info *fi;
   struct cleanup *cleanup_stack_args;
   int i;
   struct frame_info *fi;
   struct cleanup *cleanup_stack_args;

+  enum print_values print_values;
+  struct ui_out *uiout = current_uiout;

 
   if (argc < 1 || argc > 3 || argc == 2)
 
   if (argc < 1 || argc > 3 || argc == 2)

-    error ("mi_cmd_stack_list_args: Usage: PRINT_VALUES [FRAME_LOW FRAME_HIGH]");
+    error (_("-stack-list-arguments: Usage: "
+            "PRINT_VALUES [FRAME_LOW FRAME_HIGH]"));

 
   if (argc == 3)
     {
 
   if (argc == 3)
     {


@@ -184,64 +184,175 @@ mi_cmd_stack_list_args (char *command, char **argv, int argc)
   else
     {
       /* Called with no arguments, it means we want args for the whole
   else
     {
       /* Called with no arguments, it means we want args for the whole

-         backtrace. */
+         backtrace.  */

       frame_low = -1;
       frame_high = -1;
     }
 
       frame_low = -1;
       frame_high = -1;
     }
 

+  print_values = parse_print_values (argv[0]);
+

   /* Let's position fi on the frame at which to start the
      display. Could be the innermost frame if the whole stack needs
   /* Let's position fi on the frame at which to start the
      display. Could be the innermost frame if the whole stack needs

-     displaying, or if frame_low is 0. */
+     displaying, or if frame_low is 0.  */

   for (i = 0, fi = get_current_frame ();
        fi && i < frame_low;
        i++, fi = get_prev_frame (fi));
 
   if (fi == NULL)
   for (i = 0, fi = get_current_frame ();
        fi && i < frame_low;
        i++, fi = get_prev_frame (fi));
 
   if (fi == NULL)

-    error ("mi_cmd_stack_list_args: Not enough frames in stack.");
+    error (_("-stack-list-arguments: Not enough frames in stack."));

 
 

-  cleanup_stack_args = make_cleanup_ui_out_list_begin_end (uiout, "stack-args");
+  cleanup_stack_args
+    = make_cleanup_ui_out_list_begin_end (uiout, "stack-args");

 
   /* Now let's print the frames up to frame_high, or until there are
 
   /* Now let's print the frames up to frame_high, or until there are

-     frames in the stack. */
+     frames in the stack.  */

   for (;
        fi && (i <= frame_high || frame_high == -1);
        i++, fi = get_prev_frame (fi))
     {
       struct cleanup *cleanup_frame;
   for (;
        fi && (i <= frame_high || frame_high == -1);
        i++, fi = get_prev_frame (fi))
     {
       struct cleanup *cleanup_frame;

+

       QUIT;
       cleanup_frame = make_cleanup_ui_out_tuple_begin_end (uiout, "frame");
       ui_out_field_int (uiout, "level", i);
       QUIT;
       cleanup_frame = make_cleanup_ui_out_tuple_begin_end (uiout, "frame");
       ui_out_field_int (uiout, "level", i);

-      list_args_or_locals (0, atoi (argv[0]), fi);
+      list_args_or_locals (arguments, print_values, fi);

       do_cleanups (cleanup_frame);
     }
 
   do_cleanups (cleanup_stack_args);
       do_cleanups (cleanup_frame);
     }
 
   do_cleanups (cleanup_stack_args);

-  if (i < frame_high)
-    error ("mi_cmd_stack_list_args: Not enough frames in stack.");
+}
+
+/* Print a list of the local variables (including arguments) for the 
+   current frame.  ARGC must be 1 and ARGV[0] specify if only the names,
+   or both names and values of the variables must be printed.  See 
+   parse_print_value for possible values.  */
+
+void
+mi_cmd_stack_list_variables (char *command, char **argv, int argc)
+{
+  struct frame_info *frame;
+
+  if (argc != 1)
+    error (_("Usage: PRINT_VALUES"));
+
+  frame = get_selected_frame (NULL);

 
 

-  return MI_CMD_DONE;
+  list_args_or_locals (all, parse_print_values (argv[0]), frame);
+}
+
+/* Print single local or argument.  ARG must be already read in.  For
+   WHAT and VALUES see list_args_or_locals.
+
+   Errors are printed as if they would be the parameter value.  Use
+   zeroed ARG iff it should not be printed according to VALUES.  */
+
+static void
+list_arg_or_local (const struct frame_arg *arg, enum what_to_list what,
+                  enum print_values values)
+{
+  struct cleanup *old_chain;
+  struct cleanup *cleanup_tuple = NULL;
+  struct ui_out *uiout = current_uiout;
+  struct ui_file *stb;
+
+  stb = mem_fileopen ();
+  old_chain = make_cleanup_ui_file_delete (stb);
+
+  gdb_assert (!arg->val || !arg->error);
+  gdb_assert ((values == PRINT_NO_VALUES && arg->val == NULL
+              && arg->error == NULL)
+             || values == PRINT_SIMPLE_VALUES
+             || (values == PRINT_ALL_VALUES
+                 && (arg->val != NULL || arg->error != NULL)));
+  gdb_assert (arg->entry_kind == print_entry_values_no
+             || (arg->entry_kind == print_entry_values_only
+                 && (arg->val || arg->error)));
+
+  if (values != PRINT_NO_VALUES || what == all)
+    cleanup_tuple = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
+
+  fputs_filtered (SYMBOL_PRINT_NAME (arg->sym), stb);
+  if (arg->entry_kind == print_entry_values_only)
+    fputs_filtered ("@entry", stb);
+  ui_out_field_stream (uiout, "name", stb);
+
+  if (what == all && SYMBOL_IS_ARGUMENT (arg->sym))
+    ui_out_field_int (uiout, "arg", 1);
+
+  if (values == PRINT_SIMPLE_VALUES)
+    {
+      check_typedef (arg->sym->type);
+      type_print (arg->sym->type, "", stb, -1);
+      ui_out_field_stream (uiout, "type", stb);
+    }
+
+  if (arg->val || arg->error)
+    {
+      volatile struct gdb_exception except;
+
+      if (arg->error)
+       except.message = arg->error;
+      else
+       {
+         /* TRY_CATCH has two statements, wrap it in a block.  */
+
+         TRY_CATCH (except, RETURN_MASK_ERROR)
+           {
+             struct value_print_options opts;
+
+             get_raw_print_options (&opts);
+             opts.deref_ref = 1;
+             common_val_print (arg->val, stb, 0, &opts,
+                               language_def (SYMBOL_LANGUAGE (arg->sym)));
+           }
+       }
+      if (except.message)
+       fprintf_filtered (stb, _("<error reading variable: %s>"),
+                         except.message);
+      ui_out_field_stream (uiout, "value", stb);
+    }
+
+  if (values != PRINT_NO_VALUES || what == all)
+    do_cleanups (cleanup_tuple);
+  do_cleanups (old_chain);

 }
 
 /* Print a list of the locals or the arguments for the currently
    selected frame.  If the argument passed is 0, printonly the names
    of the variables, if an argument of 1 is passed, print the values
 }
 
 /* Print a list of the locals or the arguments for the currently
    selected frame.  If the argument passed is 0, printonly the names
    of the variables, if an argument of 1 is passed, print the values

-   as well. */
+   as well.  */
+

 static void
 static void

-list_args_or_locals (int locals, int values, struct frame_info *fi)
+list_args_or_locals (enum what_to_list what, enum print_values values,
+                    struct frame_info *fi)

 {
   struct block *block;
   struct symbol *sym;
   struct dict_iterator iter;
 {
   struct block *block;
   struct symbol *sym;
   struct dict_iterator iter;

-  int nsyms;

   struct cleanup *cleanup_list;
   struct cleanup *cleanup_list;

-  static struct ui_stream *stb = NULL;

   struct type *type;
   struct type *type;

-
-  stb = ui_out_stream_new (uiout);
+  char *name_of_result;
+  struct ui_out *uiout = current_uiout;

 
   block = get_frame_block (fi, 0);
 
 
   block = get_frame_block (fi, 0);
 

-  cleanup_list = make_cleanup_ui_out_list_begin_end (uiout, locals ? "locals" : "args");
+  switch (what)
+    {
+    case locals:
+      name_of_result = "locals";
+      break;
+    case arguments:
+      name_of_result = "args";
+      break;
+    case all:
+      name_of_result = "variables";
+      break;
+    default:
+      internal_error (__FILE__, __LINE__,
+                     "unexpected what_to_list: %d", (int) what);
+    }
+
+  cleanup_list = make_cleanup_ui_out_list_begin_end (uiout, name_of_result);

 
   while (block != 0)
     {
 
   while (block != 0)
     {


@@ -265,85 +376,84 @@ list_args_or_locals (int locals, int values, struct frame_info *fi)
 
            case LOC_ARG:       /* argument              */
            case LOC_REF_ARG:   /* reference arg         */
 
            case LOC_ARG:       /* argument              */
            case LOC_REF_ARG:   /* reference arg         */

-           case LOC_REGPARM:   /* register arg          */

            case LOC_REGPARM_ADDR:      /* indirect register arg */
            case LOC_REGPARM_ADDR:      /* indirect register arg */

-           case LOC_LOCAL_ARG: /* stack arg             */
-           case LOC_BASEREG_ARG:       /* basereg arg           */
-           case LOC_COMPUTED_ARG:      /* arg with computed location */
-             if (!locals)
-               print_me = 1;
-             break;
-

            case LOC_LOCAL:     /* stack local           */
            case LOC_LOCAL:     /* stack local           */

-           case LOC_BASEREG:   /* basereg local         */

            case LOC_STATIC:    /* static                */
            case LOC_REGISTER:  /* register              */
            case LOC_COMPUTED:  /* computed location     */
            case LOC_STATIC:    /* static                */
            case LOC_REGISTER:  /* register              */
            case LOC_COMPUTED:  /* computed location     */

-             if (locals)
+             if (what == all)

                print_me = 1;
                print_me = 1;

+             else if (what == locals)
+               print_me = !SYMBOL_IS_ARGUMENT (sym);
+             else
+               print_me = SYMBOL_IS_ARGUMENT (sym);

              break;
            }
          if (print_me)
            {
              break;
            }
          if (print_me)
            {

-             struct cleanup *cleanup_tuple = NULL;

              struct symbol *sym2;
              struct symbol *sym2;

-             if (values != PRINT_NO_VALUES)
-               cleanup_tuple =
-                 make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
-             ui_out_field_string (uiout, "name", SYMBOL_PRINT_NAME (sym));
+             struct frame_arg arg, entryarg;

 
 

-             if (!locals)
-               sym2 = lookup_symbol (SYMBOL_NATURAL_NAME (sym),
+             if (SYMBOL_IS_ARGUMENT (sym))
+               sym2 = lookup_symbol (SYMBOL_LINKAGE_NAME (sym),

                                      block, VAR_DOMAIN,
                                      block, VAR_DOMAIN,

-                                     (int *) NULL,
-                                     (struct symtab **) NULL);
+                                     (int *) NULL);

              else
              else

-                   sym2 = sym;
+               sym2 = sym;
+             gdb_assert (sym2 != NULL);
+
+             memset (&arg, 0, sizeof (arg));
+             arg.sym = sym2;
+             arg.entry_kind = print_entry_values_no;
+             memset (&entryarg, 0, sizeof (entryarg));
+             entryarg.sym = sym2;
+             entryarg.entry_kind = print_entry_values_no;
+

              switch (values)
                {
                case PRINT_SIMPLE_VALUES:
                  type = check_typedef (sym2->type);
              switch (values)
                {
                case PRINT_SIMPLE_VALUES:
                  type = check_typedef (sym2->type);

-                 type_print (sym2->type, "", stb->stream, -1);
-                 ui_out_field_stream (uiout, "type", stb);

                  if (TYPE_CODE (type) != TYPE_CODE_ARRAY
                      && TYPE_CODE (type) != TYPE_CODE_STRUCT
                      && TYPE_CODE (type) != TYPE_CODE_UNION)
                    {
                  if (TYPE_CODE (type) != TYPE_CODE_ARRAY
                      && TYPE_CODE (type) != TYPE_CODE_STRUCT
                      && TYPE_CODE (type) != TYPE_CODE_UNION)
                    {

-                     print_variable_value (sym2, fi, stb->stream);
-                     ui_out_field_stream (uiout, "value", stb);
-                   }
-                 do_cleanups (cleanup_tuple);
-                 break;

                case PRINT_ALL_VALUES:
                case PRINT_ALL_VALUES:

-                 print_variable_value (sym2, fi, stb->stream);
-                 ui_out_field_stream (uiout, "value", stb);
-                 do_cleanups (cleanup_tuple);
+                     read_frame_arg (sym2, fi, &arg, &entryarg);
+                   }

                  break;
                }
                  break;
                }

+
+             if (arg.entry_kind != print_entry_values_only)
+               list_arg_or_local (&arg, what, values);
+             if (entryarg.entry_kind != print_entry_values_no)
+               list_arg_or_local (&entryarg, what, values);
+             xfree (arg.error);
+             xfree (entryarg.error);

            }
        }
            }
        }

+

       if (BLOCK_FUNCTION (block))
        break;
       else
        block = BLOCK_SUPERBLOCK (block);
     }
   do_cleanups (cleanup_list);
       if (BLOCK_FUNCTION (block))
        break;
       else
        block = BLOCK_SUPERBLOCK (block);
     }
   do_cleanups (cleanup_list);

-  ui_out_stream_delete (stb);

 }
 
 }
 

-enum mi_cmd_result
+void

 mi_cmd_stack_select_frame (char *command, char **argv, int argc)
 {
 mi_cmd_stack_select_frame (char *command, char **argv, int argc)
 {

-  if (!target_has_stack)
-    error ("mi_cmd_stack_select_frame: No stack.");
+  if (argc == 0 || argc > 1)
+    error (_("-stack-select-frame: Usage: FRAME_SPEC"));

 
 

-  if (argc > 1)
-    error ("mi_cmd_stack_select_frame: Usage: [FRAME_SPEC]");
+  select_frame_command (argv[0], 1 /* not used */ );
+}

 
 

-  /* with no args, don't change frame */
-  if (argc == 0)
-    select_frame_command (0, 1 /* not used */ );
-  else
-    select_frame_command (argv[0], 1 /* not used */ );
-  return MI_CMD_DONE;
+void
+mi_cmd_stack_info_frame (char *command, char **argv, int argc)
+{
+  if (argc > 0)
+    error (_("-stack-info-frame: No arguments allowed"));
+
+  print_frame_info (get_selected_frame (NULL), 1, LOC_AND_ADDRESS, 0);

 }
 }