*** empty log message ***

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

diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c
index edfd3245d7a91caec6979b7499a794453d083f89..89809403467ee13294739844826caf0381618f13 100644 (file)
--- a/gdb/m2-valprint.c
+++ b/gdb/m2-valprint.c
@@ -1,7 +1,7 @@
 /* Support for printing Modula 2 values for GDB, the GNU debugger.
 
    Copyright (C) 1986, 1988, 1989, 1991, 1992, 1996, 1998, 2000, 2005, 2006,
-                 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+                 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -38,6 +38,7 @@ static void
 m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
                         int embedded_offset, CORE_ADDR address,
                         struct ui_file *stream, int recurse,
+                        const struct value *val,
                         const struct value_print_options *options,
                         int len);
 
@@ -202,7 +203,7 @@ m2_print_unbounded_array (struct type *type, const gdb_byte *valaddr,
   fprintf_filtered (stream, "{");  
   m2_print_array_contents (value_type (val), value_contents(val),
                           value_embedded_offset (val), addr, stream,
-                          recurse, options, len);
+                          recurse, NULL, options, len);
   fprintf_filtered (stream, ", HIGH = %d}", (int) len);
 }
 
@@ -234,7 +235,7 @@ print_unpacked_pointer (struct type *type,
       && TYPE_CODE (elttype) == TYPE_CODE_INT
       && (options->format == 0 || options->format == 's')
       && addr != 0)
-    return val_print_string (TYPE_TARGET_TYPE (type), addr, -1,
+    return val_print_string (TYPE_TARGET_TYPE (type), NULL, addr, -1,
                             stream, options);
   
   return 0;
@@ -277,6 +278,7 @@ static void
 m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
                         int embedded_offset, CORE_ADDR address,
                         struct ui_file *stream, int recurse,
+                        const struct value *val,
                         const struct value_print_options *options,
                         int len)
 {
@@ -294,12 +296,13 @@ m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
           || ((current_language->la_language == language_m2)
               && (TYPE_CODE (type) == TYPE_CODE_CHAR)))
          && (options->format == 0 || options->format == 's'))
-       val_print_string (type, address, len+1, stream, options);
+       val_print_string (type, NULL, address, len+1, stream, options);
       else
        {
          fprintf_filtered (stream, "{");
          val_print_array_elements (type, valaddr + embedded_offset,
-                                   address, stream, recurse, options, 0);
+                                   address, stream, recurse, val,
+                                   options, 0);
          fprintf_filtered (stream, "}");
        }
     }
@@ -316,10 +319,11 @@ m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
 int
 m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
              CORE_ADDR address, struct ui_file *stream, int recurse,
+             const struct value *original_value,
              const struct value_print_options *options)
 {
   struct gdbarch *gdbarch = get_type_arch (type);
-  unsigned int i = 0;  /* Number of characters printed */
+  unsigned int i = 0;  /* Number of characters printed.  */
   unsigned len;
   struct type *elttype;
   unsigned eltlen;
@@ -350,7 +354,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
                {
                  unsigned int temp_len;
 
-                 /* Look for a NULL char. */
+                 /* Look for a NULL char.  */
                  for (temp_len = 0;
                       (valaddr + embedded_offset)[temp_len]
                         && temp_len < len && temp_len < options->print_max;
@@ -367,7 +371,9 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
            {
              fprintf_filtered (stream, "{");
              val_print_array_elements (type, valaddr + embedded_offset,
-                                       address, stream, recurse, options, 0);
+                                       address, stream,
+                                       recurse, original_value,
+                                       options, 0);
              fprintf_filtered (stream, "}");
            }
          break;
@@ -436,7 +442,8 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
                                  address, stream, recurse, options);
       else
        cp_print_value_fields (type, type, valaddr, embedded_offset,
-                              address, stream, recurse, options, NULL, 0);
+                              address, stream, recurse, original_value,
+                              options, NULL, 0);
       break;
 
     case TYPE_CODE_ENUM:
@@ -508,7 +515,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
       if (TYPE_LENGTH (type) == TYPE_LENGTH (TYPE_TARGET_TYPE (type)))
        {
          m2_val_print (TYPE_TARGET_TYPE (type), valaddr, embedded_offset,
-                       address, stream, recurse, options);
+                       address, stream, recurse, original_value, options);
          break;
        }
       /* FIXME: create_range_type does not set the unsigned bit in a
@@ -646,7 +653,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
       break;
 
     case TYPE_CODE_ERROR:
-      fprintf_filtered (stream, _("<error type>"));
+      fprintf_filtered (stream, "%s", TYPE_ERROR_NAME (type));
       break;
 
     case TYPE_CODE_UNDEF: