Merge GDB 7.5.1

gdb/m2-valprint.c

 /* Support for printing Modula 2 values for GDB, the GNU debugger.
 
    Copyright (C) 1986, 1988-1989, 1991-1992, 1996, 1998, 2000, 2005-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 25 matching lines @@
                                    struct ui_file *stream);
 static void
 m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
                          int embedded_offset, CORE_ADDR address,
                          struct ui_file *stream, int recurse,
                          const struct value *val,
                          const struct value_print_options *options,
                          int len);
 
 
-/* Print function pointer with inferior address ADDRESS onto stdio
-   stream STREAM.  */
-
-static void
-print_function_pointer_address (struct gdbarch *gdbarch, CORE_ADDR address,
-                                struct ui_file *stream, int addressprint)
-{
-  CORE_ADDR func_addr = gdbarch_convert_from_func_ptr_addr (gdbarch, address,
-                                                            &current_target);
-
-  /* If the function pointer is represented by a description, print the
-     address of the description.  */
-  if (addressprint && func_addr != address)
-    {
-      fputs_filtered ("@", stream);
-      fputs_filtered (paddress (gdbarch, address), stream);
-      fputs_filtered (": ", stream);
-    }
-  print_address_demangle (gdbarch, func_addr, stream, demangle);
-}
-
 /* get_long_set_bounds - assigns the bounds of the long set to low and
                          high.  */
 
 int
 get_long_set_bounds (struct type *type, LONGEST *low, LONGEST *high)
 {
   int len, i;
 
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
     {
@@ skipping 132 matching lines @@
 }
 
 static int
 print_unpacked_pointer (struct type *type,
                         CORE_ADDR address, CORE_ADDR addr,
                         const struct value_print_options *options,
                         struct ui_file *stream)
 {
   struct gdbarch *gdbarch = get_type_arch (type);
   struct type *elttype = check_typedef (TYPE_TARGET_TYPE (type));
+  int want_space = 0;
 
   if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
     {
       /* Try to print what function it points to.  */
-      print_function_pointer_address (gdbarch, addr, stream,
-                                      options->addressprint);
+      print_function_pointer_address (options, gdbarch, addr, stream);
       /* Return value is irrelevant except for string pointers.  */
       return 0;
     }
 
   if (options->addressprint && options->format != 's')
-    fputs_filtered (paddress (gdbarch, address), stream);
+    {
+      fputs_filtered (paddress (gdbarch, address), stream);
+      want_space = 1;
+    }
 
   /* For a pointer to char or unsigned char, also print the string
      pointed to, unless pointer is null.  */
 
   if (TYPE_LENGTH (elttype) == 1
       && TYPE_CODE (elttype) == TYPE_CODE_INT
       && (options->format == 0 || options->format == 's')
       && addr != 0)
-    return val_print_string (TYPE_TARGET_TYPE (type), NULL, addr, -1,
-                             stream, options);
+    {
+      if (want_space)
+        fputs_filtered (" ", stream);
+      return val_print_string (TYPE_TARGET_TYPE (type), NULL, addr, -1,
+                               stream, options);
+    }
   
   return 0;
 }
 
 static void
 print_variable_at_address (struct type *type,
                            const gdb_byte *valaddr,
                            struct ui_file *stream,
                            int recurse,
                            const struct value_print_options *options)
@@ skipping 51 matching lines @@
         {
           fprintf_filtered (stream, "{");
           val_print_array_elements (type, valaddr, embedded_offset,
                                     address, stream, recurse, val,
                                     options, 0);
           fprintf_filtered (stream, "}");
         }
     }
 }
 
+/* Decorations for Modula 2.  */
+
+static const struct generic_val_print_decorations m2_decorations =
+{
+  "",
+  " + ",
+  " * I",
+  "TRUE",
+  "FALSE",
+  "void"
+};
 
 /* See val_print for a description of the various parameters of this
-   function; they are identical.  The semantics of the return value is
-   also identical to val_print.  */
+   function; they are identical.  */
 
