/* MI Command Set - stack commands.
- Copyright (C) 2000, 2002, 2003, 2004, 2005, 2007, 2008
+ Copyright (C) 2000, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
Contributed by Cygnus Solutions (a Red Hat company).
#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 };
+
+static void list_args_or_locals (enum what_to_list what,
+ int 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
struct frame_info *fi;
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)
{
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. */
struct frame_info *fi;
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]);
i++, fi = get_prev_frame (fi))
QUIT;
- ui_out_field_int (uiout, "depth", i);
+ ui_out_field_int (current_uiout, "depth", i);
}
-/* Print a list of the locals for the current frame. With argument of
+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
0, print only the names, with argument of 1 print also the
values. */
void
mi_cmd_stack_list_locals (char *command, char **argv, int argc)
{
struct frame_info *frame;
- enum print_values print_values;
if (argc != 1)
- error (_("mi_cmd_stack_list_locals: Usage: PRINT_VALUES"));
+ error (_("-stack-list-locals: Usage: PRINT_VALUES"));
frame = get_selected_frame (NULL);
- if (strcmp (argv[0], "0") == 0
- || strcmp (argv[0], mi_no_values) == 0)
- print_values = PRINT_NO_VALUES;
- else if (strcmp (argv[0], "1") == 0
- || strcmp (argv[0], mi_all_values) == 0)
- print_values = PRINT_ALL_VALUES;
- else if (strcmp (argv[0], "2") == 0
- || strcmp (argv[0], mi_simple_values) == 0)
- print_values = 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);
- list_args_or_locals (1, print_values, frame);
+ 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
values. */
void
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)
- 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)
{
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
displaying, or if frame_low is 0. */
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
frames in the stack. */
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);
- 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);
}
+/* 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);
+
+ list_args_or_locals (all, parse_print_values (argv[0]), frame);
+}
+
+
/* 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. */
static void
-list_args_or_locals (int locals, int values, struct frame_info *fi)
+list_args_or_locals (enum what_to_list what, int values, struct frame_info *fi)
{
struct block *block;
struct symbol *sym;
struct dict_iterator iter;
- int nsyms;
struct cleanup *cleanup_list;
static struct ui_stream *stb = NULL;
struct type *type;
+ char *name_of_result;
+ struct ui_out *uiout = current_uiout;
stb = ui_out_stream_new (uiout);
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)
{
case LOC_STATIC: /* static */
case LOC_REGISTER: /* register */
case LOC_COMPUTED: /* computed location */
- if (SYMBOL_IS_ARGUMENT (sym) ? !locals : locals)
+ if (what == all)
print_me = 1;
+ else if (what == locals)
+ print_me = !SYMBOL_IS_ARGUMENT (sym);
+ else
+ print_me = SYMBOL_IS_ARGUMENT (sym);
break;
}
if (print_me)
struct cleanup *cleanup_tuple = NULL;
struct symbol *sym2;
struct value *val;
- if (values != PRINT_NO_VALUES)
+
+ if (values != PRINT_NO_VALUES || what == all)
cleanup_tuple =
make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
ui_out_field_string (uiout, "name", SYMBOL_PRINT_NAME (sym));
+ if (what == all && SYMBOL_IS_ARGUMENT (sym))
+ ui_out_field_int (uiout, "arg", 1);
- if (!locals)
+ if (SYMBOL_IS_ARGUMENT (sym))
sym2 = lookup_symbol (SYMBOL_NATURAL_NAME (sym),
block, VAR_DOMAIN,
(int *) NULL);
&& TYPE_CODE (type) != TYPE_CODE_STRUCT
&& TYPE_CODE (type) != TYPE_CODE_UNION)
{
- struct value_print_options opts;
- val = read_var_value (sym2, fi);
- get_raw_print_options (&opts);
- opts.deref_ref = 1;
- common_val_print
- (val, stb->stream, 0, &opts,
- language_def (SYMBOL_LANGUAGE (sym2)));
+ volatile struct gdb_exception except;
+
+ TRY_CATCH (except, RETURN_MASK_ERROR)
+ {
+ struct value_print_options opts;
+
+ val = read_var_value (sym2, fi);
+ get_raw_print_options (&opts);
+ opts.deref_ref = 1;
+ common_val_print
+ (val, stb->stream, 0, &opts,
+ language_def (SYMBOL_LANGUAGE (sym2)));
+ }
+ if (except.reason < 0)
+ fprintf_filtered (stb->stream,
+ _("<error reading variable: %s>"),
+ except.message);
+
ui_out_field_stream (uiout, "value", stb);
}
- do_cleanups (cleanup_tuple);
break;
case PRINT_ALL_VALUES:
{
- struct value_print_options opts;
- val = read_var_value (sym2, fi);
- get_raw_print_options (&opts);
- opts.deref_ref = 1;
- common_val_print
- (val, stb->stream, 0, &opts,
- language_def (SYMBOL_LANGUAGE (sym2)));
+ volatile struct gdb_exception except;
+
+ TRY_CATCH (except, RETURN_MASK_ERROR)
+ {
+ struct value_print_options opts;
+
+ val = read_var_value (sym2, fi);
+ get_raw_print_options (&opts);
+ opts.deref_ref = 1;
+ common_val_print
+ (val, stb->stream, 0, &opts,
+ language_def (SYMBOL_LANGUAGE (sym2)));
+ }
+ if (except.reason < 0)
+ fprintf_filtered (stb->stream,
+ _("<error reading variable: %s>"),
+ except.message);
+
ui_out_field_stream (uiout, "value", stb);
- do_cleanups (cleanup_tuple);
}
break;
}
+
+ if (values != PRINT_NO_VALUES || what == all)
+ do_cleanups (cleanup_tuple);
}
}
if (BLOCK_FUNCTION (block))
mi_cmd_stack_select_frame (char *command, char **argv, int argc)
{
if (argc == 0 || argc > 1)
- error (_("mi_cmd_stack_select_frame: Usage: FRAME_SPEC"));
+ error (_("-stack-select-frame: Usage: FRAME_SPEC"));
select_frame_command (argv[0], 1 /* not used */ );
}
mi_cmd_stack_info_frame (char *command, char **argv, int argc)
{
if (argc > 0)
- error (_("mi_cmd_stack_info_frame: No arguments required"));
+ error (_("-stack-info-frame: No arguments required"));
print_frame_info (get_selected_frame (NULL), 1, LOC_AND_ADDRESS, 0);
}