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

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

diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index 90d968a4764582ff62f9dfda5389ee7e5d40905f..f3a949676a9434ef64e317e54c097effd0314bb1 100644 (file)
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -1,6 +1,6 @@
 /* Support for printing Pascal values for GDB, the GNU debugger.
-   Copyright 2000, 2001, 2003
-   Free Software Foundation, Inc.
+
+   Copyright 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -56,9 +56,10 @@
 
 
 int
-pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
-                 CORE_ADDR address, struct ui_file *stream, int format,
-                 int deref_ref, int recurse, enum val_prettyprint pretty)
+pascal_val_print (struct type *type, const bfd_byte *valaddr,
+                 int embedded_offset, CORE_ADDR address,
+                 struct ui_file *stream, int format, int deref_ref,
+                 int recurse, enum val_prettyprint pretty)
 {
   unsigned int i = 0;  /* Number of characters printed */
   unsigned len;
@@ -237,8 +238,8 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
                    {
                      wtype = TYPE_TARGET_TYPE (type);
                    }
-                 vt_val = value_at (wtype, vt_address, NULL);
-                 val_print (VALUE_TYPE (vt_val), VALUE_CONTENTS (vt_val), 0,
+                 vt_val = value_at (wtype, vt_address);
+                 val_print (value_type (vt_val), value_contents (vt_val), 0,
                             VALUE_ADDRESS (vt_val), stream, format,
                             deref_ref, recurse + 1, pretty);
                  if (pretty)
@@ -289,10 +290,9 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
              value_at
              (TYPE_TARGET_TYPE (type),
               unpack_pointer (lookup_pointer_type (builtin_type_void),
-                              valaddr + embedded_offset),
-              NULL);
-             val_print (VALUE_TYPE (deref_val),
-                        VALUE_CONTENTS (deref_val), 0,
+                              valaddr + embedded_offset));
+             val_print (value_type (deref_val),
+                        value_contents (deref_val), 0,
                         VALUE_ADDRESS (deref_val), stream, format,
                         deref_ref, recurse + 1, pretty);
            }