-int
+void
 m2_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)
 {
   struct gdbarch *gdbarch = get_type_arch (type);
   unsigned int i = 0;   /* Number of characters printed.  */
   unsigned len;
   struct type *elttype;
   unsigned eltlen;
-  LONGEST val;
   CORE_ADDR addr;
 
   CHECK_TYPEDEF (type);
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_ARRAY:
       if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0)
         {
           elttype = check_typedef (TYPE_TARGET_TYPE (type));
           eltlen = TYPE_LENGTH (elttype);
@@ skipping 48 matching lines @@
       else if (options->format && options->format != 's')
         val_print_scalar_formatted (type, valaddr, embedded_offset,
                                     original_value, options, 0, stream);
       else
         {
           addr = unpack_pointer (type, valaddr + embedded_offset);
           print_unpacked_pointer (type, addr, address, options, stream);
         }
       break;
 
-    case TYPE_CODE_REF:
-      elttype = check_typedef (TYPE_TARGET_TYPE (type));
-      if (options->addressprint)
-        {
-          CORE_ADDR addr
-            = extract_typed_address (valaddr + embedded_offset, type);
-
-          fprintf_filtered (stream, "@");
-          fputs_filtered (paddress (gdbarch, addr), stream);
-          if (options->deref_ref)
-            fputs_filtered (": ", stream);
-        }
-      /* De-reference the reference.  */
-      if (options->deref_ref)
-        {
-          if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
-            {
-              struct value *deref_val =
-                value_at
-                (TYPE_TARGET_TYPE (type),
-                 unpack_pointer (type, valaddr + embedded_offset));
-
-              common_val_print (deref_val, stream, recurse, options,
-                                current_language);
-            }
-          else
-            fputs_filtered ("???", stream);
-        }
-      break;
-
     case TYPE_CODE_UNION:
       if (recurse && !options->unionprint)
         {
           fprintf_filtered (stream, "{...}");
           break;
         }
       /* Fall through.  */
     case TYPE_CODE_STRUCT:
       if (m2_is_long_set (type))
         m2_print_long_set (type, valaddr, embedded_offset, address,
                            stream);
       else if (m2_is_unbounded_array (type))
         m2_print_unbounded_array (type, valaddr, embedded_offset,
                                   address, stream, recurse, options);
       else
         cp_print_value_fields (type, type, valaddr, embedded_offset,
                                address, stream, recurse, original_value,
                                options, NULL, 0);
       break;
 
-    case TYPE_CODE_ENUM:
-      if (options->format)
-        {
-          val_print_scalar_formatted (type, valaddr, embedded_offset,
-                                      original_value, options, 0, stream);
-          break;
-        }
-      len = TYPE_NFIELDS (type);
-      val = unpack_long (type, valaddr + embedded_offset);
-      for (i = 0; i < len; i++)
-        {
-          QUIT;
-          if (val == TYPE_FIELD_BITPOS (type, i))
-            {
-              break;
-            }
-        }
-      if (i < len)
-        {
-          fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
-        }
-      else
-        {
-          print_longest (stream, 'd', 0, val);
-        }
-      break;
-
-    case TYPE_CODE_FUNC:
-      if (options->format)
-        {
-          val_print_scalar_formatted (type, valaddr, embedded_offset,
-                                      original_value, options, 0, stream);
-          break;
-        }
-      /* FIXME, we should consider, at least for ANSI C language, eliminating
-         the distinction made between FUNCs and POINTERs to FUNCs.  */
-      fprintf_filtered (stream, "{");
-      type_print (type, "", stream, -1);
-      fprintf_filtered (stream, "} ");
-      /* Try to print what function it points to, and its address.  */
-      print_address_demangle (gdbarch, address, stream, demangle);
-      break;
-
-    case TYPE_CODE_BOOL:
-      if (options->format || options->output_format)
-        {
-          struct value_print_options opts = *options;
-
-          opts.format = (options->format ? options->format
-                         : options->output_format);
-          val_print_scalar_formatted (type, valaddr, embedded_offset,
-                                      original_value, &opts, 0, stream);
-        }
-      else
-        {
-          val = unpack_long (type, valaddr + embedded_offset);
-          if (val == 0)
-            fputs_filtered ("FALSE", stream);
-          else if (val == 1)
-            fputs_filtered ("TRUE", stream);
-          else
-            fprintf_filtered (stream, "%ld)", (long int) val);
-        }
-      break;
-
-    case TYPE_CODE_RANGE:
-      if (TYPE_LENGTH (type) == TYPE_LENGTH (TYPE_TARGET_TYPE (type)))
-        {
-          m2_val_print (TYPE_TARGET_TYPE (type), valaddr, embedded_offset,
-                        address, stream, recurse, original_value, options);
-          break;
-        }
-      /* FIXME: create_range_type does not set the unsigned bit in a
-         range type (I think it probably should copy it from the target
-         type), so we won't print values which are too large to
-         fit in a signed integer correctly.  */
-      /* FIXME: Doesn't handle ranges of enums correctly.  (Can't just
-         print with the target type, though, because the size of our type
-         and the target type might differ).  */
-      /* FALLTHROUGH */
-
-    case TYPE_CODE_INT:
-      if (options->format || options->output_format)
-        {
-          struct value_print_options opts = *options;
-
-          opts.format = (options->format ? options->format
-                         : options->output_format);
-          val_print_scalar_formatted (type, valaddr, embedded_offset,
-                                      original_value, &opts, 0, stream);
-        }
-      else
-        val_print_type_code_int (type, valaddr + embedded_offset, stream);
-      break;
-
-    case TYPE_CODE_CHAR:
-      if (options->format || options->output_format)
-        {
-          struct value_print_options opts = *options;
-
-          opts.format = (options->format ? options->format
-                         : options->output_format);
-          val_print_scalar_formatted (type, valaddr, embedded_offset,
-                                      original_value, &opts, 0, stream);
-        }
-      else
-        {
-          val = unpack_long (type, valaddr + embedded_offset);
-          if (TYPE_UNSIGNED (type))
-            fprintf_filtered (stream, "%u", (unsigned int) val);
-          else
-            fprintf_filtered (stream, "%d", (int) val);
-          fputs_filtered (" ", stream);
-          LA_PRINT_CHAR ((unsigned char) val, type, stream);
-        }
-      break;
-
-    case TYPE_CODE_FLT:
-      if (options->format)
-        val_print_scalar_formatted (type, valaddr, embedded_offset,
-                                    original_value, options, 0, stream);
-      else
-        print_floating (valaddr + embedded_offset, type, stream);
-      break;
-
-    case TYPE_CODE_METHOD:
-      break;
-
     case TYPE_CODE_BITSTRING:
     case TYPE_CODE_SET:
       elttype = TYPE_INDEX_TYPE (type);
       CHECK_TYPEDEF (elttype);
       if (TYPE_STUB (elttype))
         {
           fprintf_filtered (stream, _("<incomplete type>"));
           gdb_flush (stream);
           break;
         }
@@ skipping 54 matching lines @@
                 }
             }
         done:
           if (is_bitstring)
             fputs_filtered ("'", stream);
           else
             fputs_filtered ("}", stream);
         }
       break;
 
