2005-02-24 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 040a6261a5c9c31af17c6fc2f07b4b9e7a466631..600c9a859678db1f1af60c4606a2cda92cf3e07c 100644 (file)
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -39,7 +39,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 struct ada_val_print_args
 {
   struct type *type;
-  char *valaddr0;
+  const bfd_byte *valaddr0;
   int embedded_offset;
   CORE_ADDR address;
   struct ui_file *stream;
@@ -49,30 +49,21 @@ struct ada_val_print_args
   enum val_prettyprint pretty;
 };
 
-static void print_record (struct type *, char *, struct ui_file *, int,
-                         int, enum val_prettyprint);
+static void print_record (struct type *, const bfd_byte *, struct ui_file *,
+                         int, int, enum val_prettyprint);
 
-static int print_field_values (struct type *, char *, struct ui_file *,
-                              int, int, enum val_prettyprint,
-                              int, struct type *, char *);
-
-static int print_variant_part (struct type *, int, char *,
+static int print_field_values (struct type *, const bfd_byte *,
                               struct ui_file *, int, int,
                               enum val_prettyprint, int, struct type *,
-                              char *);
-
-static void val_print_packed_array_elements (struct type *, char *valaddr,
-                                            int, struct ui_file *, int, int,
-                                            enum val_prettyprint);
+                              const bfd_byte *);
 
 static void adjust_type_signedness (struct type *);
 
 static int ada_val_print_stub (void *args0);
 
-static int ada_val_print_1 (struct type *, char *, int, CORE_ADDR,
+static int ada_val_print_1 (struct type *, const bfd_byte *, int, CORE_ADDR,
                            struct ui_file *, int, int, int,
                            enum val_prettyprint);
-static void ada_print_floating (char *, struct type *, struct ui_file *);
 \f
 
 /* Make TYPE unsigned if its range of values includes no negatives.  */
@@ -138,7 +129,7 @@ print_optional_low_bound (struct ui_file *stream, struct type *type)
     by ada_coerce_to_simple_array).  */
 
 static void
