Merge GDB 7.5.1

gdb/valprint.h

 /* Declarations for value printing routines for GDB, the GNU debugger.
 
    Copyright (C) 1986, 1988-1989, 1991-1994, 2000, 2005, 2007-2012 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
@@ skipping 72 matching lines @@
 
   /* 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);
 
@@ skipping 38 matching lines @@
 
 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);
+
 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);
 
 #endif