gdb/

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

diff --git a/gdb/d-valprint.c b/gdb/d-valprint.c
index 67b32b768f261c44ff517d436975ba06a8568a73..e8430995e9996a7009f03621f4a53944070758e3 100644 (file)
--- a/gdb/d-valprint.c
+++ b/gdb/d-valprint.c
@@ -1,6 +1,6 @@
 /* Support for printing D values for GDB, the GNU debugger.
 
-   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -31,20 +31,21 @@ static int
 dynamic_array_type (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)
 {
   if (TYPE_NFIELDS (type) == 2
       && TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) == TYPE_CODE_INT
       && strcmp (TYPE_FIELD_NAME (type, 0), "length") == 0
-      && strcmp (TYPE_FIELD_NAME (type, 1), "ptr") == 0)
+      && strcmp (TYPE_FIELD_NAME (type, 1), "ptr") == 0
+      && value_bits_valid (val, TARGET_CHAR_BIT * embedded_offset,
+                          TARGET_CHAR_BIT * TYPE_LENGTH (type)))
     {
       CORE_ADDR addr;
       struct type *elttype;
       struct type *true_type;
       struct type *ptr_type;
-      struct type *range_type;
-      const gdb_byte *ptraddr;
-      struct value *val;
+      struct value *ival;
       int length;
 
       length = unpack_field_as_long (type, valaddr + embedded_offset, 0);
@@ -57,11 +58,12 @@ dynamic_array_type (struct type *type, const gdb_byte *valaddr,
       true_type = check_typedef (elttype);
 
       true_type = lookup_array_range_type (true_type, 0, length - 1);
-      val = value_at (true_type, addr);
-      ptraddr = value_contents (val);
+      ival = value_at (true_type, addr);
 
-      return d_val_print (true_type, ptraddr, 0, addr, stream, recurse + 1,
-                         options);
+      return d_val_print (true_type,
+                         value_contents_for_printing (ival),
+                         value_embedded_offset (ival), addr,
+                         stream, recurse + 1, ival, options);
     }
   return -1;
 }
@@ -70,6 +72,7 @@ dynamic_array_type (struct type *type, const gdb_byte *valaddr,
 int
 d_val_print (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 ret;
@@ -79,12 +82,12 @@ d_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
     {
       case TYPE_CODE_STRUCT:
         ret = dynamic_array_type (type, valaddr, embedded_offset, address,
-                                 stream, recurse, options);
+                                 stream, recurse, val, options);
        if (ret != -1)
           break;
       default:
        ret = c_val_print (type, valaddr, embedded_offset, address, stream,
-                          recurse, options);
+                          recurse, val, options);
     }
 
   return ret;