+    case TYPE_CODE_RANGE:
+      if (TYPE_LENGTH (type) == TYPE_LENGTH (TYPE_TARGET_TYPE (type)))
+        {
+          m2_val_print (TYPE_TARGET_TYPE (type), valaddr, embedded_offset,
+                        address, stream, recurse, original_value, options);
+          break;
+        }
+      /* FIXME: create_range_type does not set the unsigned bit in a
+         range type (I think it probably should copy it from the target
+         type), so we won't print values which are too large to
+         fit in a signed integer correctly.  */
+      /* FIXME: Doesn't handle ranges of enums correctly.  (Can't just
+         print with the target type, though, because the size of our type
+         and the target type might differ).  */
+      /* FALLTHROUGH */
+
+    case TYPE_CODE_REF:
+    case TYPE_CODE_ENUM:
+    case TYPE_CODE_FUNC:
+    case TYPE_CODE_INT:
+    case TYPE_CODE_FLT:
+    case TYPE_CODE_METHOD:
     case TYPE_CODE_VOID:
-      fprintf_filtered (stream, "void");
+    case TYPE_CODE_ERROR:
+    case TYPE_CODE_UNDEF:
+    case TYPE_CODE_BOOL:
+    case TYPE_CODE_CHAR:
+    default:
+      generic_val_print (type, valaddr, embedded_offset, address,
+                         stream, recurse, original_value, options,
+                         &m2_decorations);
       break;
-
-    case TYPE_CODE_ERROR:
-      fprintf_filtered (stream, "%s", TYPE_ERROR_NAME (type));
-      break;
-
-    case TYPE_CODE_UNDEF:
-      /* This happens (without TYPE_FLAG_STUB set) on systems which don't use
-         dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar"
-         and no complete type for struct foo in that file.  */
-      fprintf_filtered (stream, _("<incomplete type>"));
-      break;
-
-    default:
-      error (_("Invalid m2 type code %d in symbol table."), TYPE_CODE (type));
     }
   gdb_flush (stream);
-  return (0);
 }