@@ -538,7 +538,7 @@ int
 pascal_value_print (struct value *val, struct ui_file *stream, int format,
                    enum val_prettyprint pretty)
 {
-  struct type *type = VALUE_TYPE (val);
+  struct type *type = value_type (val);
 
   /* If it is a pointer, indicate what it points to.
 
@@ -565,8 +565,8 @@ pascal_value_print (struct value *val, struct ui_file *stream, int format,
          fprintf_filtered (stream, ") ");
        }
     }
-  return val_print (type, VALUE_CONTENTS (val), VALUE_EMBEDDED_OFFSET (val),
-                   VALUE_ADDRESS (val) + VALUE_OFFSET (val),
+  return val_print (type, value_contents (val), VALUE_EMBEDDED_OFFSET (val),
+                   VALUE_ADDRESS (val) + value_offset (val),
                    stream, format, 1, 0, pretty);
 }
 
@@ -587,12 +587,13 @@ static void pascal_object_print_static_field (struct type *, struct value *,
                                              struct ui_file *, int, int,
                                              enum val_prettyprint);
 
-static void
-  pascal_object_print_value (struct type *, char *, CORE_ADDR, struct ui_file *,
-                            int, int, enum val_prettyprint, struct type **);
+static void pascal_object_print_value (struct type *, const bfd_byte *,
+                                      CORE_ADDR, struct ui_file *,
+                                      int, int, enum val_prettyprint,
+                                      struct type **);
 
 void
-pascal_object_print_class_method (char *valaddr, struct type *type,
+pascal_object_print_class_method (const bfd_byte *valaddr, struct type *type,
                                  struct ui_file *stream)
 {
   struct type *domain;
@@ -650,7 +651,7 @@ pascal_object_print_class_method (char *valaddr, struct type *type,
          check_stub_method_group (domain, i);
          for (j = 0; j < len2; j++)
            {
-             if (STREQ (DEPRECATED_SYMBOL_NAME (sym), TYPE_FN_FIELD_PHYSNAME (f, j)))
+             if (DEPRECATED_STREQ (DEPRECATED_SYMBOL_NAME (sym), TYPE_FN_FIELD_PHYSNAME (f, j)))
                goto common;
            }
        }
@@ -721,8 +722,9 @@ pascal_object_is_vtbl_member (struct type *type)
   return 0;
 }
 
-/* Mutually recursive subroutines of pascal_object_print_value and c_val_print to
-   print out a structure's fields: pascal_object_print_value_fields and pascal_object_print_value.
+/* Mutually recursive subroutines of pascal_object_print_value and
+   c_val_print to print out a structure's fields:
+   pascal_object_print_value_fields and pascal_object_print_value.
 
    TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and PRETTY have the
    same meanings as in pascal_object_print_value and c_val_print.
@@ -731,7 +733,7 @@ pascal_object_is_vtbl_member (struct type *type)
    should not print, or zero if called from top level.  */
 
 void
-pascal_object_print_value_fields (struct type *type, char *valaddr,
+pascal_object_print_value_fields (struct type *type, const bfd_byte *valaddr,
                                  CORE_ADDR address, struct ui_file *stream,
                                  int format, int recurse,
                                  enum val_prettyprint pretty,
@@ -844,7 +846,7 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
                  v = value_from_longest (TYPE_FIELD_TYPE (type, i),
                                   unpack_field_as_long (type, valaddr, 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);
                }
            }
@@ -904,8 +906,9 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
    baseclasses.  */
 
 void
-pascal_object_print_value (struct type *type, char *valaddr, CORE_ADDR address,
-                          struct ui_file *stream, int format, int recurse,
+pascal_object_print_value (struct type *type, const bfd_byte *valaddr,
+                          CORE_ADDR address, struct ui_file *stream,
+                          int format, int recurse,
                           enum val_prettyprint pretty,
                           struct type **dont_print_vb)
 {
@@ -929,7 +932,7 @@ pascal_object_print_value (struct type *type, char *valaddr, CORE_ADDR address,
       int boffset;
       struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
       char *basename = TYPE_NAME (baseclass);
-      char *base_valaddr;
+      const bfd_byte *base_valaddr;
 
       if (BASETYPE_VIA_VIRTUAL (type, i))
        {
@@ -967,8 +970,9 @@ pascal_object_print_value (struct type *type, char *valaddr, CORE_ADDR address,
       if (boffset != -1 && (boffset < 0 || boffset >= TYPE_LENGTH (type)))
        {
          /* FIXME (alloc): not safe is baseclass is really really big. */
-         base_valaddr = (char *) alloca (TYPE_LENGTH (baseclass));
-         if (target_read_memory (address + boffset, base_valaddr,
+         bfd_byte *buf = alloca (TYPE_LENGTH (baseclass));
+         base_valaddr = buf;
+         if (target_read_memory (address + boffset, buf,
                                  TYPE_LENGTH (baseclass)) != 0)
            boffset = -1;
        }
@@ -1037,16 +1041,16 @@ pascal_object_print_static_field (struct type *type, struct value *val,
                    sizeof (CORE_ADDR));
 
       CHECK_TYPEDEF (type);
-      pascal_object_print_value_fields (type, VALUE_CONTENTS (val), VALUE_ADDRESS (val),
+      pascal_object_print_value_fields (type, value_contents (val), VALUE_ADDRESS (val),
                                  stream, format, recurse, pretty, NULL, 1);
       return;
     }
-  val_print (type, VALUE_CONTENTS (val), 0, VALUE_ADDRESS (val),
+  val_print (type, value_contents (val), 0, VALUE_ADDRESS (val),
             stream, format, 0, recurse, pretty);
 }
 
 void
-pascal_object_print_class_member (char *valaddr, struct type *domain,
+pascal_object_print_class_member (const bfd_byte *valaddr, struct type *domain,
                                  struct ui_file *stream, char *prefix)
 {
 
@@ -1102,7 +1106,7 @@ extern initialize_file_ftype _initialize_pascal_valprint; /* -Wmissing-prototype
 void
 _initialize_pascal_valprint (void)
 {
-  add_show_from_set
+  deprecated_add_show_from_set
     (add_set_cmd ("pascal_static-members", class_support, var_boolean,
                  (char *) &pascal_static_field_print,
                  "Set printing of pascal static members.",