* config/pa/tm-hppa.h: Define lots register offsets needed by

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

diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 0eb313370a0448a96d2cdde156679ef9a231875f..5c5012455d63cd2afdd73633e72d997aada24720 100644 (file)
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -1,6 +1,6 @@
 /* Support for printing C values for GDB, the GNU debugger.
-   Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994
-   Free Software Foundation, Inc.
+   Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995
+             Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -30,7 +30,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* BEGIN-FIXME */
 
 extern int vtblprint;          /* Controls printing of vtbl's */
-extern int demangle;           /* whether to print C++ syms raw or src-form */
 
 extern void
 cp_print_class_member PARAMS ((char *, struct type *, GDB_FILE *, char *));
@@ -40,7 +39,7 @@ cp_print_class_method PARAMS ((char *, struct type *, GDB_FILE *));
 
 extern void
 cp_print_value_fields PARAMS ((struct type *, char *, GDB_FILE *, int, int,
-                              enum val_prettyprint, struct type **));
+                              enum val_prettyprint, struct type **, int));
 
 extern int
 cp_is_vtbl_ptr_type PARAMS ((struct type *));
@@ -62,8 +61,6 @@ cp_type_print_method_args PARAMS ((struct type **, char *, char *, int,
 /* END-FIXME */
 
 
-extern struct obstack dont_print_obstack;
-
 \f
 /* Print data of type TYPE located at VALADDR (within GDB), which came from
    the inferior at address ADDRESS, onto stdio stream STREAM according to
@@ -110,9 +107,26 @@ c_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
              print_spaces_filtered (2 + 2 * recurse, stream);
            }
          /* For an array of chars, print with string syntax.  */
-         if (eltlen == 1 && TYPE_CODE (elttype) == TYPE_CODE_INT
+         if (eltlen == 1 &&
+             ((TYPE_CODE (elttype) == TYPE_CODE_INT)
+              || ((current_language->la_language == language_m2)
+                  && (TYPE_CODE (elttype) == TYPE_CODE_CHAR)))
              && (format == 0 || format == 's'))
            {
+             /* If requested, look for the first null char and only print
+                elements up to it.  */
+             if (stop_print_at_null)
+               {
+                 int temp_len;
+                 
+                 /* Look for a NULL char. */
+                 for (temp_len = 0;
+                      valaddr[temp_len]
+                      && temp_len < len && temp_len < print_max;
+                      temp_len++);
+                 len = temp_len;
+               }
+             
              LA_PRINT_STRING (stream, valaddr, len, 0);
              i = len;
            }
@@ -146,6 +160,15 @@ c_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
          print_scalar_formatted (valaddr, type, format, 0, stream);
          break;
        }
+      if (vtblprint && cp_is_vtbl_ptr_type(type))
+       {
+          /* Print the unmangled name if desired.  */
+         /* Print vtable entry - we only get here if we ARE using
+            -fvtable_thunks.  (Otherwise, look under TYPE_CODE_STRUCT.) */
+         print_address_demangle(extract_address (valaddr, TYPE_LENGTH (type)),
+                                stream, demangle);
+         break;
+       }
       if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_METHOD)
        {
          cp_print_class_method (valaddr, type, stream);
@@ -290,13 +313,15 @@ c_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
       if (vtblprint && cp_is_vtbl_ptr_type(type))
        {
           /* Print the unmangled name if desired.  */
+         /* Print vtable entry - we only get here if NOT using
+            -fvtable_thunks.  (Otherwise, look under TYPE_CODE_PTR.) */
          print_address_demangle(*((int *) (valaddr +   /* FIXME bytesex */
              TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8)),
              stream, demangle);
          break;
        }
       cp_print_value_fields (type, valaddr, stream, format, recurse, pretty,
-                            0);
+                            NULL, 0);
       break;
 
     case TYPE_CODE_ENUM:
@@ -423,3 +448,64 @@ c_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
   gdb_flush (stream);
   return (0);
 }
+\f
+int
+c_value_print (val, stream, format, pretty)
+     value_ptr val;
+     GDB_FILE *stream;
+     int format;
+     enum val_prettyprint pretty;
+{
+  /* A "repeated" value really contains several values in a row.
+     They are made by the @ operator.
+     Print such values as if they were arrays.  */
+
+  if (VALUE_REPEATED (val))
+    {
+      register unsigned int n = VALUE_REPETITIONS (val);
+      register unsigned int typelen = TYPE_LENGTH (VALUE_TYPE (val));
+      fprintf_filtered (stream, "{");
+      /* Print arrays of characters using string syntax.  */
+      if (typelen == 1 && TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_INT
+         && format == 0)
+       LA_PRINT_STRING (stream, VALUE_CONTENTS (val), n, 0);
+      else
+       {
+         value_print_array_elements (val, stream, format, pretty);
+       }
+      fprintf_filtered (stream, "}");
+      return (n * typelen);
+    }
+  else
+    {
+      struct type *type = VALUE_TYPE (val);
+
+      /* If it is a pointer, indicate what it points to.
+
+        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)
+       {
+         /* Hack:  remove (char *) for char strings.  Their
+            type is indicated by the quoted string anyway. */
+          if (TYPE_CODE (type) == TYPE_CODE_PTR &&
+             TYPE_NAME (type) == NULL &&
+             TYPE_NAME (TYPE_TARGET_TYPE (type)) != NULL &&
+             STREQ (TYPE_NAME (TYPE_TARGET_TYPE (type)), "char"))
+           {
+               /* Print nothing */
+           }
+         else
+           {
+             fprintf_filtered (stream, "(");
+             type_print (type, "", stream, -1);
+             fprintf_filtered (stream, ") ");
+           }
+       }
+      return (val_print (type, VALUE_CONTENTS (val),
+                        VALUE_ADDRESS (val), stream, format, 1, 0, pretty));
+    }
+}