X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fvalprint.h;h=81638d41f9677bebd089ff39c1ce21ee062b5577;hb=4581dc8297381651284e2f4a9f835eebcc6f2328;hp=7baef2f9a17f6481292bbc1ff09ac43cce7ac27f;hpb=6f937416b997de1c0fb4664df3b7a69910b66b76;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/valprint.h b/gdb/valprint.h index 7baef2f9a1..81638d41f9 100644 --- a/gdb/valprint.h +++ b/gdb/valprint.h @@ -1,6 +1,6 @@ /* Declarations for value printing routines for GDB, the GNU debugger. - Copyright (C) 1986-2013 Free Software Foundation, Inc. + Copyright (C) 1986-2018 Free Software Foundation, Inc. This file is part of GDB. @@ -24,14 +24,14 @@ functions. */ struct value_print_options { - /* Pretty-printing control. */ - enum val_prettyprint pretty; + /* Pretty-formatting control. */ + enum val_prettyformat prettyformat; - /* Controls pretty printing of arrays. */ - int prettyprint_arrays; + /* Controls pretty formatting of arrays. */ + int prettyformat_arrays; - /* Controls pretty printing of structures. */ - int prettyprint_structs; + /* Controls pretty formatting of structures. */ + int prettyformat_structs; /* Controls printing of virtual tables. */ int vtblprint; @@ -77,14 +77,16 @@ struct value_print_options /* 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? */ + /* If nonzero, print static fields for Pascal. FIXME: C++ has a + flag, why not share with Pascal too? */ int pascal_static_field_print; - /* Controls Python pretty-printing. */ + /* If non-zero don't do Python pretty-printing. */ int raw; - /* If nonzero, print the value in "summary" form. */ + /* If nonzero, print the value in "summary" form. + If raw and summary are both non-zero, don't print non-scalar values + ("..." is printed instead). */ int summary; /* If nonzero, when printing a pointer, print the symbol to which it @@ -101,8 +103,8 @@ extern struct value_print_options 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); + pretty-formatting disabled. */ +extern void get_no_prettyformat_print_options (struct value_print_options *); /* Initialize *OPTS to be a copy of the user print options, but using FORMAT as the formatting option. */ @@ -113,37 +115,30 @@ 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, +extern void val_print_array_elements (struct type *, LONGEST, CORE_ADDR, struct ui_file *, int, - const struct value *, + 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 *, + LONGEST, + 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); + unsigned int, enum bfd_endian, bool); 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); + unsigned int, bool, enum bfd_endian); extern void print_hex_chars (struct ui_file *, const gdb_byte *, - unsigned int, enum bfd_endian); + unsigned int, enum bfd_endian, bool); extern void print_char_chars (struct ui_file *, struct type *, const gdb_byte *, unsigned int, enum bfd_endian); @@ -155,10 +150,15 @@ extern void print_function_pointer_address (const struct value_print_options *op extern int read_string (CORE_ADDR addr, int len, int width, unsigned int fetchlimit, - enum bfd_endian byte_order, gdb_byte **buffer, + enum bfd_endian byte_order, + gdb::unique_xmalloc_ptr *buffer, int *bytes_read); -extern void val_print_optimized_out (struct ui_file *stream); +extern void val_print_optimized_out (const struct value *val, + struct ui_file *stream); + +/* Prints "" to STREAM. */ +extern void val_print_not_saved (struct ui_file *stream); extern void val_print_unavailable (struct ui_file *stream); @@ -184,13 +184,17 @@ struct generic_val_print_decorations /* What to print when we see TYPE_CODE_VOID. */ const char *void_name; + + /* Array start and end strings. */ + const char *array_start; + const char *array_end; }; -extern void generic_val_print (struct type *type, const gdb_byte *valaddr, +extern void generic_val_print (struct type *type, int embedded_offset, CORE_ADDR address, struct ui_file *stream, int recurse, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options, const struct generic_val_print_decorations *); @@ -207,6 +211,39 @@ extern void generic_printstr (struct ui_file *stream, struct type *type, arguments passed to all command implementations, except ARGS is const. */ -extern void output_command_const (const char *args, int from_tty); +extern void output_command (const char *args, int from_tty); + +extern int val_print_scalar_type_p (struct type *type); + +struct format_data + { + int count; + char format; + char size; + + /* True if the value should be printed raw -- that is, bypassing + python-based formatters. */ + unsigned char raw; + }; + +extern void print_command_parse_format (const char **expp, const char *cmdname, + struct format_data *fmtp); +extern void print_value (struct value *val, const struct format_data *fmtp); + +/* Given an address ADDR return all the elements needed to print the + address in a symbolic form. NAME can be mangled or not depending + on DO_DEMANGLE (and also on the asm_demangle global variable, + manipulated via ''set print asm-demangle''). Return 0 in case of + success, when all the info in the OUT paramters is valid. Return 1 + otherwise. */ + +extern int build_address_symbolic (struct gdbarch *, + CORE_ADDR addr, + int do_demangle, + std::string *name, + int *offset, + std::string *filename, + int *line, + int *unmapped); #endif