Remove "noisy" parameter from clear_complaints

[deliverable/binutils-gdb.git] / gdb / f-valprint.c

diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 71bd2c3e2cca6a70f683ee0fe0037305b8086289..903f2af638de866f730df0e72f4e4a9158b667a4 100644 (file)
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -1,6 +1,6 @@
 /* Support for printing Fortran values for GDB, the GNU debugger.
 
-   Copyright (C) 1993-2016 Free Software Foundation, Inc.
+   Copyright (C) 1993-2018 Free Software Foundation, Inc.
 
    Contributed by Motorola.  Adapted from the C definitions by Farooq Butt
    (fmbutt@engage.sps.mot.com), additionally worked over by Stan Shebs.
@@ -34,8 +34,6 @@
 #include "block.h"
 #include "dictionary.h"
 
-extern void _initialize_f_valprint (void);
-static void info_common_command (char *, int);
 static void f77_get_dynamic_length_of_aggregate (struct type *);
 
 int f77_array_offset_tbl[MAX_FORTRAN_DIMS + 1][2];
@@ -152,7 +150,6 @@ f77_print_array_1 (int nss, int ndimensions, struct type *type,
          struct value *elt = value_subscript ((struct value *)val, i);
 
          val_print (value_type (elt),
-                    value_contents_for_printing (elt),
                     value_embedded_offset (elt),
                     value_address (elt), stream, recurse,
                     elt, options, current_language);
@@ -203,23 +200,25 @@ static const struct generic_val_print_decorations f_decorations =
   ".TRUE.",
   ".FALSE.",
   "VOID",
+  "{",
+  "}"
 };
 
 /* See val_print for a description of the various parameters of this
    function; they are identical.  */
 
 void
-f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
+f_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)
 {
   struct gdbarch *gdbarch = get_type_arch (type);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  unsigned int i = 0;  /* Number of characters printed.  */
+  int printed_field = 0; /* Number of fields printed.  */
   struct type *elttype;
   CORE_ADDR addr;
   int index;
+  const gdb_byte *valaddr =value_contents_for_printing (original_value);
 
   type = check_typedef (type);
   switch (TYPE_CODE (type))
@@ -254,7 +253,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
     case TYPE_CODE_PTR:
       if (options->format && options->format != 's')
        {
-         val_print_scalar_formatted (type, valaddr, embedded_offset,
+         val_print_scalar_formatted (type, embedded_offset,
                                      original_value, options, 0, stream);
          break;
        }
@@ -290,8 +289,8 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
            {
              if (want_space)
                fputs_filtered (" ", stream);
-             i = val_print_string (TYPE_TARGET_TYPE (type), NULL, addr, -1,
-                                   stream, options);
+             val_print_string (TYPE_TARGET_TYPE (type), NULL, addr, -1,
+                               stream, options);
            }
          return;
        }
@@ -304,25 +303,12 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 
          opts.format = (options->format ? options->format
                         : options->output_format);
-         val_print_scalar_formatted (type, valaddr, embedded_offset,
+         val_print_scalar_formatted (type, embedded_offset,
                                      original_value, &opts, 0, stream);
        }
       else
-       {
-         val_print_type_code_int (type, valaddr + embedded_offset, stream);
-         /* C and C++ has no single byte int type, char is used instead.
-            Since we don't know whether the value is really intended to
-            be used as an integer or a character, print the character
-            equivalent as well.  */
-         if (TYPE_LENGTH (type) == 1)
-           {
-             LONGEST c;
-
-             fputs_filtered (" ", stream);
-             c = unpack_long (type, valaddr + embedded_offset);
-             LA_PRINT_CHAR ((unsigned char) c, type, stream);
-           }
-       }
+       val_print_scalar_formatted (type, embedded_offset,
+                                   original_value, options, 0, stream);
       break;
 
     case TYPE_CODE_STRUCT:
@@ -335,15 +321,31 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
          struct value *field = value_field
            ((struct value *)original_value, index);
 
-          val_print (value_type (field),
-                    value_contents_for_printing (field),
-                    value_embedded_offset (field),
-                    value_address (field), stream, recurse + 1,
-                    field, options, current_language);
+         struct type *field_type = check_typedef (TYPE_FIELD_TYPE (type, index));
+
 
-          if (index != TYPE_NFIELDS (type) - 1)
-            fputs_filtered (", ", stream);
-        }
+         if (TYPE_CODE (field_type) != TYPE_CODE_FUNC)
+           {
+             const char *field_name;
+
+             if (printed_field > 0)
+               fputs_filtered (", ", stream);
+
+             field_name = TYPE_FIELD_NAME (type, index);
+             if (field_name != NULL)
+               {
+                 fputs_filtered (field_name, stream);
+                 fputs_filtered (" = ", stream);
+               }
+
+             val_print (value_type (field),
+                        value_embedded_offset (field),
+                        value_address (field), stream, recurse + 1,
+                        field, options, current_language);
+
+             ++printed_field;
+           }
+        }
       fprintf_filtered (stream, " )");
       break;     
 
@@ -359,7 +361,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
     case TYPE_CODE_BOOL:
     case TYPE_CODE_CHAR:
     default:
-      generic_val_print (type, valaddr, embedded_offset, address,
+      generic_val_print (type, embedded_offset, address,
                         stream, recurse, original_value, options,
                         &f_decorations);
       break;
@@ -373,7 +375,6 @@ info_common_command_for_block (const struct block *block, const char *comname,
 {
   struct block_iterator iter;
   struct symbol *sym;
-  const char *name;
   struct value_print_options opts;
 
   get_user_print_options (&opts);
@@ -429,7 +430,7 @@ info_common_command_for_block (const struct block *block, const char *comname,
    given name.  */
 
 static void
-info_common_command (char *comname, int from_tty)
+info_common_command (const char *comname, int from_tty)
 {
   struct frame_info *fi;
   const struct block *block;