fix error in nios2-tdep.c

[deliverable/binutils-gdb.git] / gdb / ada-typeprint.c

diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index 03c345a07c105b87117330b42c6c38a757e87232..09ff744409962da5cf46e5b253d01f559620d471 100644 (file)
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -41,27 +41,10 @@ static int print_selected_record_field_types (struct type *, struct type *,
                                              int, int,
                                              struct ui_file *, int, int,
                                              const struct type_print_options *);
-   
+
 static int print_record_field_types (struct type *, struct type *,
                                     struct ui_file *, int, int,
                                     const struct type_print_options *);
-
-static void print_array_type (struct type *, struct ui_file *, int, int,
-                             const struct type_print_options *);
-
-static int print_choices (struct type *, int, struct ui_file *,
-                         struct type *);
-
-static void print_range (struct type *, struct ui_file *);
-
-static void print_range_bound (struct type *, char *, int *,
-                              struct ui_file *);
-
-static void
-print_dynamic_range_bound (struct type *, const char *, int,
-                          const char *, struct ui_file *);
-
-static void print_range_type (struct type *, struct ui_file *);
 \f
 
 
@@ -120,17 +103,63 @@ decoded_type_name (struct type *type)
     }
 }
 
-/* Print TYPE on STREAM, preferably as a range.  */
+/* Return nonzero if TYPE is a subrange type, and its bounds
+   are identical to the bounds of its subtype.  */
+
+static int
+type_is_full_subrange_of_target_type (struct type *type)
+{
+  struct type *subtype;
+
+  if (TYPE_CODE (type) != TYPE_CODE_RANGE)
+    return 0;
+
+  subtype = TYPE_TARGET_TYPE (type);
+  if (subtype == NULL)
+    return 0;
+
+  if (ada_discrete_type_low_bound (type)
+      != ada_discrete_type_low_bound (subtype))
+    return 0;
+
+  if (ada_discrete_type_high_bound (type)
+      != ada_discrete_type_high_bound (subtype))
+    return 0;
+
+  return 1;
+}
+
+/* Print TYPE on STREAM, preferably as a range if BOUNDS_PREFERED_P
+   is nonzero.  */
 
 static void
-print_range (struct type *type, struct ui_file *stream)
+print_range (struct type *type, struct ui_file *stream,
+            int bounds_prefered_p)
 {
+  if (!bounds_prefered_p)
+    {
+      /* Try stripping all TYPE_CODE_RANGE layers whose bounds
+        are identical to the bounds of their subtype.  When
+        the bounds of both types match, it can allow us to
+        print a range using the name of its base type, which
+        is easier to read.  For instance, we would print...
+
+            array (character) of ...
+
+        ... instead of...
+
+            array ('["00"]' .. '["ff"]') of ...  */
+      while (type_is_full_subrange_of_target_type (type))
+       type = TYPE_TARGET_TYPE (type);
+    }
+
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_RANGE:
     case TYPE_CODE_ENUM:
       {
        struct type *target_type;
+
        target_type = TYPE_TARGET_TYPE (type);
        if (target_type == NULL)
          target_type = type;
@@ -220,10 +249,16 @@ print_dynamic_range_bound (struct type *type, const char *name, int name_len,
 }
 
 /* Print RAW_TYPE as a range type, using any bound information
-   following the GNAT encoding (if available).  */
+   following the GNAT encoding (if available).
+
+   If BOUNDS_PREFERED_P is nonzero, force the printing of the range
+   using its bounds.  Otherwise, try printing the range without
+   printing the value of the bounds, if possible (this is only
+   considered a hint, not a guaranty).  */
 
 static void
-print_range_type (struct type *raw_type, struct ui_file *stream)
+print_range_type (struct type *raw_type, struct ui_file *stream,
+                 int bounds_prefered_p)
 {
   const char *name;
   struct type *base_type;
@@ -240,7 +275,7 @@ print_range_type (struct type *raw_type, struct ui_file *stream)
 
   subtype_info = strstr (name, "___XD");
   if (subtype_info == NULL)
-    print_range (raw_type, stream);
+    print_range (raw_type, stream, bounds_prefered_p);
   else
     {
       int prefix_len = subtype_info - name;
@@ -360,7 +395,8 @@ print_array_type (struct type *type, struct ui_file *stream, int show,
            {
              if (arr_type != type)
                fprintf_filtered (stream, ", ");
-             print_range (TYPE_INDEX_TYPE (arr_type), stream);
+             print_range (TYPE_INDEX_TYPE (arr_type), stream,
+                          0 /* bounds_prefered_p */);
              if (TYPE_FIELD_BITSIZE (arr_type, 0) > 0)
                bitsize = TYPE_FIELD_BITSIZE (arr_type, 0);
            }
@@ -377,7 +413,7 @@ print_array_type (struct type *type, struct ui_file *stream, int show,
              if (k > 0)
                fprintf_filtered (stream, ", ");
              print_range_type (TYPE_FIELD_TYPE (range_desc_type, k),
-                               stream);
+                               stream, 0 /* bounds_prefered_p */);
              if (TYPE_FIELD_BITSIZE (arr_type, 0) > 0)
                bitsize = TYPE_FIELD_BITSIZE (arr_type, 0);
            }
@@ -834,7 +870,7 @@ ada_print_type (struct type *type0, const char *varstring,
            else
              {
                fprintf_filtered (stream, "range ");
-               print_range_type (type, stream);
+               print_range_type (type, stream, 1 /* bounds_prefered_p */);
              }
          }
        break;
@@ -847,7 +883,7 @@ ada_print_type (struct type *type0, const char *varstring,
        else
          {
            fprintf_filtered (stream, "range ");
-           print_range (type, stream);
+           print_range (type, stream, 1 /* bounds_prefered_p */);
          }
        break;
       case TYPE_CODE_FLT: