X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fvalprint.h;h=302626d9d6a64e0402fa3b8e86f36371acfe804b;hb=79a94a2ad1e6e2f227de07427481e4bb8be84504;hp=542a13aba98c8c1a97f37f220f8280902d2df90a;hpb=4e07d55ffbd3d926ab776b2ce3fd13e96d214269;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/valprint.h b/gdb/valprint.h index 542a13aba9..302626d9d6 100644 --- a/gdb/valprint.h +++ b/gdb/valprint.h @@ -1,7 +1,6 @@ /* Declarations for value printing routines for GDB, the GNU debugger. - Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 2000, 2005, 2007, - 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1986-2017 Free Software Foundation, Inc. This file is part of GDB. @@ -25,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; @@ -67,9 +66,6 @@ struct value_print_options /* Stop printing at null character? */ int stop_print_at_null; - /* True if this value is being printed in an epoch window. */ - int inspect_it; - /* True if we should print the index of each element when printing an array. */ int print_array_indexes; @@ -81,15 +77,21 @@ 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 + points, if any. */ + int symbol_print; }; /* The global print options set by the user. In general this should @@ -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,47 +115,118 @@ 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); -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 print_function_pointer_address (const struct value_print_options *options, + struct gdbarch *gdbarch, + CORE_ADDR address, + struct ui_file *stream); -extern void val_print_optimized_out (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 (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); +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; + + /* Array start and end strings. */ + const char *array_start; + const char *array_end; +}; + + +extern void generic_val_print (struct type *type, + int embedded_offset, CORE_ADDR address, + struct ui_file *stream, int recurse, + 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); + +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); + #endif