/* MI Command Set - stack commands.
- Copyright (C) 2000, 2002, 2003, 2004, 2005, 2007, 2008, 2009
- 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.
#include "gdb_string.h"
#include "language.h"
#include "valprint.h"
-
+#include "exceptions.h"
enum what_to_list { locals, arguments, all };
static void list_args_or_locals (enum what_to_list what,
- int values, struct frame_info *fi);
+ 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
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);
}
static enum print_values
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
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);
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
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)
{
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);
}
/* Print a list of the local variables (including arguments) for the
- current frame. With argument of 0, print only the names, with
- argument of 1 print also the values. */
+ 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;
- enum print_values print_values;
if (argc != 1)
error (_("Usage: PRINT_VALUES"));
- frame = get_selected_frame (NULL);
+ frame = get_selected_frame (NULL);
- list_args_or_locals (all, parse_print_values (argv[0]), frame);
+ 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 accoring to VALUES. */
+
+static void
+list_arg_or_local (const struct frame_arg *arg, enum what_to_list what,
+ enum print_values values)
+{
+ struct cleanup *cleanup_tuple = NULL;
+ struct ui_out *uiout = current_uiout;
+ struct ui_stream *stb = ui_out_stream_new (uiout);
+
+ 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->stream);
+ if (arg->entry_kind == print_entry_values_only)
+ fputs_filtered ("@entry", stb->stream);
+ 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->stream, -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->stream, 0, &opts,
+ language_def (SYMBOL_LANGUAGE (arg->sym)));
+ }
+ }
+ if (except.message)
+ fprintf_filtered (stb->stream, _("<error reading variable: %s>"),
+ except.message);
+ ui_out_field_stream (uiout, "value", stb);
+ }
+
+ ui_out_stream_delete (stb);
+ if (values != PRINT_NO_VALUES || what == all)
+ do_cleanups (cleanup_tuple);
+}
/* 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 (enum what_to_list what, 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;
- int nsyms;
struct cleanup *cleanup_list;
- static struct ui_stream *stb = NULL;
+ struct ui_stream *stb;
struct type *type;
char *name_of_result;
+ struct ui_out *uiout = current_uiout;
stb = ui_out_stream_new (uiout);
switch (what)
{
case locals:
- name_of_result = "locals"; break;
+ name_of_result = "locals";
+ break;
case arguments:
- name_of_result = "args"; break;
+ name_of_result = "args";
+ break;
case all:
- name_of_result = "variables"; break;
+ name_of_result = "variables";
+ break;
default:
- gdb_assert (("unexpected value", 0));
+ internal_error (__FILE__, __LINE__,
+ "unexpected what_to_list: %d", (int) what);
}
cleanup_list = make_cleanup_ui_out_list_begin_end (uiout, name_of_result);
}
if (print_me)
{
- struct cleanup *cleanup_tuple = NULL;
struct symbol *sym2;
- struct value *val;
- 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 (SYMBOL_IS_ARGUMENT (sym))
- sym2 = lookup_symbol (SYMBOL_NATURAL_NAME (sym),
+ sym2 = lookup_symbol (SYMBOL_LINKAGE_NAME (sym),
block, VAR_DOMAIN,
(int *) NULL);
else
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);
- 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)
{
- 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)));
- 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)));
- ui_out_field_stream (uiout, "value", stb);
- do_cleanups (cleanup_tuple);
- }
+ read_frame_arg (sym2, fi, &arg, &entryarg);
+ }
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))
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);
}
projects / external / binutils.git / blobdiff