mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-26 03:24:41 +08:00
79a45b7d67
* varobj.c (value_get_print_value): Include valprint.h. (value_get_print_value): Use get_formatted_print_options. * value.h (struct value_print_options): Declare. (value_print, val_print, common_val_print, val_print_string): Update. * value.c: Include valprint.h. (show_values): Use get_user_print_options. (show_convenience): Likewise. * valprint.h (prettyprint_arrays, prettyprint_structs): Don't declare. (struct value_print_options): New type. (vtblprint, unionprint, addressprint, objectprint, print_max, inspect_it, repeat_count_threshold, output_format, stop_print_at_null): Don't declare. (user_print_options, get_user_print_options, get_raw_print_options, get_formatted_print_options): Declare. (print_array_indexes_p): Don't declare. (maybe_print_array_index, val_print_array_elements): Update. * valprint.c (print_max): Remove. (user_print_options): New global. (get_user_print_options, get_raw_print_options, get_formatted_print_options): New functions. (print_array_indexes, repeat_count_threshold, stop_print_at_null, prettyprint_structs, prettyprint_arrays, unionprint, addressprint): Remove. (val_print): Remove format, deref_ref, pretty arguments; add options. Update. (common_val_print): Likewise. (print_array_indexes_p): Remove. (maybe_print_array_index): Remove format, pretty arguments; add options. Update. (val_print_array_elements): Remove format, deref_ref, pretty arguments; add options. Update. (val_print_string): Add options argument. Update. (_initialize_valprint): Use user_print_options. (output_format): Remove. (set_output_radix_1): Use user_print_options. * typeprint.c: Include valprint.h. (objectprint): Don't declare. (whatis_exp): Use get_user_print_options. * tui/tui-regs.c: Include valprint.h. (tui_register_format): Use get_formatted_print_options. * tracepoint.c: Include valprint.h. (addressprint): Don't declare. (trace_mention): Use get_user_print_options. (tracepoints_info): Likewise. * stack.c (print_frame_args): Use get_raw_print_options. (print_frame_info): Use get_user_print_options. (print_frame): Likewise. * sh64-tdep.c: Include valprint.h (sh64_do_register): Use get_formatted_print_options. * scm-valprint.c (scm_inferior_print): Remove format, deref_ref, pretty arguments; add options. (scm_scmlist_print): Likewise. Update. (scm_scmval_print): Likewise. (scm_val_print): Likewise. (scm_value_print): Remove format, pretty arguments; add options. Update. * scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print): Update. * scm-lang.c (scm_printstr): Add options argument. * python/python-value.c: Include valprint.h. (valpy_str): Use get_user_print_options. * printcmd.c: Include valprint.h. (addressprint): Don't declare. (inspect_it): Remove. (print_formatted): Remove format option; add options. Update. (print_scalar_formatted): Likewise. (print_address_demangle): Use get_user_print_options. (do_examine): Use get_formatted_print_options. (print_command_1): Likewise. (output_command): Use get_formatted_print_options. (do_one_display): Likewise. (print_variable_value): Use get_user_print_options. * p-valprint.c (pascal_val_print): Remove format, deref_ref, pretty arguments; add options. Update. (pascal_value_print): Remove format, pretty arguments; add options. Update. (vtblprint, objectprint): Don't declare. (pascal_static_field_print): Remove. (pascal_object_print_value_fields): Remove format, pretty arguments; add options. Update. (pascal_object_print_static_field): Likewise. (_initialize_pascal_valprint): Use user_print_options. Update. * p-lang.h (pascal_val_print, pascal_value_print, pascal_printstr, pascal_object_print_value_fields): Update. (vtblprint, static_field_print): Don't declare. * p-lang.c (pascal_printstr): Add options argument. Update. * objc-lang.c (objc_printstr): Add options argument. Update. * mt-tdep.c: Include valprint.h. (mt_registers_info): Use get_raw_print_options. * mips-tdep.c: Include valprint.h. (mips_print_fp_register): Use get_formatted_print_options. (mips_print_register): Likewise. * mi/mi-main.c: Include valprint.h. (get_register): Use get_user_print_options. (mi_cmd_data_evaluate_expression): Likewise. (mi_cmd_data_read_memory): Use get_formatted_print_options. * mi/mi-cmd-stack.c: Include valprint.h. (list_args_or_locals): Use get_raw_print_options. * m2-valprint.c (print_function_pointer_address): Add addressprint argument. (m2_print_long_set): Remove format, pretty arguments. (m2_print_unbounded_array): Remove format, deref_ref, pretty arguments; add options. Update. (print_unpacked_pointer): Remove format argument; add options. Now static. Update. (print_variable_at_address): Remove format, deref_ref, pretty arguments; add options. Update. (m2_print_array_contents): Likewise. (m2_val_print): Likewise. * m2-lang.h (m2_val_print): Update. * m2-lang.c (m2_printstr): Add options argument. Update. * language.h (struct value_print_options): Declare. (struct language_defn) <la_printstr>: Add options argument. <la_val_print>: Remove format, deref_ref, pretty argument; add options. <la_value_print>: Remove format, pretty arguments; add options. <la_print_array_index>: Likewise. (LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING, LA_PRINT_ARRAY_INDEX): Update. (default_print_array_index): Update. * language.c (default_print_array_index): Remove format, pretty arguments; add options. Update. (unk_lang_printstr): Add options argument. (unk_lang_val_print): Remove format, deref_ref, pretty arguments; add options. (unk_lang_value_print): Remove format, pretty arguments; add options. * jv-valprint.c (java_value_print): Remove format, pretty arguments; add options. Update. (java_print_value_fields): Likewise. (java_val_print): Remove format, deref_ref, pretty arguments; add options. Update. * jv-lang.h (java_val_print, java_value_print): Declare. * infcmd.c: Include valprint.h. (print_return_value): Use get_raw_print_options. (default_print_registers_info): Use get_user_print_options, get_formatted_print_options. (registers_info): Use get_formatted_print_options. * gdbtypes.h (struct value_print_options): Declare. (print_scalar_formatted): Update. * f-valprint.c (f77_print_array_1): Remove format, deref_ref, pretty arguments; add options. Update. (f77_print_array): Likewise. (f_val_print): Likewise. * f-lang.h (f_val_print): Update. * f-lang.c (f_printstr): Add options argument. Update. (c_value_print): Update declaration. * expprint.c: Include valprint.h. (print_subexp_standard): Use get_raw_print_options, get_user_print_options. * eval.c: Include valprint.h. (objectprint): Don't declare. (evaluate_subexp_standard): Use get_user_print_options. * cp-valprint.c (vtblprint, objectprint, static_field_print): Remove. (cp_print_value_fields): Remove format, pretty arguments; add options. Update. (cp_print_value): Likewise. (cp_print_static_field): Likewise. (_initialize_cp_valprint): Use user_print_options. Update. * c-valprint.c (print_function_pointer_address): Add addressprint argument. (c_val_print): Remove format, deref_ref, pretty arguments; add options. Update. (c_value_print): Add options argument. Update. * c-lang.h (c_val_print, c_value_print, c_printstr): Update. (vtblprint, static_field_print): Don't declare. (cp_print_value_fields): Update. * c-lang.c (c_printstr): Add options argument. Update. * breakpoint.c: Include valprint.h. (addressprint): Don't declare. (watchpoint_value_print): Use get_user_print_options. (print_one_breakpoint_location): Likewise. (breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention, print_exception_catchpoint): Likewise. * auxv.c (fprint_target_auxv): Don't declare addressprint. Use get_user_print_options. * ada-valprint.c (struct ada_val_print_args): Remove format, deref_ref, and pretty; add options. (print_optional_low_bound): Add options argument. (val_print_packed_array_elements): Remove format and pretty arguments; add options. Update. (printstr): Add options argument. Update. (ada_printstr): Likewise. (ada_val_print): Remove format, deref_ref, pretty arguments; add options argument. Update. (ada_val_print_stub): Update. (ada_val_print_array): Remove format, deref_ref, pretty arguments; add options. Update. (ada_val_print_1): Likewise. (print_variant_part): Likewise. (ada_value_print): Remove format, pretty arguments; add options. Update. (print_record): Likewise. (print_field_values): Likewise. * ada-lang.h (ada_val_print, ada_value_print, ada_printstr): Update. * ada-lang.c (ada_print_array_index): Add options argument; remove format and pretty arguments. (print_one_exception): Use get_user_print_options. gdb/testsuite * gdb.base/exprs.exp (test_expr): Add enum formatting tests.
337 lines
9.7 KiB
C
337 lines
9.7 KiB
C
/* MI Command Set - stack commands.
|
|
Copyright (C) 2000, 2002, 2003, 2004, 2005, 2007, 2008
|
|
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
|
|
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,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "target.h"
|
|
#include "frame.h"
|
|
#include "value.h"
|
|
#include "mi-cmds.h"
|
|
#include "ui-out.h"
|
|
#include "symtab.h"
|
|
#include "block.h"
|
|
#include "stack.h"
|
|
#include "dictionary.h"
|
|
#include "gdb_string.h"
|
|
#include "language.h"
|
|
#include "valprint.h"
|
|
|
|
static void list_args_or_locals (int locals, 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
|
|
specifying the frame numbers at which to start and stop the
|
|
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;
|
|
int frame_high;
|
|
int i;
|
|
struct cleanup *cleanup_stack;
|
|
struct frame_info *fi;
|
|
|
|
if (argc > 2 || argc == 1)
|
|
error (_("mi_cmd_stack_list_frames: Usage: [FRAME_LOW FRAME_HIGH]"));
|
|
|
|
if (argc == 2)
|
|
{
|
|
frame_low = atoi (argv[0]);
|
|
frame_high = atoi (argv[1]);
|
|
}
|
|
else
|
|
{
|
|
/* Called with no arguments, it means we want the whole
|
|
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
|
|
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)
|
|
error (_("mi_cmd_stack_list_frames: Not enough frames in stack."));
|
|
|
|
cleanup_stack = make_cleanup_ui_out_list_begin_end (uiout, "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;
|
|
/* Print the location and the address always, even for level 0.
|
|
args == 0: don't print the arguments. */
|
|
print_frame_info (fi, 1, LOC_AND_ADDRESS, 0 /* args */ );
|
|
}
|
|
|
|
do_cleanups (cleanup_stack);
|
|
}
|
|
|
|
void
|
|
mi_cmd_stack_info_depth (char *command, char **argv, int argc)
|
|
{
|
|
int frame_high;
|
|
int i;
|
|
struct frame_info *fi;
|
|
|
|
if (argc > 1)
|
|
error (_("mi_cmd_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
|
|
the stack. */
|
|
frame_high = -1;
|
|
|
|
for (i = 0, fi = get_current_frame ();
|
|
fi && (i < frame_high || frame_high == -1);
|
|
i++, fi = get_prev_frame (fi))
|
|
QUIT;
|
|
|
|
ui_out_field_int (uiout, "depth", i);
|
|
}
|
|
|
|
/* 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"));
|
|
|
|
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);
|
|
}
|
|
|
|
/* 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
|
|
mi_cmd_stack_list_args (char *command, char **argv, int argc)
|
|
{
|
|
int frame_low;
|
|
int frame_high;
|
|
int i;
|
|
struct frame_info *fi;
|
|
struct cleanup *cleanup_stack_args;
|
|
|
|
if (argc < 1 || argc > 3 || argc == 2)
|
|
error (_("mi_cmd_stack_list_args: Usage: PRINT_VALUES [FRAME_LOW FRAME_HIGH]"));
|
|
|
|
if (argc == 3)
|
|
{
|
|
frame_low = atoi (argv[1]);
|
|
frame_high = atoi (argv[2]);
|
|
}
|
|
else
|
|
{
|
|
/* Called with no arguments, it means we want args for the whole
|
|
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
|
|
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)
|
|
error (_("mi_cmd_stack_list_args: Not enough frames in stack."));
|
|
|
|
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. */
|
|
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);
|
|
list_args_or_locals (0, atoi (argv[0]), fi);
|
|
do_cleanups (cleanup_frame);
|
|
}
|
|
|
|
do_cleanups (cleanup_stack_args);
|
|
}
|
|
|
|
/* 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)
|
|
{
|
|
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;
|
|
|
|
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");
|
|
|
|
while (block != 0)
|
|
{
|
|
ALL_BLOCK_SYMBOLS (block, iter, sym)
|
|
{
|
|
int print_me = 0;
|
|
|
|
switch (SYMBOL_CLASS (sym))
|
|
{
|
|
default:
|
|
case LOC_UNDEF: /* catches errors */
|
|
case LOC_CONST: /* constant */
|
|
case LOC_TYPEDEF: /* local typedef */
|
|
case LOC_LABEL: /* local label */
|
|
case LOC_BLOCK: /* local function */
|
|
case LOC_CONST_BYTES: /* loc. byte seq. */
|
|
case LOC_UNRESOLVED: /* unresolved static */
|
|
case LOC_OPTIMIZED_OUT: /* optimized out */
|
|
print_me = 0;
|
|
break;
|
|
|
|
case LOC_ARG: /* argument */
|
|
case LOC_REF_ARG: /* reference arg */
|
|
case LOC_REGPARM_ADDR: /* indirect register arg */
|
|
case LOC_LOCAL: /* stack local */
|
|
case LOC_STATIC: /* static */
|
|
case LOC_REGISTER: /* register */
|
|
case LOC_COMPUTED: /* computed location */
|
|
if (SYMBOL_IS_ARGUMENT (sym) ? !locals : locals)
|
|
print_me = 1;
|
|
break;
|
|
}
|
|
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));
|
|
|
|
if (!locals)
|
|
sym2 = lookup_symbol (SYMBOL_NATURAL_NAME (sym),
|
|
block, VAR_DOMAIN,
|
|
(int *) NULL);
|
|
else
|
|
sym2 = sym;
|
|
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);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (BLOCK_FUNCTION (block))
|
|
break;
|
|
else
|
|
block = BLOCK_SUPERBLOCK (block);
|
|
}
|
|
do_cleanups (cleanup_list);
|
|
ui_out_stream_delete (stb);
|
|
}
|
|
|
|
void
|
|
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"));
|
|
|
|
select_frame_command (argv[0], 1 /* not used */ );
|
|
}
|
|
|
|
void
|
|
mi_cmd_stack_info_frame (char *command, char **argv, int argc)
|
|
{
|
|
if (argc > 0)
|
|
error (_("mi_cmd_stack_info_frame: No arguments required"));
|
|
|
|
print_frame_info (get_selected_frame (NULL), 1, LOC_AND_ADDRESS, 0);
|
|
}
|