-val_print_packed_array_elements (struct type *type, char *valaddr,
+val_print_packed_array_elements (struct type *type, const bfd_byte *valaddr,
                                 int bitoffset, struct ui_file *stream,
                                 int format, int recurse,
                                 enum val_prettyprint pretty)
@@ -198,13 +189,13 @@ val_print_packed_array_elements (struct type *type, char *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);
@@ -229,7 +220,7 @@ val_print_packed_array_elements (struct type *type, char *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 ();
            }
@@ -246,7 +237,7 @@ val_print_packed_array_elements (struct type *type, char *valaddr,
 }
 
 static struct type *
-printable_val_type (struct type *type, char *valaddr)
+printable_val_type (struct type *type, const bfd_byte *valaddr)
 {
   return ada_to_fixed_type (ada_aligned_type (type), valaddr, 0, NULL);
 }
@@ -299,7 +290,8 @@ ui_memcpy (void *dest, const char *buffer, long len)
    a decimal point, and at least one digit before and after the
    point.  We use GNAT format for NaNs and infinities.  */
 static void
-ada_print_floating (char *valaddr, struct type *type, struct ui_file *stream)
+ada_print_floating (const bfd_byte *valaddr, struct type *type,
+                   struct ui_file *stream)
 {
   char buffer[64];
   char *s, *result;
@@ -555,9 +547,10 @@ ada_printstr (struct ui_file *stream, const bfd_byte *string,
    arrays.)  */
 
 int
-ada_val_print (struct type *type, char *valaddr0, int embedded_offset,
-              CORE_ADDR address, struct ui_file *stream, int format,
-              int deref_ref, int recurse, enum val_prettyprint pretty)
+ada_val_print (struct type *type, const bfd_byte *valaddr0,
+              int embedded_offset, CORE_ADDR address,
+              struct ui_file *stream, int format, int deref_ref,
+              int recurse, enum val_prettyprint pretty)
 {
   struct ada_val_print_args args;
   args.type = type;
@@ -589,8 +582,9 @@ ada_val_print_stub (void *args0)
  * does not catch evaluation errors (leaving that to ada_val_print).  */
 
 static int
-ada_val_print_1 (struct type *type, char *valaddr0, int embedded_offset,
-                CORE_ADDR address, struct ui_file *stream, int format,
+ada_val_print_1 (struct type *type, const bfd_byte *valaddr0,
+                int embedded_offset, CORE_ADDR address,
+                struct ui_file *stream, int format,
                 int deref_ref, int recurse, enum val_prettyprint pretty)
 {
   unsigned int len;
@@ -598,7 +592,7 @@ ada_val_print_1 (struct type *type, char *valaddr0, int embedded_offset,
   struct type *elttype;
   unsigned int eltlen;
   LONGEST val;
-  char *valaddr = valaddr0 + embedded_offset;
+  const bfd_byte *valaddr = valaddr0 + embedded_offset;
 
   type = ada_check_typedef (type);
 
@@ -615,7 +609,7 @@ ada_val_print_1 (struct type *type, char *valaddr0, int embedded_offset,
          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);
@@ -681,7 +675,7 @@ ada_val_print_1 (struct type *type, char *valaddr0, int embedded_offset,
                                       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.  */
@@ -698,7 +692,7 @@ ada_val_print_1 (struct type *type, char *valaddr0, int embedded_offset,
              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
@@ -724,7 +718,7 @@ ada_val_print_1 (struct type *type, char *valaddr0, int embedded_offset,
               fprintf_filtered (stream, "(");
               type_print (type, "", stream, -1);
               fprintf_filtered (stream, ") ");
-              print_address_numeric 
+              deprecated_print_address_numeric 
                (extract_typed_address (valaddr, builtin_type_void_data_ptr),
                  1, stream);
             }
@@ -862,7 +856,7 @@ ada_val_print_1 (struct type *type, char *valaddr0, int embedded_offset,
                                   (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);
                }
@@ -879,10 +873,10 @@ ada_val_print_1 (struct type *type, char *valaddr0, int embedded_offset,
 }
 
 static int
-print_variant_part (struct type *type, int field_num, char *valaddr,
+print_variant_part (struct type *type, int field_num, const bfd_byte *valaddr,
                    struct ui_file *stream, int format, int recurse,
                    enum val_prettyprint pretty, int comma_needed,
-                   struct type *outer_type, char *outer_valaddr)
+                   struct type *outer_type, const bfd_byte *outer_valaddr)
 {
   struct type *var_type = TYPE_FIELD_TYPE (type, field_num);
   int which = ada_which_variant_applies (var_type, outer_type, outer_valaddr);
@@ -902,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);
@@ -953,13 +947,14 @@ 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));
 }
 
 static void
-print_record (struct type *type, char *valaddr, struct ui_file *stream,
-             int format, int recurse, enum val_prettyprint pretty)
+print_record (struct type *type, const bfd_byte *valaddr,
+             struct ui_file *stream, int format, int recurse,
+             enum val_prettyprint pretty)
 {
   type = ada_check_typedef (type);
 
@@ -990,10 +985,10 @@ print_record (struct type *type, char *valaddr, struct ui_file *stream,
    Returns 1 if COMMA_NEEDED or any fields were printed.  */
 
 static int
-print_field_values (struct type *type, char *valaddr, struct ui_file *stream,
-                   int format, int recurse, enum val_prettyprint pretty,
-                   int comma_needed, struct type *outer_type,
-                   char *outer_valaddr)
+print_field_values (struct type *type, const bfd_byte *valaddr,
+                   struct ui_file *stream, int format, int recurse,
+                   enum val_prettyprint pretty, int comma_needed,
+                   struct type *outer_type, const bfd_byte *outer_valaddr)
 {
   int i, len;
 
@@ -1082,7 +1077,7 @@ print_field_values (struct type *type, char *valaddr, struct ui_file *stream,
                                                  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);
            }
        }