import gdb-19990422 snapshot

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

diff --git a/gdb/ch-valprint.c b/gdb/ch-valprint.c
index 9b201370c6910e70b51cb9b0868186d0cc328665..663ba6428c1af867083d96ee30bfb71b5caa847e 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;
@@ -154,7 +161,7 @@ chill_val_print_array_elements (type, valaddr, address, stream,
          chill_print_type_scalar (index_type, low_bound + i + reps - 1,
                                   stream);
          fputs_filtered ("): ", stream);
-         val_print (elttype, valaddr + i * eltlen, 0, stream, format,
+         val_print (elttype, valaddr + i * eltlen, 0, 0, stream, format,
                     deref_ref, recurse + 1, pretty);
 
          i = rep1 - 1;
@@ -163,7 +170,7 @@ chill_val_print_array_elements (type, valaddr, address, stream,
       else
        {
          fputs_filtered ("): ", stream);
-         val_print (elttype, valaddr + i * eltlen, 0, stream, format,
+         val_print (elttype, valaddr + i * eltlen, 0, 0, stream, format,
                     deref_ref, recurse + 1, pretty);
          annotate_elt ();
          things_printed++;
@@ -190,10 +197,11 @@ chill_val_print_array_elements (type, valaddr, address, stream,
    The PRETTY parameter controls prettyprinting.  */
 
 int
-chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
-                pretty)
+chill_val_print (type, valaddr, embedded_offset, address,
+                 stream, format, deref_ref, recurse, pretty)
      struct type *type;
      char *valaddr;
+     int embedded_offset;
      CORE_ADDR address;
      GDB_FILE *stream;
      int format;
@@ -322,9 +330,8 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
          && /* If print_max is UINT_MAX, the alloca below will fail.
                In that case don't try to print the string.  */
          print_max < UINT_MAX)
-         {
-           i = val_print_string (addr, 0, stream);
-         }
+       i = val_print_string (addr, -1, TYPE_LENGTH (elttype), stream);
+
       /* Return number of characters printed, plus one for the
         terminating null if we have "reached the end".  */
       return (i + (print_max && i != print_max));
@@ -332,7 +339,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
 
     case TYPE_CODE_STRING:
       i = TYPE_LENGTH (type);
-      LA_PRINT_STRING (stream, valaddr, i, 0);
+      LA_PRINT_STRING (stream, valaddr, i, 1, 0);
       /* Return number of characters printed, plus one for the terminating
         null if we have "reached the end".  */
       return (i + (print_max && i != print_max));
@@ -382,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. */
@@ -393,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);
                  }
              }
          }
@@ -415,13 +422,17 @@ 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);
+             LA_PRINT_STRING (stream, data_addr, length, 1, 0);
              return length;
            default:
              break;
@@ -452,9 +463,11 @@ 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),
+                         0,
                         VALUE_ADDRESS (deref_val), stream, format,
                         deref_ref, recurse + 1, pretty);
            }
@@ -464,13 +477,13 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
       break;
 
     case TYPE_CODE_ENUM:
-      c_val_print (type, valaddr, address, stream, format,
+      c_val_print (type, valaddr, 0, address, stream, format,
                   deref_ref, recurse, pretty);
       break;
 
     case TYPE_CODE_RANGE:
       if (TYPE_TARGET_TYPE (type))
-       chill_val_print (TYPE_TARGET_TYPE (type), valaddr, address, stream,
+       chill_val_print (TYPE_TARGET_TYPE (type), valaddr, 0, address, stream,
                         format, deref_ref, recurse, pretty);
       break;
 
@@ -482,7 +495,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
     default:
       /* Let's defer printing to the C printer, rather than
         print an error message.  FIXME! */
-      c_val_print (type, valaddr, address, stream, format,
+      c_val_print (type, valaddr, 0, address, stream, format,
                   deref_ref, recurse, pretty);
     }
   gdb_flush (stream);
@@ -551,13 +564,13 @@ chill_print_value_fields (type, valaddr, stream, format, recurse, pretty,
              v = value_from_longest (TYPE_FIELD_TYPE (type, i),
                                      unpack_field_as_long (type, valaddr, i));
 
-             chill_val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0,
+             chill_val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0, 0,
                               stream, format, 0, recurse + 1, pretty);
            }
          else
            {
              chill_val_print (TYPE_FIELD_TYPE (type, i), 
-                              valaddr + TYPE_FIELD_BITPOS (type, i) / 8,
+                              valaddr + TYPE_FIELD_BITPOS (type, i) / 8, 0,
                               0, stream, format, 0, recurse + 1, pretty);
            }
        }
@@ -604,13 +617,13 @@ chill_value_print (val, stream, format, pretty)
              fprintf_filtered (stream, ")");
            }
          fprintf_filtered (stream, "(");
-         i = val_print (type, valaddr, VALUE_ADDRESS (val),
+         i = val_print (type, valaddr, 0, VALUE_ADDRESS (val),
                         stream, format, 1, 0, pretty);
          fprintf_filtered (stream, ")");
          return i;
        }
     }
-  return (val_print (type, VALUE_CONTENTS (val),
+  return (val_print (type, VALUE_CONTENTS (val), 0,
                     VALUE_ADDRESS (val), stream, format, 1, 0, pretty));
 }