* config/tc-sparc.c (md_show_usage): Add missing backslash at end

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

diff --git a/gdb/ch-valprint.c b/gdb/ch-valprint.c
index 695530b74d48cc196a010cab7a1fd6885053ef40..796172fb1733f8c85442d77a069709b442072445 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;
@@ -78,6 +85,7 @@ chill_print_type_scalar (type, val, stream)
     case TYPE_CODE_CHAR:
     case TYPE_CODE_BOOL:
     case TYPE_CODE_COMPLEX:
+    case TYPE_CODE_TYPEDEF:
     default:
       break;
     }
@@ -114,7 +122,7 @@ chill_val_print_array_elements (type, valaddr, address, stream,
   unsigned int reps;
   LONGEST low_bound =  TYPE_FIELD_BITPOS (range_type, 0);
       
-  elttype = TYPE_TARGET_TYPE (type);
+  elttype = check_typedef (TYPE_TARGET_TYPE (type));
   eltlen = TYPE_LENGTH (elttype);
   len = TYPE_LENGTH (type) / eltlen;
 
@@ -205,6 +213,8 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
   struct type *elttype;
   CORE_ADDR addr;
 
+  CHECK_TYPEDEF (type);
+
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_ARRAY:
@@ -289,7 +299,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
          break;
        }
       addr = unpack_pointer (type, valaddr);
-      elttype = TYPE_TARGET_TYPE (type);
+      elttype = check_typedef (TYPE_TARGET_TYPE (type));
 
       /* We assume a NULL pointer is all zeros ... */
       if (addr == 0)
@@ -338,7 +348,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
     case TYPE_CODE_BITSTRING:
     case TYPE_CODE_SET:
       elttype = TYPE_INDEX_TYPE (type);
-      check_stub_type (elttype);
+      CHECK_TYPEDEF (elttype);
       if (TYPE_FLAGS (elttype) & TYPE_FLAG_STUB)
        {
          fprintf_filtered (stream, "<incomplete type>");
@@ -379,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. */
@@ -390,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);
                  }
              }
          }
@@ -405,7 +415,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
     case TYPE_CODE_STRUCT:
       if (chill_varying_type (type))
        {
-         struct type *inner = TYPE_FIELD_TYPE (type, 1);
+         struct type *inner = check_typedef (TYPE_FIELD_TYPE (type, 1));
          long length = unpack_long (TYPE_FIELD_TYPE (type, 0), valaddr);
          char *data_addr = valaddr + TYPE_FIELD_BITPOS (type, 1) / 8;
          
@@ -449,7 +459,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,
@@ -509,7 +520,7 @@ chill_print_value_fields (type, valaddr, stream, format, recurse, pretty,
   int i, len;
   int fields_seen = 0;
 
-  check_stub_type (type);
+  CHECK_TYPEDEF (type);
 
   fprintf_filtered (stream, "[");
   len = TYPE_NFIELDS (type);
@@ -575,15 +586,14 @@ chill_value_print (val, stream, format, pretty)
      enum val_prettyprint pretty;
 {
   struct type *type = VALUE_TYPE (val);
+  struct type *real_type = check_typedef  (type);
 
   /* If it is a pointer, indicate what it points to.
 
-     Print type also if it is a reference.
+     Print type also if it is a reference. */
 
-     C++: if it is a member pointer, we will take care
-     of that when we print it.  */
-  if (TYPE_CODE (type) == TYPE_CODE_PTR ||
-      TYPE_CODE (type) == TYPE_CODE_REF)
+  if (TYPE_CODE (real_type) == TYPE_CODE_PTR ||
+      TYPE_CODE (real_type) == TYPE_CODE_REF)
     {
       char *valaddr = VALUE_CONTENTS (val);
       CORE_ADDR addr = unpack_pointer (type, valaddr);