Update copyright.

[binutils.git] / gdb / ch-valprint.c

diff --git a/gdb/ch-valprint.c b/gdb/ch-valprint.c
index de66d46cfebe802a47459cdda69e8c22eaec3e45..911c693f3c0e8ca5163fe2e3089076949aa66685 100644 (file)
--- a/gdb/ch-valprint.c
+++ b/gdb/ch-valprint.c
@@ -36,6 +36,13 @@ static void
 chill_print_value_fields PARAMS ((struct type *, char *, GDB_FILE *, int, int,
                                  enum val_prettyprint, struct type **));
 
+static void
+chill_print_type_scalar PARAMS ((struct type *, LONGEST, GDB_FILE *));
+
+static void
+chill_val_print_array_elements PARAMS ((struct type *, char *, CORE_ADDR, GDB_FILE *,
+                                       int, int, int, enum val_prettyprint));
+
 \f
 /* Print integral scalar data VAL, of type TYPE, onto stdio stream STREAM.
    Used to print data from type structures in a specified type.  For example,
@@ -43,7 +50,7 @@ chill_print_value_fields PARAMS ((struct type *, char *, GDB_FILE *, int, int,
    allows the ranges to be printed in their "natural" form rather than as
    decimal integer values. */
 
-void
+static void
 chill_print_type_scalar (type, val, stream)
      struct type *type;
      LONGEST val;
@@ -176,49 +183,6 @@ chill_val_print_array_elements (type, valaddr, address, stream,
     }
 }
 
-/* In certain cases it could happen, that an array type doesn't
-   have a length (this have to do with seizing). The reason is
-   shown in the following stabs:
-
-   .stabs "m_x:Tt81=s36i:1,0,32;ar:82=ar80;0;1;83=xsm_struct:,32,256;;",128,0,25,0
-  
-   .stabs "m_struct:Tt83=s16f1:9,0,16;f2:85=*84,32,32;f3:84,64,64;;",128,0,10,0
-
-   When processing t81, the array ar80 doesn't have a length, cause
-   struct m_struct is specified extern at thse moment. Afterwards m_struct
-   gets specified and updated, but not the surrounding type.
-
-   So we walk through array's till we find a type with a length and
-   calculate the array length.
-
-   FIXME: Where may this happen too ?
-   */
-
-static void
-calculate_array_length (type)
-     struct type *type;
-{
-  struct type *target_type;
-  struct type *range_type;
-  LONGEST lower_bound, upper_bound;
-
-  if (TYPE_CODE (type) != TYPE_CODE_ARRAY)
-    /* not an array, stop processing */
-    return;
-
-  target_type = TYPE_TARGET_TYPE (type);
-  range_type = TYPE_FIELD_TYPE (type, 0);
-  lower_bound = TYPE_FIELD_BITPOS (range_type, 0);
-  upper_bound = TYPE_FIELD_BITPOS (range_type, 1);
-
-  if (TYPE_LENGTH (target_type) == 0 &&
-      TYPE_CODE (target_type) == TYPE_CODE_ARRAY)
-    /* we've got another array */
-    calculate_array_length (target_type);
-
-  TYPE_LENGTH (type) = (upper_bound - lower_bound + 1) * TYPE_LENGTH (target_type);
-}
-
 /* Print data of type TYPE located at VALADDR (within GDB), which came from
    the inferior at address ADDRESS, onto stdio stream STREAM according to
    FORMAT (a letter or 0 for natural format).  The data at VALADDR is in
@@ -254,10 +218,6 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_ARRAY:
-      if (TYPE_LENGTH (type) == 0)
-       /* see comment function calculate_array_length */
-       calculate_array_length (type);
-
       if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0)
        {
          if (prettyprint_arrays)
@@ -429,7 +389,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
              {
                if (need_comma)
                  fputs_filtered (", ", stream);
-               chill_print_type_scalar (range, i, stream);
+               chill_print_type_scalar (range, (LONGEST) i, stream);
                need_comma = 1;
 
                /* Look for a continuous range of true elements. */
@@ -440,7 +400,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
                    while (i+1 <= high_bound
                           && value_bit_index (type, valaddr, ++i))
                      j = i;
-                   chill_print_type_scalar (range, j, stream);
+                   chill_print_type_scalar (range, (LONGEST) j, stream);
                  }
              }
          }
@@ -462,11 +422,15 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
          switch (TYPE_CODE (inner))
            {
            case TYPE_CODE_STRING:
-             if (length > TYPE_LENGTH (type))
+             if (length > TYPE_LENGTH (type) - 2)
                {
                  fprintf_filtered (stream,
-                                   "<dynamic length %ld > static length %d>",
+                                   "<dynamic length %ld > static length %d> *invalid*",
                                    length, TYPE_LENGTH (type));
+
+                 /* Don't print the string; doing so might produce a
+                    segfault.  */
+                 return length;
                }
              LA_PRINT_STRING (stream, data_addr, length, 0);
              return length;
@@ -499,7 +463,8 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
                value_at
                  (TYPE_TARGET_TYPE (type),
                   unpack_pointer (lookup_pointer_type (builtin_type_void),
-                                  valaddr));
+                                  valaddr),
+                  NULL);
              val_print (VALUE_TYPE (deref_val),
                         VALUE_CONTENTS (deref_val),
                         VALUE_ADDRESS (deref_val), stream, format,