gdb

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

diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c
index a4ed4b1d28fc9ae926b8197496a4bd690fb905f3..95a7a93d2497aa5d61c424892566d6bf015aedc6 100644 (file)
--- a/gdb/m2-valprint.c
+++ b/gdb/m2-valprint.c
@@ -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);
 }
 
@@ -259,6 +260,7 @@ print_variable_at_address (struct type *type,
     {
       struct value *deref_val =
        value_at (TYPE_TARGET_TYPE (type), unpack_pointer (type, valaddr));
+
       common_val_print (deref_val, stream, recurse, options, current_language);
     }
   else
@@ -276,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)
 {
@@ -298,7 +301,8 @@ m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
        {
          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, "}");
        }
     }
@@ -315,6 +319,7 @@ 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);
@@ -366,7 +371,8 @@ 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;
@@ -395,6 +401,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
        {
          CORE_ADDR addr
            = extract_typed_address (valaddr + embedded_offset, type);
+
          fprintf_filtered (stream, "@");
          fputs_filtered (paddress (gdbarch, addr), stream);
          if (options->deref_ref)
@@ -409,6 +416,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
                value_at
                (TYPE_TARGET_TYPE (type),
                 unpack_pointer (type, valaddr + embedded_offset));
+
              common_val_print (deref_val, stream, recurse, options,
                                current_language);
            }
@@ -433,7 +441,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:
@@ -483,6 +492,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
       if (options->format || options->output_format)
        {
          struct value_print_options opts = *options;
+
          opts.format = (options->format ? options->format
                         : options->output_format);
          print_scalar_formatted (valaddr + embedded_offset, type,
@@ -504,7 +514,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
@@ -520,6 +530,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
       if (options->format || options->output_format)
        {
          struct value_print_options opts = *options;
+
          opts.format = (options->format ? options->format
                         : options->output_format);
          print_scalar_formatted (valaddr + embedded_offset, type,
@@ -533,6 +544,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
       if (options->format || options->output_format)
        {
          struct value_print_options opts = *options;
+
          opts.format = (options->format ? options->format
                         : options->output_format);
          print_scalar_formatted (valaddr + embedded_offset, type,
@@ -596,6 +608,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
            {
              int element = value_bit_index (type, valaddr + embedded_offset,
                                             i);
+
              if (element < 0)
                {
                  i = element;
@@ -615,6 +628,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
                                          ++i))
                    {
                      int j = i;
+
                      fputs_filtered ("..", stream);
                      while (i + 1 <= high_bound
                             && value_bit_index (type,