2005-02-06 Andrew Cagney <cagney@gnu.org>

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

diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index a6e30f2287cb1bcf87a9be2a98fb4e9d995a232d..52e1440c1f7d73f35b0f178b58aa64a7acf81e63 100644 (file)
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -189,13 +189,13 @@ val_print_packed_array_elements (struct type *type, const bfd_byte *valaddr,
                                               (i * bitsize) / HOST_CHAR_BIT,
                                               (i * bitsize) % HOST_CHAR_BIT,
                                               bitsize, elttype);
-         if (memcmp (VALUE_CONTENTS (v0), VALUE_CONTENTS (v1), eltlen) != 0)
+         if (memcmp (value_contents (v0), value_contents (v1), eltlen) != 0)
            break;
        }
 
       if (i - i0 > repeat_count_threshold)
        {
-         val_print (elttype, VALUE_CONTENTS (v0), 0, 0, stream, format,
+         val_print (elttype, value_contents (v0), 0, 0, stream, format,
                     0, recurse + 1, pretty);
          annotate_elt_rep (i - i0);
          fprintf_filtered (stream, _(" <repeats %u times>"), i - i0);
@@ -220,7 +220,7 @@ val_print_packed_array_elements (struct type *type, const bfd_byte *valaddr,
                    }
                  wrap_here (n_spaces (2 + 2 * recurse));
                }
-             val_print (elttype, VALUE_CONTENTS (v0), 0, 0, stream, format,
+             val_print (elttype, value_contents (v0), 0, 0, stream, format,
                         0, recurse + 1, pretty);
              annotate_elt ();
            }
@@ -609,7 +609,7 @@ ada_val_print_1 (struct type *type, const bfd_byte *valaddr0,
          retn = 0;
        }
       else
-       retn = ada_val_print_1 (value_type (val), VALUE_CONTENTS (val), 0,
+       retn = ada_val_print_1 (value_type (val), value_contents (val), 0,
                                VALUE_ADDRESS (val), stream, format,
                                deref_ref, recurse, pretty);
       value_free_to_mark (mark);
@@ -675,7 +675,7 @@ ada_val_print_1 (struct type *type, const bfd_byte *valaddr0,
                                       call_function_by_hand (func, 1,
                                                              &val)));
 
-             fprintf_filtered (stream, "%s", VALUE_CONTENTS (printable_val));
+             fprintf_filtered (stream, "%s", value_contents (printable_val));
              return 0;
            }
          /* No special printing function.  Do as best we can.  */
@@ -692,7 +692,7 @@ ada_val_print_1 (struct type *type, const bfd_byte *valaddr0,
              struct value *v = value_cast (target_type,
                                            value_from_contents_and_address
                                            (type, valaddr, 0));
-             return ada_val_print_1 (target_type, VALUE_CONTENTS (v), 0, 0,
+             return ada_val_print_1 (target_type, value_contents (v), 0, 0,
                                      stream, format, 0, recurse + 1, pretty);
            }
          else
@@ -856,7 +856,7 @@ ada_val_print_1 (struct type *type, const bfd_byte *valaddr0,
                                   (lookup_pointer_type (elttype),
                                    deref_val_int));
                  val_print (value_type (deref_val),
-                            VALUE_CONTENTS (deref_val), 0,
+                            value_contents (deref_val), 0,
                             VALUE_ADDRESS (deref_val), stream, format,
                             deref_ref, recurse + 1, pretty);
                }
@@ -896,7 +896,7 @@ int
 ada_value_print (struct value *val0, struct ui_file *stream, int format,
                 enum val_prettyprint pretty)
 {
-  char *valaddr = VALUE_CONTENTS (val0);
+  const bfd_byte *valaddr = value_contents (val0);
   CORE_ADDR address = VALUE_ADDRESS (val0) + value_offset (val0);
   struct type *type =
     ada_to_fixed_type (value_type (val0), valaddr, address, NULL);
@@ -947,7 +947,7 @@ ada_value_print (struct value *val0, struct ui_file *stream, int format,
       return 0;
     }
   
-  return (val_print (type, VALUE_CONTENTS (val), 0, address,
+  return (val_print (type, value_contents (val), 0, address,
                     stream, format, 1, 0, pretty));
 }
 
@@ -1077,7 +1077,7 @@ print_field_values (struct type *type, const bfd_byte *valaddr,
                                                  bit_pos % HOST_CHAR_BIT,
                                                  bit_size,
                                                  TYPE_FIELD_TYPE (type, i));
-             val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0, 0,
+             val_print (TYPE_FIELD_TYPE (type, i), value_contents (v), 0, 0,
                         stream, format, 0, recurse + 1, pretty);
            }
        }