6f937416b9
This is sort of a continuation of Keith's parse_exp_1 constification patch. It started out by undoing these bits: @@ -754,9 +754,12 @@ validate_actionline (char **line, struct tmp_p = p; for (loc = t->base.loc; loc; loc = loc->next) { - p = tmp_p; - exp = parse_exp_1 (&p, loc->address, + const char *q; + + q = tmp_p; + exp = parse_exp_1 (&q, loc->address, block_for_pc (loc->address), 1); + p = (char *) q; and progressively making more things const upwards, fixing fallout, rinse repeat, until GDB built again (--enable-targets=all). That ended up constifying lookup_cmd/add_cmd and (lots of) friends, and the completers. I didn't try to constify the command hooks themselves, because I know upfront there are commands that write to the command string argument, and I think I managed to stop at a nice non-hacky split point already. I think the only non-really-super-obvious changes are tracepoint.c:validate_actionline, and tracepoint.c:trace_dump_actions. The rest is just mostly about 'char *' => 'const char *', 'char **'=> 'const char **', and the occasional (e.g., deprecated_cmd_warning) case of 'char **'=> 'const char *', where/when I noticed that nothing actually cares about the pointer to pointer output. Tested on x86_64 Fedora 17, native and gdbserver. gdb/ 2013-03-13 Pedro Alves <palves@redhat.com> * ada-lang.c (struct add_partial_datum) <text, text0, word>: Make fields const. (ada_make_symbol_completion_list): Make "text0" parameter const. * ax-gdb.c (agent_eval_command_one): Make "exp" parameter const. * breakpoint.c (condition_completer): Make "text" and "word" parameters const. Adjust. (check_tracepoint_command): Adjust to validate_actionline prototype change. (catch_syscall_completer): Make "text" and "word" parameters const. * cli/cli-cmds.c (show_user): Make "comname" local const. (valid_command_p): Make "command" parameter const. (alias_command): Make "alias_prefix" and "command_prefix" locals const. * cli/cli-decode.c (add_cmd): Make "name" parameter const. (add_alias_cmd): Make "name" and "oldname" parameters const. Adjust. No longer make copy of OLDNAME. (add_prefix_cmd, add_abbrev_prefix_cmd, add_set_or_show_cmd) (add_setshow_cmd_full, add_setshow_enum_cmd) (add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd) (add_setshow_filename_cmd, add_setshow_string_cmd) (add_setshow_string_noescape_cmd) (add_setshow_optional_filename_cmd, add_setshow_integer_cmd) (add_setshow_uinteger_cmd, add_setshow_zinteger_cmd) (add_setshow_zuinteger_unlimited_cmd, add_setshow_zuinteger_cmd) (delete_cmd, add_info, add_info_alias, add_com, add_com_alias): Make "name" parameter const. (help_cmd): Rename "command" parameter to "arg". New const local "command". (find_cmd): Make "command" parameter const. (lookup_cmd_1): Make "text" parameter pointer to const. Adjust to deprecated_cmd_warning prototype change. (undef_cmd_error): Make "cmdtype" parameter const. (lookup_cmd): Make "line" parameter const. (deprecated_cmd_warning): Change type of "text" parameter to pointer to const char, from pointer to pointer to char. Adjust. (lookup_cmd_composition): Make "text" parameter const. (complete_on_cmdlist, complete_on_enum): Make "text" and "word" parameters const. * cli/cli-decode.h (struct cmd_list_element) <name>: Make field const. * cli/cli-script.c (validate_comname): Make "tem" local const. (define_command): New const local "tem_c". Use it in calls to lookup_cmd. (document_command): Make "tem" and "comfull" locals const. (show_user_1): Make "prefix" and "name" parameters const. * cli-script.h (show_user_1): Make "prefix" and "name" parameters const. * command.h (add_cmd, add_alias_cmd, add_prefix_cmd) (add_abbrev_prefix_cmd, completer_ftype, lookup_cmd, lookup_cmd_1) (deprecated_cmd_warning, lookup_cmd_composition, add_com) (add_com_alias, add_info, add_info_alias, complete_on_cmdlist) (complete_on_enum, add_setshow_enum_cmd) (add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd) (add_setshow_filename_cmd, add_setshow_string_cmd) (add_setshow_string_noescape_cmd) (add_setshow_optional_filename_cmd, add_setshow_integer_cmd) (add_setshow_uinteger_cmd, add_setshow_zinteger_cmd) (add_setshow_zuinteger_cmd, add_setshow_zuinteger_unlimited_cmd): Change prototypes, constifying strings. * completer.c (noop_completer, filename_completer): Make "text" and "prefix" parameters const. (location_completer, expression_completer) (complete_line_internal): Make "text" and "prefix" parameters const and adjust. (command_completer, signal_completer): Make "text" and "prefix" parameters const. * completer.h (noop_completer, filename_completer) (expression_completer, location_completer, command_completer) (signal_completer): Change prototypes. * corefile.c (complete_set_gnutarget): Make "text" and "word" parameters const. * cp-abi.c (cp_abi_completer): Likewise. * expression.h (parse_expression_for_completion): Change prototype. * f-lang.c (f_make_symbol_completion_list): Make "text" and "word" parameters const. * infcmd.c (_initialize_infcmd): Make "cmd_name" local const. * infrun.c (handle_completer): Make "text" and "word" parameters const. * interps.c (interpreter_completer): Make "text" and "word" parameters const. * language.h (struct language_defn) <la_make_symbol_completion_list>: Make "text" and "word" parameters const. * parse.c (parse_exp_1): Move const hack to parse_exp_in_context. (parse_exp_in_context): Rename to ... (parse_exp_in_context_1): ... this. (parse_exp_in_context): Reimplement, with const hack from parse_exp_1. (parse_expression_for_completion): Make "string" parameter const. * printcmd.c (decode_format): Make "string_ptr" parameter pointer to pointer to const char. Adjust. (print_command_1): Make "exp" parameter const. (output_command): Rename to ... (output_command_const): ... this. Make "exp" parameter const. (output_command): Reimplement. (x_command): Adjust. (display_command): Rename "exp" parameter to "arg". New "exp" local, const version of "arg". * python/py-auto-load.c (gdbpy_initialize_auto_load): Make "cmd_name" local const. * python/py-cmd.c (cmdpy_destroyer): Cast const away in xfree call. (cmdpy_completer): Make "text" and "word" parameters const. (gdbpy_parse_command_name): Make "prefix_text2" local const. * python/py-param.c (add_setshow_generic): Make "tmp_name" local const. * remote.c (_initialize_remote): Make "cmd_name" local const. * symtab.c (language_search_unquoted_string): Make "text" and "p" parameters const. Adjust. (completion_list_add_fields): Make "sym_text", "text" and "word" parameters const. (struct add_name_data) <sym_text, text, word>: Make fields const. (default_make_symbol_completion_list_break_on): Make "text" and "word" parameters const. Adjust locals. (default_make_symbol_completion_list) (make_symbol_completion_list, make_symbol_completion_type) (make_symbol_completion_list_fn): Make "text" and "word" parameters const. (make_file_symbol_completion_list): Make "text", "word" and "srcfile" parameters const. Adjust locals. (add_filename_to_list): Make "text" and "word" parameters const. (struct add_partial_filename_data) <text, word>: Make fields const. (make_source_files_completion_list): Make "text" and "word" parameters const. * symtab.h (default_make_symbol_completion_list_break_on) (default_make_symbol_completion_list, make_symbol_completion_list) (make_symbol_completion_type enum type_code) (make_symbol_completion_list_fn make_file_symbol_completion_list) (make_source_files_completion_list): Change prototype. * top.c (execute_command): Adjust to pass pointer to pointer to const char to lookup_cmd, and to deprecated_cmd_warning prototype change. (set_verbose): Make "cmdname" local const. * tracepoint.c (decode_agent_options): Make "exp" parameter const, and adjust. (validate_actionline): Make "line" parameter a pointer to const char, and adjust. (encode_actions_1): Make "action_exp" local const, and adjust. (encode_actions): Adjust. (replace_comma): Delete. (trace_dump_actions): Make "action_exp" and "next_comma" locals const, and adjust. Don't frob the action string while splitting it at commas. Instead, make a copy of each split substring in turn. (trace_dump_command): Adjust to validate_actionline prototype change. * tracepoint.h (decode_agent_options, decode_agent_options) (encode_actions, validate_actionline): Change prototypes. * valprint.h (output_command): Delete declaration. (output_command_const): Declare. * value.c (function_destroyer): Cast const away in xfree call.
213 lines
6.8 KiB
C
213 lines
6.8 KiB
C
/* Declarations for value printing routines for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 1986-2013 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
|
|
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/>. */
|
|
|
|
#ifndef VALPRINT_H
|
|
#define VALPRINT_H
|
|
|
|
/* This is used to pass formatting options to various value-printing
|
|
functions. */
|
|
struct value_print_options
|
|
{
|
|
/* Pretty-printing control. */
|
|
enum val_prettyprint pretty;
|
|
|
|
/* Controls pretty printing of arrays. */
|
|
int prettyprint_arrays;
|
|
|
|
/* Controls pretty printing of structures. */
|
|
int prettyprint_structs;
|
|
|
|
/* Controls printing of virtual tables. */
|
|
int vtblprint;
|
|
|
|
/* Controls printing of nested unions. */
|
|
int unionprint;
|
|
|
|
/* Controls printing of addresses. */
|
|
int addressprint;
|
|
|
|
/* Controls looking up an object's derived type using what we find
|
|
in its vtables. */
|
|
int objectprint;
|
|
|
|
/* Maximum number of chars to print for a string pointer value or vector
|
|
contents, or UINT_MAX for no limit. Note that "set print elements 0"
|
|
stores UINT_MAX in print_max, which displays in a show command as
|
|
"unlimited". */
|
|
unsigned int print_max;
|
|
|
|
/* Print repeat counts if there are more than this many repetitions
|
|
of an element in an array. */
|
|
unsigned int repeat_count_threshold;
|
|
|
|
/* The global output format letter. */
|
|
int output_format;
|
|
|
|
/* The current format letter. This is set locally for a given call,
|
|
e.g. when the user passes a format to "print". */
|
|
int format;
|
|
|
|
/* Stop printing at null character? */
|
|
int stop_print_at_null;
|
|
|
|
/* True if we should print the index of each element when printing
|
|
an array. */
|
|
int print_array_indexes;
|
|
|
|
/* If nonzero, then dereference references, otherwise just print
|
|
them like pointers. */
|
|
int deref_ref;
|
|
|
|
/* If nonzero, print static fields. */
|
|
int static_field_print;
|
|
|
|
/* If nonzero, print static fields for Pascal. FIXME: C++ and Java
|
|
share one flag, why not Pascal too? */
|
|
int pascal_static_field_print;
|
|
|
|
/* Controls Python pretty-printing. */
|
|
int raw;
|
|
|
|
/* If nonzero, print the value in "summary" form. */
|
|
int summary;
|
|
|
|
/* If nonzero, when printing a pointer, print the symbol to which it
|
|
points, if any. */
|
|
int symbol_print;
|
|
};
|
|
|
|
/* The global print options set by the user. In general this should
|
|
not be directly accessed, except by set/show commands. Ordinary
|
|
code should call get_user_print_options instead. */
|
|
extern struct value_print_options user_print_options;
|
|
|
|
/* Initialize *OPTS to be a copy of the user print options. */
|
|
extern void get_user_print_options (struct value_print_options *opts);
|
|
|
|
/* Initialize *OPTS to be a copy of the user print options, but with
|
|
pretty-printing disabled. */
|
|
extern void get_raw_print_options (struct value_print_options *opts);
|
|
|
|
/* Initialize *OPTS to be a copy of the user print options, but using
|
|
FORMAT as the formatting option. */
|
|
extern void get_formatted_print_options (struct value_print_options *opts,
|
|
char format);
|
|
|
|
extern void maybe_print_array_index (struct type *index_type, LONGEST index,
|
|
struct ui_file *stream,
|
|
const struct value_print_options *);
|
|
|
|
extern void val_print_array_elements (struct type *, const gdb_byte *, int,
|
|
CORE_ADDR, struct ui_file *, int,
|
|
const struct value *,
|
|
const struct value_print_options *,
|
|
unsigned int);
|
|
|
|
extern void val_print_type_code_int (struct type *, const gdb_byte *,
|
|
struct ui_file *);
|
|
|
|
extern void val_print_type_code_flags (struct type *type,
|
|
const gdb_byte *valaddr,
|
|
struct ui_file *stream);
|
|
|
|
extern void val_print_scalar_formatted (struct type *,
|
|
const gdb_byte *, int,
|
|
const struct value *,
|
|
const struct value_print_options *,
|
|
int,
|
|
struct ui_file *);
|
|
|
|
extern void print_binary_chars (struct ui_file *, const gdb_byte *,
|
|
unsigned int, enum bfd_endian);
|
|
|
|
extern void print_octal_chars (struct ui_file *, const gdb_byte *,
|
|
unsigned int, enum bfd_endian);
|
|
|
|
extern void print_decimal_chars (struct ui_file *, const gdb_byte *,
|
|
unsigned int, enum bfd_endian);
|
|
|
|
extern void print_hex_chars (struct ui_file *, const gdb_byte *,
|
|
unsigned int, enum bfd_endian);
|
|
|
|
extern void print_char_chars (struct ui_file *, struct type *,
|
|
const gdb_byte *, unsigned int, enum bfd_endian);
|
|
|
|
extern void print_function_pointer_address (const struct value_print_options *options,
|
|
struct gdbarch *gdbarch,
|
|
CORE_ADDR address,
|
|
struct ui_file *stream);
|
|
|
|
extern int read_string (CORE_ADDR addr, int len, int width,
|
|
unsigned int fetchlimit,
|
|
enum bfd_endian byte_order, gdb_byte **buffer,
|
|
int *bytes_read);
|
|
|
|
extern void val_print_optimized_out (struct ui_file *stream);
|
|
|
|
extern void val_print_unavailable (struct ui_file *stream);
|
|
|
|
extern void val_print_invalid_address (struct ui_file *stream);
|
|
|
|
/* An instance of this is passed to generic_val_print and describes
|
|
some language-specific ways to print things. */
|
|
|
|
struct generic_val_print_decorations
|
|
{
|
|
/* Printing complex numbers: what to print before, between the
|
|
elements, and after. */
|
|
|
|
const char *complex_prefix;
|
|
const char *complex_infix;
|
|
const char *complex_suffix;
|
|
|
|
/* Boolean true and false. */
|
|
|
|
const char *true_name;
|
|
const char *false_name;
|
|
|
|
/* What to print when we see TYPE_CODE_VOID. */
|
|
|
|
const char *void_name;
|
|
};
|
|
|
|
|
|
extern void generic_val_print (struct type *type, const gdb_byte *valaddr,
|
|
int embedded_offset, CORE_ADDR address,
|
|
struct ui_file *stream, int recurse,
|
|
const struct value *original_value,
|
|
const struct value_print_options *options,
|
|
const struct generic_val_print_decorations *);
|
|
|
|
extern void generic_emit_char (int c, struct type *type, struct ui_file *stream,
|
|
int quoter, const char *encoding);
|
|
|
|
extern void generic_printstr (struct ui_file *stream, struct type *type,
|
|
const gdb_byte *string, unsigned int length,
|
|
const char *encoding, int force_ellipses,
|
|
int quote_char, int c_style_terminator,
|
|
const struct value_print_options *options);
|
|
|
|
/* Run the "output" command. ARGS and FROM_TTY are the usual
|
|
arguments passed to all command implementations, except ARGS is
|
|
const. */
|
|
|
|
extern void output_command_const (const char *args, int from_tty);
|
|
|
|
#endif
|