gdb: add target_ops::supports_displaced_step
[deliverable/binutils-gdb.git] / gdb / p-valprint.c
index 2c802336e326bc43e1609c332c13b84a3f79f060..cf902ac7fbe1758ae2442887ae69e11f7625ca75 100644 (file)
@@ -1,6 +1,6 @@
 /* Support for printing Pascal values for GDB, the GNU debugger.
 
-   Copyright (C) 2000-2017 Free Software Foundation, Inc.
+   Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
 #include "cp-abi.h"
 #include "cp-support.h"
 #include "objfiles.h"
+#include "gdbsupport/byte-vector.h"
+#include "cli/cli-style.h"
 \f
 
+static void pascal_object_print_value_fields (struct value *, struct ui_file *,
+                                             int,
+                                             const struct value_print_options *,
+                                             struct type **, int);
+
 /* Decorations for Pascal.  */
 
 static const struct generic_val_print_decorations p_decorations =
@@ -54,101 +61,93 @@ static const struct generic_val_print_decorations p_decorations =
   "}"
 };
 
-/* See val_print for a description of the various parameters of this
-   function; they are identical.  */
+/* See p-lang.h.  */
 
 void
-pascal_val_print (struct type *type,
-                 int embedded_offset, CORE_ADDR address,
-                 struct ui_file *stream, int recurse,
-                 struct value *original_value,
-                 const struct value_print_options *options)
+pascal_value_print_inner (struct value *val, struct ui_file *stream,
+                         int recurse,
+                         const struct value_print_options *options)
+
 {
+  struct type *type = check_typedef (value_type (val));
   struct gdbarch *gdbarch = get_type_arch (type);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+  enum bfd_endian byte_order = type_byte_order (type);
   unsigned int i = 0;  /* Number of characters printed */
   unsigned len;
-  LONGEST low_bound, high_bound;
   struct type *elttype;
   unsigned eltlen;
   int length_pos, length_size, string_pos;
   struct type *char_type;
   CORE_ADDR addr;
   int want_space = 0;
-  const gdb_byte *valaddr = value_contents_for_printing (original_value);
+  const gdb_byte *valaddr = value_contents_for_printing (val);
 
-  type = check_typedef (type);
-  switch (TYPE_CODE (type))
+  switch (type->code ())
     {
     case TYPE_CODE_ARRAY:
-      if (get_array_bounds (type, &low_bound, &high_bound))
-       {
-         len = high_bound - low_bound + 1;
-         elttype = check_typedef (TYPE_TARGET_TYPE (type));
-         eltlen = TYPE_LENGTH (elttype);
-         if (options->prettyformat_arrays)
-           {
-             print_spaces_filtered (2 + 2 * recurse, stream);
-           }
-         /* If 's' format is used, try to print out as string.
-            If no format is given, print as string if element type
-            is of TYPE_CODE_CHAR and element size is 1,2 or 4.  */
-         if (options->format == 's'
-             || ((eltlen == 1 || eltlen == 2 || eltlen == 4)
-                 && TYPE_CODE (elttype) == TYPE_CODE_CHAR
-                 && options->format == 0))
-           {
-             /* If requested, look for the first null char and only print
-                elements up to it.  */
-             if (options->stop_print_at_null)
-               {
-                 unsigned int temp_len;
-
-                 /* Look for a NULL char.  */
-                 for (temp_len = 0;
-                      extract_unsigned_integer (valaddr + embedded_offset +
-                                                temp_len * eltlen, eltlen,
-                                                byte_order)
-                      && temp_len < len && temp_len < options->print_max;
-                      temp_len++);
-                 len = temp_len;
-               }
-
-             LA_PRINT_STRING (stream, TYPE_TARGET_TYPE (type),
-                              valaddr + embedded_offset, len, NULL, 0,
-                              options);
-             i = len;
-           }
-         else
-           {
-             fprintf_filtered (stream, "{");
-             /* If this is a virtual function table, print the 0th
-                entry specially, and the rest of the members normally.  */
-             if (pascal_object_is_vtbl_ptr_type (elttype))
-               {
-                 i = 1;
-                 fprintf_filtered (stream, "%d vtable entries", len - 1);
-               }
-             else
-               {
-                 i = 0;
-               }
-             val_print_array_elements (type, embedded_offset,
-                                       address, stream, recurse,
-                                       original_value, options, i);
-             fprintf_filtered (stream, "}");
-           }
-         break;
-       }
-      /* Array of unspecified length: treat like pointer to first elt.  */
-      addr = address + embedded_offset;
+      {
+       LONGEST low_bound, high_bound;
+
+       if (get_array_bounds (type, &low_bound, &high_bound))
+         {
+           len = high_bound - low_bound + 1;
+           elttype = check_typedef (TYPE_TARGET_TYPE (type));
+           eltlen = TYPE_LENGTH (elttype);
+           /* If 's' format is used, try to print out as string.
+              If no format is given, print as string if element type
+              is of TYPE_CODE_CHAR and element size is 1,2 or 4.  */
+           if (options->format == 's'
+               || ((eltlen == 1 || eltlen == 2 || eltlen == 4)
+                   && elttype->code () == TYPE_CODE_CHAR
+                   && options->format == 0))
+             {
+               /* If requested, look for the first null char and only print
+                  elements up to it.  */
+               if (options->stop_print_at_null)
+                 {
+                   unsigned int temp_len;
+
+                   /* Look for a NULL char.  */
+                   for (temp_len = 0;
+                        extract_unsigned_integer (valaddr + temp_len * eltlen,
+                                                  eltlen, byte_order)
+                          && temp_len < len && temp_len < options->print_max;
+                        temp_len++);
+                   len = temp_len;
+                 }
+
+               LA_PRINT_STRING (stream, TYPE_TARGET_TYPE (type),
+                                valaddr, len, NULL, 0, options);
+               i = len;
+             }
+           else
+             {
+               fprintf_filtered (stream, "{");
+               /* If this is a virtual function table, print the 0th
+                  entry specially, and the rest of the members normally.  */
+               if (pascal_object_is_vtbl_ptr_type (elttype))
+                 {
+                   i = 1;
+                   fprintf_filtered (stream, "%d vtable entries", len - 1);
+                 }
+               else
+                 {
+                   i = 0;
+                 }
+               value_print_array_elements (val, stream, recurse, options, i);
+               fprintf_filtered (stream, "}");
+             }
+           break;
+         }
+       /* Array of unspecified length: treat like pointer to first elt.  */
+       addr = value_address (val);
+      }
       goto print_unpacked_pointer;
 
     case TYPE_CODE_PTR:
       if (options->format && options->format != 's')
        {
-         val_print_scalar_formatted (type, embedded_offset,
-                                     original_value, options, 0, stream);
+         value_print_scalar_formatted (val, options, 0, stream);
          break;
        }
       if (options->vtblprint && pascal_object_is_vtbl_ptr_type (type))
@@ -157,18 +156,18 @@ pascal_val_print (struct type *type,
          /* Print vtable entry - we only get here if we ARE using
             -fvtable_thunks.  (Otherwise, look under TYPE_CODE_STRUCT.)  */
          /* Extract the address, assume that it is unsigned.  */
-         addr = extract_unsigned_integer (valaddr + embedded_offset,
+         addr = extract_unsigned_integer (valaddr,
                                           TYPE_LENGTH (type), byte_order);
          print_address_demangle (options, gdbarch, addr, stream, demangle);
          break;
        }
       check_typedef (TYPE_TARGET_TYPE (type));
 
-      addr = unpack_pointer (type, valaddr + embedded_offset);
+      addr = unpack_pointer (type, valaddr);
     print_unpacked_pointer:
       elttype = check_typedef (TYPE_TARGET_TYPE (type));
 
-      if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
+      if (elttype->code () == TYPE_CODE_FUNC)
        {
          /* Try to print what function it points to.  */
          print_address_demangle (options, gdbarch, addr, stream, demangle);
@@ -184,10 +183,10 @@ pascal_val_print (struct type *type,
       /* For a pointer to char or unsigned char, also print the string
         pointed to, unless pointer is null.  */
       if (((TYPE_LENGTH (elttype) == 1
-          && (TYPE_CODE (elttype) == TYPE_CODE_INT
-             || TYPE_CODE (elttype) == TYPE_CODE_CHAR))
-         || ((TYPE_LENGTH (elttype) == 2 || TYPE_LENGTH (elttype) == 4)
-             && TYPE_CODE (elttype) == TYPE_CODE_CHAR))
+          && (elttype->code () == TYPE_CODE_INT
+               || elttype->code () == TYPE_CODE_CHAR))
+           || ((TYPE_LENGTH (elttype) == 2 || TYPE_LENGTH (elttype) == 4)
+               && elttype->code () == TYPE_CODE_CHAR))
          && (options->format == 0 || options->format == 's')
          && addr != 0)
        {
@@ -222,8 +221,7 @@ pascal_val_print (struct type *type,
       else if (pascal_object_is_vtbl_member (type))
        {
          /* Print vtbl's nicely.  */
-         CORE_ADDR vt_address = unpack_pointer (type,
-                                                valaddr + embedded_offset);
+         CORE_ADDR vt_address = unpack_pointer (type, valaddr);
          struct bound_minimal_symbol msymbol =
            lookup_minimal_symbol_by_pc (vt_address);
 
@@ -235,7 +233,7 @@ pascal_val_print (struct type *type,
              if (want_space)
                fputs_filtered (" ", stream);
              fputs_filtered ("<", stream);
-             fputs_filtered (MSYMBOL_PRINT_NAME (msymbol.minsym), stream);
+             fputs_filtered (msymbol.minsym->print_name (), stream);
              fputs_filtered (">", stream);
              want_space = 1;
            }
@@ -244,16 +242,16 @@ pascal_val_print (struct type *type,
              struct value *vt_val;
              struct symbol *wsym = NULL;
              struct type *wtype;
-             struct block *block = NULL;
-             struct field_of_this_result is_this_fld;
 
              if (want_space)
                fputs_filtered (" ", stream);
 
              if (msymbol.minsym != NULL)
-               wsym = lookup_symbol (MSYMBOL_LINKAGE_NAME (msymbol.minsym),
-                                     block,
-                                     VAR_DOMAIN, &is_this_fld).symbol;
+               {
+                 const char *search_name = msymbol.minsym->search_name ();
+                 wsym = lookup_symbol_search_name (search_name, NULL,
+                                                   VAR_DOMAIN).symbol;
+               }
 
              if (wsym)
                {
@@ -288,9 +286,7 @@ pascal_val_print (struct type *type,
     case TYPE_CODE_UNDEF:
     case TYPE_CODE_BOOL:
     case TYPE_CODE_CHAR:
-      generic_val_print (type, embedded_offset, address,
-                        stream, recurse, original_value, options,
-                        &p_decorations);
+      generic_value_print (val, stream, recurse, options, &p_decorations);
       break;
 
     case TYPE_CODE_UNION:
@@ -309,7 +305,7 @@ pascal_val_print (struct type *type,
          /* Extract the address, assume that it is unsigned.  */
          print_address_demangle
            (options, gdbarch,
-            extract_unsigned_integer (valaddr + embedded_offset
+            extract_unsigned_integer (valaddr
                                       + TYPE_FIELD_BITPOS (type,
                                                            VTBL_FNADDR_OFFSET) / 8,
                                       TYPE_LENGTH (TYPE_FIELD_TYPE (type,
@@ -322,18 +318,14 @@ pascal_val_print (struct type *type,
           if (is_pascal_string_type (type, &length_pos, &length_size,
                                      &string_pos, &char_type, NULL))
            {
-             len = extract_unsigned_integer (valaddr + embedded_offset
-                                             + length_pos, length_size,
-                                             byte_order);
-             LA_PRINT_STRING (stream, char_type,
-                              valaddr + embedded_offset + string_pos,
+             len = extract_unsigned_integer (valaddr + length_pos,
+                                             length_size, byte_order);
+             LA_PRINT_STRING (stream, char_type, valaddr + string_pos,
                               len, NULL, 0, options);
            }
          else
-           pascal_object_print_value_fields (type, valaddr, embedded_offset,
-                                             address, stream, recurse,
-                                             original_value, options,
-                                             NULL, 0);
+           pascal_object_print_value_fields (val, stream, recurse,
+                                             options, NULL, 0);
        }
       break;
 
@@ -342,39 +334,36 @@ pascal_val_print (struct type *type,
       elttype = check_typedef (elttype);
       if (TYPE_STUB (elttype))
        {
-         fprintf_filtered (stream, "<incomplete type>");
-         gdb_flush (stream);
+         fprintf_styled (stream, metadata_style.style (), "<incomplete type>");
          break;
        }
       else
        {
          struct type *range = elttype;
          LONGEST low_bound, high_bound;
-         int i;
          int need_comma = 0;
 
          fputs_filtered ("[", stream);
 
-         i = get_discrete_bounds (range, &low_bound, &high_bound);
+         int bound_info = get_discrete_bounds (range, &low_bound, &high_bound);
          if (low_bound == 0 && high_bound == -1 && TYPE_LENGTH (type) > 0)
            {
              /* If we know the size of the set type, we can figure out the
              maximum value.  */
-             i = 0;
+             bound_info = 0;
              high_bound = TYPE_LENGTH (type) * TARGET_CHAR_BIT - 1;
              TYPE_HIGH_BOUND (range) = high_bound;
            }
        maybe_bad_bstring:
-         if (i < 0)
+         if (bound_info < 0)
            {
-             fputs_filtered ("<error value>", stream);
+             fputs_styled ("<error value>", metadata_style.style (), stream);
              goto done;
            }
 
          for (i = low_bound; i <= high_bound; i++)
            {
-             int element = value_bit_index (type,
-                                            valaddr + embedded_offset, i);
+             int element = value_bit_index (type, valaddr, i);
 
              if (element < 0)
                {
@@ -389,16 +378,13 @@ pascal_val_print (struct type *type,
                  need_comma = 1;
 
                  if (i + 1 <= high_bound
-                     && value_bit_index (type,
-                                         valaddr + embedded_offset, ++i))
+                     && value_bit_index (type, valaddr, ++i))
                    {
                      int j = i;
 
                      fputs_filtered ("..", stream);
                      while (i + 1 <= high_bound
-                            && value_bit_index (type,
-                                                valaddr + embedded_offset,
-                                                ++i))
+                            && value_bit_index (type, valaddr, ++i))
                        j = i;
                      print_type_scalar (range, j, stream);
                    }
@@ -411,10 +397,10 @@ pascal_val_print (struct type *type,
 
     default:
       error (_("Invalid pascal type code %d in symbol table."),
-            TYPE_CODE (type));
+            type->code ());
     }
-  gdb_flush (stream);
 }
+
 \f
 void
 pascal_value_print (struct value *val, struct ui_file *stream,
@@ -431,15 +417,15 @@ pascal_value_print (struct value *val, struct ui_file *stream,
 
      Object pascal: if it is a member pointer, we will take care
      of that when we print it.  */
-  if (TYPE_CODE (type) == TYPE_CODE_PTR
-      || TYPE_CODE (type) == TYPE_CODE_REF)
+  if (type->code () == TYPE_CODE_PTR
+      || type->code () == TYPE_CODE_REF)
     {
       /* Hack:  remove (char *) for char strings.  Their
          type is indicated by the quoted string anyway.  */
-      if (TYPE_CODE (type) == TYPE_CODE_PTR
-         && TYPE_NAME (type) == NULL
-         && TYPE_NAME (TYPE_TARGET_TYPE (type)) != NULL
-         && strcmp (TYPE_NAME (TYPE_TARGET_TYPE (type)), "char") == 0)
+      if (type->code () == TYPE_CODE_PTR
+         && type->name () == NULL
+         && TYPE_TARGET_TYPE (type)->name () != NULL
+         && strcmp (TYPE_TARGET_TYPE (type)->name (), "char") == 0)
        {
          /* Print nothing.  */
        }
@@ -469,10 +455,7 @@ static void pascal_object_print_static_field (struct value *,
                                              struct ui_file *, int,
                                              const struct value_print_options *);
 
-static void pascal_object_print_value (struct type *, const gdb_byte *,
-                                      LONGEST,
-                                      CORE_ADDR, struct ui_file *, int,
-                                      struct value *,
+static void pascal_object_print_value (struct value *, struct ui_file *, int,
                                       const struct value_print_options *,
                                       struct type **);
 
@@ -486,7 +469,7 @@ const char pascal_vtbl_ptr_name[] =
 int
 pascal_object_is_vtbl_ptr_type (struct type *type)
 {
-  const char *type_name = type_name_no_tag (type);
+  const char *type_name = type->name ();
 
   return (type_name != NULL
          && strcmp (type_name, pascal_vtbl_ptr_name) == 0);
@@ -498,15 +481,15 @@ pascal_object_is_vtbl_ptr_type (struct type *type)
 int
 pascal_object_is_vtbl_member (struct type *type)
 {
-  if (TYPE_CODE (type) == TYPE_CODE_PTR)
+  if (type->code () == TYPE_CODE_PTR)
     {
       type = TYPE_TARGET_TYPE (type);
-      if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
+      if (type->code () == TYPE_CODE_ARRAY)
        {
          type = TYPE_TARGET_TYPE (type);
-         if (TYPE_CODE (type) == TYPE_CODE_STRUCT      /* If not using
+         if (type->code () == TYPE_CODE_STRUCT /* If not using
                                                           thunks.  */
-             || TYPE_CODE (type) == TYPE_CODE_PTR)     /* If using thunks.  */
+             || type->code () == TYPE_CODE_PTR)        /* If using thunks.  */
            {
              /* Virtual functions tables are full of pointers
                 to virtual functions.  */
@@ -518,21 +501,18 @@ pascal_object_is_vtbl_member (struct type *type)
 }
 
 /* Mutually recursive subroutines of pascal_object_print_value and
-   c_val_print to print out a structure's fields:
+   pascal_value_print to print out a structure's fields:
    pascal_object_print_value_fields and pascal_object_print_value.
 
-   TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS have the
-   same meanings as in pascal_object_print_value and c_val_print.
+   VAL, STREAM, RECURSE, and OPTIONS have the same meanings as in
+   pascal_object_print_value and c_value_print.
 
    DONT_PRINT is an array of baseclass types that we
    should not print, or zero if called from top level.  */
 
-void
-pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
-                                 LONGEST offset,
-                                 CORE_ADDR address, struct ui_file *stream,
+static void
+pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
                                  int recurse,
-                                 struct value *val,
                                  const struct value_print_options *options,
                                  struct type **dont_print_vb,
                                  int dont_print_statmem)
@@ -541,25 +521,25 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
   char *last_dont_print
     = (char *) obstack_next_free (&dont_print_statmem_obstack);
 
-  type = check_typedef (type);
+  struct type *type = check_typedef (value_type (val));
 
   fprintf_filtered (stream, "{");
-  len = TYPE_NFIELDS (type);
+  len = type->num_fields ();
   n_baseclasses = TYPE_N_BASECLASSES (type);
 
   /* Print out baseclasses such that we don't print
      duplicates of virtual baseclasses.  */
   if (n_baseclasses > 0)
-    pascal_object_print_value (type, valaddr, offset, address,
-                              stream, recurse + 1, val,
+    pascal_object_print_value (val, stream, recurse + 1,
                               options, dont_print_vb);
 
   if (!len && n_baseclasses == 1)
-    fprintf_filtered (stream, "<No data fields>");
+    fprintf_styled (stream, metadata_style.style (), "<No data fields>");
   else
     {
       struct obstack tmp_obstack = dont_print_statmem_obstack;
       int fields_seen = 0;
+      const gdb_byte *valaddr = value_contents_for_printing (val);
 
       if (dont_print_statmem == 0)
        {
@@ -573,7 +553,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
        {
          /* If requested, skip printing of static fields.  */
          if (!options->pascal_static_field_print
-             && field_is_static (&TYPE_FIELD (type, i)))
+             && field_is_static (&type->field (i)))
            continue;
          if (fields_seen)
            fprintf_filtered (stream, ", ");
@@ -584,7 +564,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
                  fprintf_filtered (stream, "\n");
                  print_spaces_filtered (2 + 2 * recurse, stream);
                  fputs_filtered ("members of ", stream);
-                 fputs_filtered (type_name_no_tag (type), stream);
+                 fputs_filtered (type->name (), stream);
                  fputs_filtered (": ", stream);
                }
            }
@@ -602,16 +582,22 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
 
          annotate_field_begin (TYPE_FIELD_TYPE (type, i));
 
-         if (field_is_static (&TYPE_FIELD (type, i)))
-           fputs_filtered ("static ", stream);
-         fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
-                                  language_cplus,
-                                  DMGL_PARAMS | DMGL_ANSI);
+         if (field_is_static (&type->field (i)))
+           {
+             fputs_filtered ("static ", stream);
+             fprintf_symbol_filtered (stream,
+                                      TYPE_FIELD_NAME (type, i),
+                                      current_language->la_language,
+                                      DMGL_PARAMS | DMGL_ANSI);
+           }
+         else
+           fputs_styled (TYPE_FIELD_NAME (type, i),
+                         variable_name_style.style (), stream);
          annotate_field_name_end ();
          fputs_filtered (" = ", stream);
          annotate_field_value ();
 
-         if (!field_is_static (&TYPE_FIELD (type, i))
+         if (!field_is_static (&type->field (i))
              && TYPE_FIELD_PACKED (type, i))
            {
              struct value *v;
@@ -620,7 +606,8 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
                 order problems.  */
              if (TYPE_FIELD_IGNORE (type, i))
                {
-                 fputs_filtered ("<optimized out or zero length>", stream);
+                 fputs_styled ("<optimized out or zero length>",
+                               metadata_style.style (), stream);
                }
              else if (value_bits_synthetic_pointer (val,
                                                     TYPE_FIELD_BITPOS (type,
@@ -628,13 +615,14 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
                                                     TYPE_FIELD_BITSIZE (type,
                                                                         i)))
                {
-                 fputs_filtered (_("<synthetic pointer>"), stream);
+                 fputs_styled (_("<synthetic pointer>"),
+                               metadata_style.style (), stream);
                }
              else
                {
                  struct value_print_options opts = *options;
 
-                 v = value_field_bitfield (type, i, valaddr, offset, val);
+                 v = value_field_bitfield (type, i, valaddr, 0, val);
 
                  opts.deref_ref = 0;
                  common_val_print (v, stream, recurse + 1, &opts,
@@ -645,15 +633,16 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
            {
              if (TYPE_FIELD_IGNORE (type, i))
                {
-                 fputs_filtered ("<optimized out or zero length>", stream);
+                 fputs_styled ("<optimized out or zero length>",
+                               metadata_style.style (), stream);
                }
-             else if (field_is_static (&TYPE_FIELD (type, i)))
+             else if (field_is_static (&type->field (i)))
                {
                  /* struct value *v = value_static_field (type, i);
                     v4.17 specific.  */
                  struct value *v;
 
-                 v = value_field_bitfield (type, i, valaddr, offset, val);
+                 v = value_field_bitfield (type, i, valaddr, 0, val);
 
                  if (v == NULL)
                    val_print_optimized_out (NULL, stream);
@@ -666,14 +655,11 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
                  struct value_print_options opts = *options;
 
                  opts.deref_ref = 0;
-                 /* val_print (TYPE_FIELD_TYPE (type, i),
-                    valaddr + TYPE_FIELD_BITPOS (type, i) / 8,
-                    address + TYPE_FIELD_BITPOS (type, i) / 8, 0,
-                    stream, format, 0, recurse + 1, pretty); */
-                 val_print (TYPE_FIELD_TYPE (type, i),
-                            offset + TYPE_FIELD_BITPOS (type, i) / 8,
-                            address, stream, recurse + 1, val, &opts,
-                            current_language);
+
+                 struct value *v = value_primitive_field (val, 0, i,
+                                                          value_type (val));
+                 common_val_print (v, stream, recurse + 1, &opts,
+                                   current_language);
                }
            }
          annotate_field_end ();
@@ -700,17 +686,15 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
    baseclasses.  */
 
 static void
-pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
-                          LONGEST offset,
-                          CORE_ADDR address, struct ui_file *stream,
+pascal_object_print_value (struct value *val, struct ui_file *stream,
                           int recurse,
-                          struct value *val,
                           const struct value_print_options *options,
                           struct type **dont_print_vb)
 {
   struct type **last_dont_print
     = (struct type **) obstack_next_free (&dont_print_vb_obstack);
   struct obstack tmp_obstack = dont_print_vb_obstack;
+  struct type *type = check_typedef (value_type (val));
   int i, n_baseclasses = TYPE_N_BASECLASSES (type);
 
   if (dont_print_vb == 0)
@@ -726,9 +710,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
     {
       LONGEST boffset = 0;
       struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
-      const char *basename = type_name_no_tag (baseclass);
-      const gdb_byte *base_valaddr = NULL;
-      LONGEST thisoffset;
+      const char *basename = baseclass->name ();
       int skip = 0;
 
       if (BASETYPE_VIA_VIRTUAL (type, i))
@@ -746,20 +728,19 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
          obstack_ptr_grow (&dont_print_vb_obstack, baseclass);
        }
 
-      thisoffset = offset;
-
-      TRY
+      struct value *base_value;
+      try
        {
-         boffset = baseclass_offset (type, i, valaddr, offset, address, val);
+         base_value = value_primitive_field (val, 0, i, type);
        }
-      CATCH (ex, RETURN_MASK_ERROR)
+      catch (const gdb_exception_error &ex)
        {
+         base_value = nullptr;
          if (ex.error == NOT_AVAILABLE_ERROR)
            skip = -1;
          else
            skip = 1;
        }
-      END_CATCH
 
       if (skip == 0)
        {
@@ -769,23 +750,18 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
 
          if (boffset < 0 || boffset >= TYPE_LENGTH (type))
            {
-             gdb_byte *buf;
-             struct cleanup *back_to;
-
-             buf = (gdb_byte *) xmalloc (TYPE_LENGTH (baseclass));
-             back_to = make_cleanup (xfree, buf);
+             CORE_ADDR address= value_address (val);
+             gdb::byte_vector buf (TYPE_LENGTH (baseclass));
 
-             base_valaddr = buf;
-             if (target_read_memory (address + boffset, buf,
+             if (target_read_memory (address + boffset, buf.data (),
                                      TYPE_LENGTH (baseclass)) != 0)
                skip = 1;
-             address = address + boffset;
-             thisoffset = 0;
+             base_value = value_from_contents_and_address (baseclass,
+                                                           buf.data (),
+                                                           address + boffset);
+             baseclass = value_type (base_value);
              boffset = 0;
-             do_cleanups (back_to);
            }
-         else
-           base_valaddr = valaddr;
        }
 
       if (options->prettyformat)
@@ -805,11 +781,10 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
       else if (skip > 0)
        val_print_invalid_address (stream);
       else
-       pascal_object_print_value_fields (baseclass, base_valaddr,
-                                         thisoffset + boffset, address,
-                                         stream, recurse, val, options,
-                    (struct type **) obstack_base (&dont_print_vb_obstack),
-                                         0);
+       pascal_object_print_value_fields
+         (base_value, stream, recurse, options,
+          (struct type **) obstack_base (&dont_print_vb_obstack),
+          0);
       fputs_filtered (", ", stream);
 
     flush_it:
@@ -851,7 +826,7 @@ pascal_object_print_static_field (struct value *val,
       return;
     }
 
-  if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+  if (type->code () == TYPE_CODE_STRUCT)
     {
       CORE_ADDR *first_dont_print, addr;
       int i;
@@ -865,9 +840,9 @@ pascal_object_print_static_field (struct value *val,
        {
          if (value_address (val) == first_dont_print[i])
            {
-             fputs_filtered ("\
-<same as static member of an already seen type>",
-                             stream);
+             fputs_styled (_("\
+<same as static member of an already seen type>"),
+                           metadata_style.style (), stream);
              return;
            }
        }
@@ -877,12 +852,8 @@ pascal_object_print_static_field (struct value *val,
                    sizeof (CORE_ADDR));
 
       type = check_typedef (type);
-      pascal_object_print_value_fields (type,
-                                       value_contents_for_printing (val),
-                                       value_embedded_offset (val),
-                                       addr,
-                                       stream, recurse,
-                                       val, options, NULL, 1);
+      pascal_object_print_value_fields (val, stream, recurse,
+                                       options, NULL, 1);
       return;
     }
 
@@ -891,11 +862,9 @@ pascal_object_print_static_field (struct value *val,
   common_val_print (val, stream, recurse, &opts, current_language);
 }
 
-/* -Wmissing-prototypes */
-extern initialize_file_ftype _initialize_pascal_valprint;
-
+void _initialize_pascal_valprint ();
 void
-_initialize_pascal_valprint (void)
+_initialize_pascal_valprint ()
 {
   add_setshow_boolean_cmd ("pascal_static-members", class_support,
                           &user_print_options.pascal_static_field_print, _("\
This page took 0.037625 seconds and 4 git commands to generate.