daily update

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

diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index e24d6566619bf918560247af1bc84a5e5ea6b7a0..4d39bed265b73a0097429e20d85e73bbd775961b 100644 (file)
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -1,12 +1,13 @@
 /* Support for printing Pascal values for GDB, the GNU debugger.
 /* Support for printing Pascal values for GDB, the GNU debugger.

-   Copyright 2000, 2001, 2003
+
+   Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009, 2010

    Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,8 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* This file is derived from c-valprint.c */
 
 
 /* This file is derived from c-valprint.c */
 


@@ -37,35 +37,35 @@
 #include "annotate.h"
 #include "p-lang.h"
 #include "cp-abi.h"
 #include "annotate.h"
 #include "p-lang.h"
 #include "cp-abi.h"

+#include "cp-support.h"

 \f
 
 
 
 /* Print data of type TYPE located at VALADDR (within GDB), which came from
    the inferior at address ADDRESS, onto stdio stream STREAM according to
 \f
 
 
 
 /* Print data of type TYPE located at VALADDR (within GDB), which came from
    the inferior at address ADDRESS, onto stdio stream STREAM according to

-   FORMAT (a letter or 0 for natural format).  The data at VALADDR is in
-   target byte order.
+   OPTIONS.  The data at VALADDR is in target byte order.

 
    If the data are a string pointer, returns the number of string characters
 
    If the data are a string pointer, returns the number of string characters

-   printed.
-
-   If DEREF_REF is nonzero, then dereference references, otherwise just print
-   them like pointers.
-
-   The PRETTY parameter controls prettyprinting.  */
+   printed.  */

 
 
 int
 
 
 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 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);
+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

   unsigned int i = 0;  /* Number of characters printed */
   unsigned len;
   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 *elttype;
   unsigned eltlen;
   int length_pos, length_size, string_pos;

-  int char_size;
+  struct type *char_type;

   LONGEST val;
   CORE_ADDR addr;
 
   LONGEST val;
   CORE_ADDR addr;
 


@@ -73,37 +73,42 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_ARRAY:
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_ARRAY:

-      if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0)
+      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);
          elttype = check_typedef (TYPE_TARGET_TYPE (type));
          eltlen = TYPE_LENGTH (elttype);

-         len = TYPE_LENGTH (type) / eltlen;
-         if (prettyprint_arrays)
+         if (options->prettyprint_arrays)

            {
              print_spaces_filtered (2 + 2 * recurse, stream);
            }
            {
              print_spaces_filtered (2 + 2 * recurse, stream);
            }

-         /* For an array of chars, print with string syntax.  */
-         if (eltlen == 1 &&
-             ((TYPE_CODE (elttype) == TYPE_CODE_INT)
-              || ((current_language->la_language == language_m2)
-                  && (TYPE_CODE (elttype) == TYPE_CODE_CHAR)))
-             && (format == 0 || format == 's'))
+         /* 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 requested, look for the first null char and only print
                 elements up to it.  */

-             if (stop_print_at_null)
+             if (options->stop_print_at_null)

                {
                  unsigned int temp_len;
 
                  /* Look for a NULL char. */
                  for (temp_len = 0;
                {
                  unsigned int temp_len;
 
                  /* Look for a NULL char. */
                  for (temp_len = 0;

-                      (valaddr + embedded_offset)[temp_len]
-                      && temp_len < len && temp_len < print_max;
+                      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;
                }
 
                       temp_len++);
                  len = temp_len;
                }
 

-             LA_PRINT_STRING (stream, valaddr + embedded_offset, len, 1, 0);
+             LA_PRINT_STRING (stream, TYPE_TARGET_TYPE (type),
+                              valaddr + embedded_offset, len, NULL, 0,
+                              options);

              i = len;
            }
          else
              i = len;
            }
          else


@@ -121,7 +126,7 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
                  i = 0;
                }
              val_print_array_elements (type, valaddr + embedded_offset, address, stream,
                  i = 0;
                }
              val_print_array_elements (type, valaddr + embedded_offset, address, stream,

-                                    format, deref_ref, recurse, pretty, i);
+                                       recurse, original_value, options, i);

              fprintf_filtered (stream, "}");
            }
          break;
              fprintf_filtered (stream, "}");
            }
          break;


@@ -131,170 +136,150 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
       goto print_unpacked_pointer;
 
     case TYPE_CODE_PTR:
       goto print_unpacked_pointer;
 
     case TYPE_CODE_PTR:

-      if (format && format != 's')
+      if (options->format && options->format != 's')

        {
        {

-         print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
+         print_scalar_formatted (valaddr + embedded_offset, type,
+                                 options, 0, stream);

          break;
        }
          break;
        }

-      if (vtblprint && pascal_object_is_vtbl_ptr_type (type))
+      if (options->vtblprint && pascal_object_is_vtbl_ptr_type (type))

        {
          /* Print the unmangled name if desired.  */
          /* 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.  */
        {
          /* Print the unmangled name if desired.  */
          /* 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.  */

-         print_address_demangle (extract_unsigned_integer (valaddr + embedded_offset, TYPE_LENGTH (type)),
-                                 stream, demangle);
+         addr = extract_unsigned_integer (valaddr + embedded_offset,
+                                          TYPE_LENGTH (type), byte_order);
+         print_address_demangle (gdbarch, addr, stream, demangle);

          break;
        }
       elttype = check_typedef (TYPE_TARGET_TYPE (type));
          break;
        }
       elttype = check_typedef (TYPE_TARGET_TYPE (type));

-      if (TYPE_CODE (elttype) == TYPE_CODE_METHOD)
+
+      addr = unpack_pointer (type, valaddr + embedded_offset);
+    print_unpacked_pointer:
+      elttype = check_typedef (TYPE_TARGET_TYPE (type));
+
+      if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)

        {
        {

-         pascal_object_print_class_method (valaddr + embedded_offset, type, stream);
+         /* Try to print what function it points to.  */
+         print_address_demangle (gdbarch, addr, stream, demangle);
+         /* Return value is irrelevant except for string pointers.  */
+         return (0);

        }
        }

-      else if (TYPE_CODE (elttype) == TYPE_CODE_MEMBER)
+
+      if (options->addressprint && options->format != 's')

        {
        {

-         pascal_object_print_class_member (valaddr + embedded_offset,
-                                TYPE_DOMAIN_TYPE (TYPE_TARGET_TYPE (type)),
-                                           stream, "&");
+         fputs_filtered (paddress (gdbarch, addr), stream);

        }
        }

-      else
-       {
-         addr = unpack_pointer (type, valaddr + embedded_offset);
-       print_unpacked_pointer:
-         elttype = check_typedef (TYPE_TARGET_TYPE (type));

 
 

-         if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
-           {
-             /* Try to print what function it points to.  */
-             print_address_demangle (addr, stream, demangle);
-             /* Return value is irrelevant except for string pointers.  */
-             return (0);
-           }
+      /* 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))
+         && (options->format == 0 || options->format == 's')
+         && addr != 0)
+       {
+         /* no wide string yet */
+         i = val_print_string (elttype, addr, -1, stream, options);
+       }
+      /* also for pointers to pascal strings */
+      /* Note: this is Free Pascal specific:
+        as GDB does not recognize stabs pascal strings
+        Pascal strings are mapped to records
+        with lowercase names PM  */
+      if (is_pascal_string_type (elttype, &length_pos, &length_size,
+                                &string_pos, &char_type, NULL)
+         && addr != 0)
+       {
+         ULONGEST string_length;
+         void *buffer;

 
 

-         if (addressprint && format != 's')
-           {
-             print_address_numeric (addr, 1, stream);
-           }
+         buffer = xmalloc (length_size);
+         read_memory (addr + length_pos, buffer, length_size);
+         string_length = extract_unsigned_integer (buffer, length_size,
+                                                   byte_order);
+         xfree (buffer);
+         i = val_print_string (char_type ,addr + string_pos, string_length, stream, options);
+       }
+      else if (pascal_object_is_vtbl_member (type))
+       {
+         /* print vtbl's nicely */
+         CORE_ADDR vt_address = unpack_pointer (type, valaddr + embedded_offset);
+         struct minimal_symbol *msymbol =
+           lookup_minimal_symbol_by_pc (vt_address);

 
 

-         /* 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
-             && (format == 0 || format == 's')
-             && addr != 0)
-           {
-             /* no wide string yet */
-             i = val_print_string (addr, -1, 1, stream);
-           }
-         /* also for pointers to pascal strings */
-         /* Note: this is Free Pascal specific:
-            as GDB does not recognize stabs pascal strings
-            Pascal strings are mapped to records
-            with lowercase names PM  */
-          if (is_pascal_string_type (elttype, &length_pos, &length_size,
-                                     &string_pos, &char_size, NULL)
-             && addr != 0)
+         if ((msymbol != NULL)
+             && (vt_address == SYMBOL_VALUE_ADDRESS (msymbol)))

            {
            {

-             ULONGEST string_length;
-              void *buffer;
-              buffer = xmalloc (length_size);
-              read_memory (addr + length_pos, buffer, length_size);
-             string_length = extract_unsigned_integer (buffer, length_size);
-              xfree (buffer);
-              i = val_print_string (addr + string_pos, string_length, char_size, stream);
+             fputs_filtered (" <", stream);
+             fputs_filtered (SYMBOL_PRINT_NAME (msymbol), stream);
+             fputs_filtered (">", stream);

            }
            }

-         else if (pascal_object_is_vtbl_member (type))
+         if (vt_address && options->vtblprint)

            {
            {

-             /* print vtbl's nicely */
-             CORE_ADDR vt_address = unpack_pointer (type, valaddr + embedded_offset);
+             struct value *vt_val;
+             struct symbol *wsym = (struct symbol *) NULL;
+             struct type *wtype;
+             struct block *block = (struct block *) NULL;
+             int is_this_fld;
+
+             if (msymbol != NULL)
+               wsym = lookup_symbol (SYMBOL_LINKAGE_NAME (msymbol), block,
+                                     VAR_DOMAIN, &is_this_fld);

 
 

-             struct minimal_symbol *msymbol =
-             lookup_minimal_symbol_by_pc (vt_address);
-             if ((msymbol != NULL)
-                 && (vt_address == SYMBOL_VALUE_ADDRESS (msymbol)))
+             if (wsym)

                {
                {

-                 fputs_filtered (" <", stream);
-                 fputs_filtered (SYMBOL_PRINT_NAME (msymbol), stream);
-                 fputs_filtered (">", stream);
+                 wtype = SYMBOL_TYPE (wsym);

                }
                }

-             if (vt_address && vtblprint)
+             else

                {
                {

-                 struct value *vt_val;
-                 struct symbol *wsym = (struct symbol *) NULL;
-                 struct type *wtype;
-                 struct block *block = (struct block *) NULL;
-                 int is_this_fld;
-
-                 if (msymbol != NULL)
-                   wsym = lookup_symbol (DEPRECATED_SYMBOL_NAME (msymbol), block,
-                                         VAR_DOMAIN, &is_this_fld, NULL);
-
-                 if (wsym)
-                   {
-                     wtype = SYMBOL_TYPE (wsym);
-                   }
-                 else
-                   {
-                     wtype = TYPE_TARGET_TYPE (type);
-                   }
-                 vt_val = value_at (wtype, vt_address, NULL);
-                 val_print (VALUE_TYPE (vt_val), VALUE_CONTENTS (vt_val), 0,
-                            VALUE_ADDRESS (vt_val), stream, format,
-                            deref_ref, recurse + 1, pretty);
-                 if (pretty)
-                   {
-                     fprintf_filtered (stream, "\n");
-                     print_spaces_filtered (2 + 2 * recurse, stream);
-                   }
+                 wtype = TYPE_TARGET_TYPE (type);
+               }
+             vt_val = value_at (wtype, vt_address);
+             common_val_print (vt_val, stream, recurse + 1, options,
+                               current_language);
+             if (options->pretty)
+               {
+                 fprintf_filtered (stream, "\n");
+                 print_spaces_filtered (2 + 2 * recurse, stream);

                }
            }
                }
            }

-
-         /* Return number of characters printed, including the terminating
-            '\0' if we reached the end.  val_print_string takes care including
-            the terminating '\0' if necessary.  */
-         return i;

        }
        }

-      break;

 
 

-    case TYPE_CODE_MEMBER:
-      error ("not implemented: member type in pascal_val_print");
+      /* Return number of characters printed, including the terminating
+        '\0' if we reached the end.  val_print_string takes care including
+        the terminating '\0' if necessary.  */
+      return i;
+

       break;
 
     case TYPE_CODE_REF:
       elttype = check_typedef (TYPE_TARGET_TYPE (type));
       break;
 
     case TYPE_CODE_REF:
       elttype = check_typedef (TYPE_TARGET_TYPE (type));

-      if (TYPE_CODE (elttype) == TYPE_CODE_MEMBER)
-       {
-         pascal_object_print_class_member (valaddr + embedded_offset,
-                                           TYPE_DOMAIN_TYPE (elttype),
-                                           stream, "");
-         break;
-       }
-      if (addressprint)
+      if (options->addressprint)

        {
        {

+         CORE_ADDR addr
+           = extract_typed_address (valaddr + embedded_offset, type);
+

          fprintf_filtered (stream, "@");
          fprintf_filtered (stream, "@");

-         /* Extract the address, assume that it is unsigned.  */
-         print_address_numeric
-           (extract_unsigned_integer (valaddr + embedded_offset,
-                                      TARGET_PTR_BIT / HOST_CHAR_BIT),
-            1, stream);
-         if (deref_ref)
+          fputs_filtered (paddress (gdbarch, addr), stream);
+         if (options->deref_ref)

            fputs_filtered (": ", stream);
        }
       /* De-reference the reference.  */
            fputs_filtered (": ", stream);
        }
       /* De-reference the reference.  */

-      if (deref_ref)
+      if (options->deref_ref)

        {
          if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
            {
              struct value *deref_val =
        {
          if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
            {
              struct value *deref_val =

-             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,
-                        VALUE_ADDRESS (deref_val), stream, format,
-                        deref_ref, recurse + 1, pretty);
+               value_at
+               (TYPE_TARGET_TYPE (type),
+                unpack_pointer (type, valaddr + embedded_offset));
+
+             common_val_print (deref_val, stream, recurse + 1, options,
+                               current_language);

            }
          else
            fputs_filtered ("???", stream);
            }
          else
            fputs_filtered ("???", stream);


@@ -302,42 +287,46 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
       break;
 
     case TYPE_CODE_UNION:
       break;
 
     case TYPE_CODE_UNION:

-      if (recurse && !unionprint)
+      if (recurse && !options->unionprint)

        {
          fprintf_filtered (stream, "{...}");
          break;
        }
       /* Fall through.  */
     case TYPE_CODE_STRUCT:
        {
          fprintf_filtered (stream, "{...}");
          break;
        }
       /* Fall through.  */
     case TYPE_CODE_STRUCT:

-      if (vtblprint && pascal_object_is_vtbl_ptr_type (type))
+      if (options->vtblprint && pascal_object_is_vtbl_ptr_type (type))

        {
          /* Print the unmangled name if desired.  */
          /* Print vtable entry - we only get here if NOT using
             -fvtable_thunks.  (Otherwise, look under TYPE_CODE_PTR.) */
          /* Extract the address, assume that it is unsigned.  */
          print_address_demangle
        {
          /* Print the unmangled name if desired.  */
          /* Print vtable entry - we only get here if NOT using
             -fvtable_thunks.  (Otherwise, look under TYPE_CODE_PTR.) */
          /* Extract the address, assume that it is unsigned.  */
          print_address_demangle

-           (extract_unsigned_integer (valaddr + embedded_offset + TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8,
-                                      TYPE_LENGTH (TYPE_FIELD_TYPE (type, VTBL_FNADDR_OFFSET))),
+           (gdbarch,
+            extract_unsigned_integer (valaddr + embedded_offset + TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8,
+                                      TYPE_LENGTH (TYPE_FIELD_TYPE (type, VTBL_FNADDR_OFFSET)), byte_order),

             stream, demangle);
        }
       else
        {
           if (is_pascal_string_type (type, &length_pos, &length_size,
             stream, demangle);
        }
       else
        {
           if (is_pascal_string_type (type, &length_pos, &length_size,

-                                     &string_pos, &char_size, NULL))
+                                     &string_pos, &char_type, NULL))

            {
            {

-             len = extract_unsigned_integer (valaddr + embedded_offset + length_pos, length_size);
-             LA_PRINT_STRING (stream, valaddr + embedded_offset + string_pos, len, char_size, 0);
+             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, NULL, 0, options);

            }
          else
            }
          else

-           pascal_object_print_value_fields (type, valaddr + embedded_offset, address, stream, format,
-                                             recurse, pretty, NULL, 0);
+           pascal_object_print_value_fields (type, valaddr + embedded_offset, address, stream,
+                                             recurse, original_value, options, NULL, 0);

        }
       break;
 
     case TYPE_CODE_ENUM:
        }
       break;
 
     case TYPE_CODE_ENUM:

-      if (format)
+      if (options->format)

        {
        {

-         print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
+         print_scalar_formatted (valaddr + embedded_offset, type,
+                                 options, 0, stream);

          break;
        }
       len = TYPE_NFIELDS (type);
          break;
        }
       len = TYPE_NFIELDS (type);


@@ -360,10 +349,19 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
        }
       break;
 
        }
       break;
 

+    case TYPE_CODE_FLAGS:
+      if (options->format)
+         print_scalar_formatted (valaddr + embedded_offset, type,
+                                 options, 0, stream);
+      else
+       val_print_type_code_flags (type, valaddr + embedded_offset, stream);
+      break;
+

     case TYPE_CODE_FUNC:
     case TYPE_CODE_FUNC:

-      if (format)
+      if (options->format)

        {
        {

-         print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
+         print_scalar_formatted (valaddr + embedded_offset, type,
+                                 options, 0, stream);

          break;
        }
       /* FIXME, we should consider, at least for ANSI C language, eliminating
          break;
        }
       /* FIXME, we should consider, at least for ANSI C language, eliminating


@@ -372,13 +370,19 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
       type_print (type, "", stream, -1);
       fprintf_filtered (stream, "} ");
       /* Try to print what function it points to, and its address.  */
       type_print (type, "", stream, -1);
       fprintf_filtered (stream, "} ");
       /* Try to print what function it points to, and its address.  */

-      print_address_demangle (address, stream, demangle);
+      print_address_demangle (gdbarch, address, stream, demangle);

       break;
 
     case TYPE_CODE_BOOL:
       break;
 
     case TYPE_CODE_BOOL:

-      format = format ? format : output_format;
-      if (format)
-       print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
+      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,
+                                 &opts, 0, stream);
+       }

       else
        {
          val = unpack_long (type, valaddr + embedded_offset);
       else
        {
          val = unpack_long (type, valaddr + embedded_offset);


@@ -405,10 +409,14 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
       /* FALLTHROUGH */
 
     case TYPE_CODE_INT:
       /* FALLTHROUGH */
 
     case TYPE_CODE_INT:

-      format = format ? format : output_format;
-      if (format)
+      if (options->format || options->output_format)

        {
        {

-         print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
+         struct value_print_options opts = *options;
+
+         opts.format = (options->format ? options->format
+                        : options->output_format);
+         print_scalar_formatted (valaddr + embedded_offset, type,
+                                 &opts, 0, stream);

        }
       else
        {
        }
       else
        {


@@ -417,10 +425,14 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
       break;
 
     case TYPE_CODE_CHAR:
       break;
 
     case TYPE_CODE_CHAR:

-      format = format ? format : output_format;
-      if (format)
+      if (options->format || options->output_format)

        {
        {

-         print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
+         struct value_print_options opts = *options;
+
+         opts.format = (options->format ? options->format
+                        : options->output_format);
+         print_scalar_formatted (valaddr + embedded_offset, type,
+                                 &opts, 0, stream);

        }
       else
        {
        }
       else
        {


@@ -430,14 +442,15 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
          else
            fprintf_filtered (stream, "%d", (int) val);
          fputs_filtered (" ", stream);
          else
            fprintf_filtered (stream, "%d", (int) val);
          fputs_filtered (" ", stream);

-         LA_PRINT_CHAR ((unsigned char) val, stream);
+         LA_PRINT_CHAR ((unsigned char) val, type, stream);

        }
       break;
 
     case TYPE_CODE_FLT:
        }
       break;
 
     case TYPE_CODE_FLT:

-      if (format)
+      if (options->format)

        {
        {

-         print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
+         print_scalar_formatted (valaddr + embedded_offset, type,
+                                 options, 0, stream);

        }
       else
        {
        }
       else
        {


@@ -469,6 +482,14 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
            fputs_filtered ("[", stream);
 
          i = get_discrete_bounds (range, &low_bound, &high_bound);
            fputs_filtered ("[", stream);
 
          i = 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;
+             high_bound = TYPE_LENGTH (type) * TARGET_CHAR_BIT - 1;
+             TYPE_HIGH_BOUND (range) = high_bound;
+           }

        maybe_bad_bstring:
          if (i < 0)
            {
        maybe_bad_bstring:
          if (i < 0)
            {


@@ -479,6 +500,7 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
          for (i = low_bound; i <= high_bound; i++)
            {
              int element = value_bit_index (type, valaddr + embedded_offset, i);
          for (i = low_bound; i <= high_bound; i++)
            {
              int element = value_bit_index (type, valaddr + embedded_offset, i);

+

              if (element < 0)
                {
                  i = element;
              if (element < 0)
                {
                  i = element;


@@ -496,6 +518,7 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
                  if (i + 1 <= high_bound && value_bit_index (type, valaddr + embedded_offset, ++i))
                    {
                      int j = i;
                  if (i + 1 <= high_bound && value_bit_index (type, valaddr + embedded_offset, ++i))
                    {
                      int j = i;

+

                      fputs_filtered ("..", stream);
                      while (i + 1 <= high_bound
                             && value_bit_index (type, valaddr + embedded_offset, ++i))
                      fputs_filtered ("..", stream);
                      while (i + 1 <= high_bound
                             && value_bit_index (type, valaddr + embedded_offset, ++i))


@@ -517,7 +540,7 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
       break;
 
     case TYPE_CODE_ERROR:
       break;
 
     case TYPE_CODE_ERROR:

-      fprintf_filtered (stream, "<error type>");
+      fprintf_filtered (stream, "%s", TYPE_ERROR_NAME (type));

       break;
 
     case TYPE_CODE_UNDEF:
       break;
 
     case TYPE_CODE_UNDEF:


@@ -528,17 +551,20 @@ pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
       break;
 
     default:
       break;
 
     default:

-      error ("Invalid pascal type code %d in symbol table.", TYPE_CODE (type));
+      error (_("Invalid pascal type code %d in symbol table."), TYPE_CODE (type));

     }
   gdb_flush (stream);
   return (0);
 }
 \f
 int
     }
   gdb_flush (stream);
   return (0);
 }
 \f
 int

-pascal_value_print (struct value *val, struct ui_file *stream, int format,
-                   enum val_prettyprint pretty)
+pascal_value_print (struct value *val, struct ui_file *stream,
+                   const struct value_print_options *options)

 {
 {

-  struct type *type = VALUE_TYPE (val);
+  struct type *type = value_type (val);
+  struct value_print_options opts = *options;
+
+  opts.deref_ref = 1;

 
   /* If it is a pointer, indicate what it points to.
 
 
   /* If it is a pointer, indicate what it points to.
 


@@ -546,14 +572,14 @@ pascal_value_print (struct value *val, struct ui_file *stream, int format,
 
      Object pascal: if it is a member pointer, we will take care
      of that when we print it.  */
 
      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) == TYPE_CODE_PTR
+      || TYPE_CODE (type) == TYPE_CODE_REF)

     {
       /* Hack:  remove (char *) for char strings.  Their
          type is indicated by the quoted string anyway. */
     {
       /* 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
+      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)
        {
          /* Print nothing */
          && strcmp (TYPE_NAME (TYPE_TARGET_TYPE (type)), "char") == 0)
        {
          /* Print nothing */


@@ -565,121 +591,30 @@ pascal_value_print (struct value *val, struct ui_file *stream, int format,
          fprintf_filtered (stream, ") ");
        }
     }
          fprintf_filtered (stream, ") ");
        }
     }

-  return val_print (type, VALUE_CONTENTS (val), VALUE_EMBEDDED_OFFSET (val),
-                   VALUE_ADDRESS (val) + VALUE_OFFSET (val),
-                   stream, format, 1, 0, pretty);
+  return common_val_print (val, stream, 0, &opts, current_language);

 }
 
 
 }
 
 

-/******************************************************************************
-                    Inserted from cp-valprint
-******************************************************************************/
-
-extern int vtblprint;          /* Controls printing of vtbl's */
-extern int objectprint;                /* Controls looking up an object's derived type
-                                  using what we find in its vtables.  */
-static int pascal_static_field_print;  /* Controls printing of static fields. */
-
-static struct obstack dont_print_vb_obstack;
-static struct obstack dont_print_statmem_obstack;
-
-static void pascal_object_print_static_field (struct type *, struct value *,
-                                             struct ui_file *, int, int,
-                                             enum val_prettyprint);
-

 static void
 static void

-  pascal_object_print_value (struct type *, char *, CORE_ADDR, struct ui_file *,
-                            int, int, enum val_prettyprint, struct type **);
-
-void
-pascal_object_print_class_method (char *valaddr, struct type *type,
-                                 struct ui_file *stream)
+show_pascal_static_field_print (struct ui_file *file, int from_tty,
+                               struct cmd_list_element *c, const char *value)

 {
 {

-  struct type *domain;
-  struct fn_field *f = NULL;
-  int j = 0;
-  int len2;
-  int offset;
-  char *kind = "";
-  CORE_ADDR addr;
-  struct symbol *sym;
-  unsigned len;
-  unsigned int i;
-  struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type));
+  fprintf_filtered (file, _("Printing of pascal static members is %s.\n"),
+                   value);
+}

 
 

-  domain = TYPE_DOMAIN_TYPE (target_type);
-  if (domain == (struct type *) NULL)
-    {
-      fprintf_filtered (stream, "<unknown>");
-      return;
-    }
-  addr = unpack_pointer (lookup_pointer_type (builtin_type_void), valaddr);
-  if (METHOD_PTR_IS_VIRTUAL (addr))
-    {
-      offset = METHOD_PTR_TO_VOFFSET (addr);
-      len = TYPE_NFN_FIELDS (domain);
-      for (i = 0; i < len; i++)
-       {
-         f = TYPE_FN_FIELDLIST1 (domain, i);
-         len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i);
+static struct obstack dont_print_vb_obstack;
+static struct obstack dont_print_statmem_obstack;

 
 

-         check_stub_method_group (domain, i);
-         for (j = 0; j < len2; j++)
-           {
-             if (TYPE_FN_FIELD_VOFFSET (f, j) == offset)
-               {
-                 kind = "virtual ";
-                 goto common;
-               }
-           }
-       }
-    }
-  else
-    {
-      sym = find_pc_function (addr);
-      if (sym == 0)
-       {
-         error ("invalid pointer to member function");
-       }
-      len = TYPE_NFN_FIELDS (domain);
-      for (i = 0; i < len; i++)
-       {
-         f = TYPE_FN_FIELDLIST1 (domain, i);
-         len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i);
+static void pascal_object_print_static_field (struct value *,
+                                             struct ui_file *, int,
+                                             const struct value_print_options *);

 
 

-         check_stub_method_group (domain, i);
-         for (j = 0; j < len2; j++)
-           {
-             if (DEPRECATED_STREQ (DEPRECATED_SYMBOL_NAME (sym), TYPE_FN_FIELD_PHYSNAME (f, j)))
-               goto common;
-           }
-       }
-    }
-common:
-  if (i < len)
-    {
-      char *demangled_name;
-
-      fprintf_filtered (stream, "&");
-      fputs_filtered (kind, stream);
-      demangled_name = cplus_demangle (TYPE_FN_FIELD_PHYSNAME (f, j),
-                                      DMGL_ANSI | DMGL_PARAMS);
-      if (demangled_name == NULL)
-       fprintf_filtered (stream, "<badly mangled name %s>",
-                         TYPE_FN_FIELD_PHYSNAME (f, j));
-      else
-       {
-         fputs_filtered (demangled_name, stream);
-         xfree (demangled_name);
-       }
-    }
-  else
-    {
-      fprintf_filtered (stream, "(");
-      type_print (type, "", stream, -1);
-      fprintf_filtered (stream, ") %d", (int) addr >> 3);
-    }
-}
+static void pascal_object_print_value (struct type *, const gdb_byte *,
+                                      CORE_ADDR, struct ui_file *, int,
+                                      const struct value *,
+                                      const struct value_print_options *,
+                                      struct type **);

 
 /* It was changed to this after 2.4.5.  */
 const char pascal_vtbl_ptr_name[] =
 
 /* It was changed to this after 2.4.5.  */
 const char pascal_vtbl_ptr_name[] =


@@ -721,25 +656,26 @@ pascal_object_is_vtbl_member (struct type *type)
   return 0;
 }
 
   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
+   TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS have the

    same meanings as in pascal_object_print_value and c_val_print.
 
    DONT_PRINT is an array of baseclass types that we
    should not print, or zero if called from top level.  */
 
 void
    same meanings as in pascal_object_print_value and c_val_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, char *valaddr,
+pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,

                                  CORE_ADDR address, struct ui_file *stream,
                                  CORE_ADDR address, struct ui_file *stream,

-                                 int format, int recurse,
-                                 enum val_prettyprint pretty,
+                                 int recurse,
+                                 const struct value *val,
+                                 const struct value_print_options *options,

                                  struct type **dont_print_vb,
                                  int dont_print_statmem)
 {
   int i, len, n_baseclasses;
                                  struct type **dont_print_vb,
                                  int dont_print_statmem)
 {
   int i, len, n_baseclasses;

-  struct obstack tmp_obstack;

   char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack);
 
   CHECK_TYPEDEF (type);
   char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack);
 
   CHECK_TYPEDEF (type);


@@ -752,12 +688,13 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
      duplicates of virtual baseclasses.  */
   if (n_baseclasses > 0)
     pascal_object_print_value (type, valaddr, address, stream,
      duplicates of virtual baseclasses.  */
   if (n_baseclasses > 0)
     pascal_object_print_value (type, valaddr, address, stream,

-                              format, recurse + 1, pretty, dont_print_vb);
+                              recurse + 1, val, options, dont_print_vb);

 
   if (!len && n_baseclasses == 1)
     fprintf_filtered (stream, "<No data fields>");
   else
     {
 
   if (!len && n_baseclasses == 1)
     fprintf_filtered (stream, "<No data fields>");
   else
     {

+      struct obstack tmp_obstack = dont_print_statmem_obstack;

       int fields_seen = 0;
 
       if (dont_print_statmem == 0)
       int fields_seen = 0;
 
       if (dont_print_statmem == 0)


@@ -765,20 +702,20 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
          /* If we're at top level, carve out a completely fresh
             chunk of the obstack and use that until this particular
             invocation returns.  */
          /* If we're at top level, carve out a completely fresh
             chunk of the obstack and use that until this particular
             invocation returns.  */

-         tmp_obstack = dont_print_statmem_obstack;

          obstack_finish (&dont_print_statmem_obstack);
        }
 
       for (i = n_baseclasses; i < len; i++)
        {
          /* If requested, skip printing of static fields.  */
          obstack_finish (&dont_print_statmem_obstack);
        }
 
       for (i = n_baseclasses; i < len; i++)
        {
          /* If requested, skip printing of static fields.  */

-         if (!pascal_static_field_print && TYPE_FIELD_STATIC (type, i))
+         if (!options->pascal_static_field_print
+             && field_is_static (&TYPE_FIELD (type, i)))

            continue;
          if (fields_seen)
            fprintf_filtered (stream, ", ");
          else if (n_baseclasses > 0)
            {
            continue;
          if (fields_seen)
            fprintf_filtered (stream, ", ");
          else if (n_baseclasses > 0)
            {

-             if (pretty)
+             if (options->pretty)

                {
                  fprintf_filtered (stream, "\n");
                  print_spaces_filtered (2 + 2 * recurse, stream);
                {
                  fprintf_filtered (stream, "\n");
                  print_spaces_filtered (2 + 2 * recurse, stream);


@@ -789,7 +726,7 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
            }
          fields_seen = 1;
 
            }
          fields_seen = 1;
 

-         if (pretty)
+         if (options->pretty)

            {
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 + 2 * recurse, stream);
            {
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 + 2 * recurse, stream);


@@ -798,13 +735,13 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
            {
              wrap_here (n_spaces (2 + 2 * recurse));
            }
            {
              wrap_here (n_spaces (2 + 2 * recurse));
            }

-         if (inspect_it)
+         if (options->inspect_it)

            {
              if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
                fputs_filtered ("\"( ptr \"", stream);
              else
                fputs_filtered ("\"( nodef \"", stream);
            {
              if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
                fputs_filtered ("\"( ptr \"", stream);
              else
                fputs_filtered ("\"( nodef \"", stream);

-             if (TYPE_FIELD_STATIC (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,
                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
                                       language_cplus,


@@ -819,7 +756,7 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
            {
              annotate_field_begin (TYPE_FIELD_TYPE (type, i));
 
            {
              annotate_field_begin (TYPE_FIELD_TYPE (type, i));
 

-             if (TYPE_FIELD_STATIC (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,
                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
                                       language_cplus,


@@ -829,7 +766,8 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
              annotate_field_value ();
            }
 
              annotate_field_value ();
            }
 

-         if (!TYPE_FIELD_STATIC (type, i) && TYPE_FIELD_PACKED (type, i))
+         if (!field_is_static (&TYPE_FIELD (type, i))
+             && TYPE_FIELD_PACKED (type, i))

            {
              struct value *v;
 
            {
              struct value *v;
 


@@ -839,13 +777,21 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
                {
                  fputs_filtered ("<optimized out or zero length>", stream);
                }
                {
                  fputs_filtered ("<optimized out or zero length>", stream);
                }

+             else if (!value_bits_valid (val, TYPE_FIELD_BITPOS (type, i),
+                                         TYPE_FIELD_BITSIZE (type, i)))
+               {
+                 fputs_filtered (_("<value optimized out>"), stream);
+               }

              else
                {
              else
                {

+                 struct value_print_options opts = *options;
+

                  v = value_from_longest (TYPE_FIELD_TYPE (type, i),
                                   unpack_field_as_long (type, valaddr, i));
 
                  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,
-                            stream, format, 0, recurse + 1, pretty);
+                 opts.deref_ref = 0;
+                 common_val_print (v, stream, recurse + 1, &opts,
+                                   current_language);

                }
            }
          else
                }
            }
          else


@@ -854,22 +800,25 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
                {
                  fputs_filtered ("<optimized out or zero length>", stream);
                }
                {
                  fputs_filtered ("<optimized out or zero length>", stream);
                }

-             else if (TYPE_FIELD_STATIC (type, i))
+             else if (field_is_static (&TYPE_FIELD (type, i)))

                {
                  /* struct value *v = value_static_field (type, i); v4.17 specific */
                  struct value *v;
                {
                  /* struct value *v = value_static_field (type, i); v4.17 specific */
                  struct value *v;

+

                  v = value_from_longest (TYPE_FIELD_TYPE (type, i),
                                   unpack_field_as_long (type, valaddr, i));
 
                  if (v == NULL)
                    fputs_filtered ("<optimized out>", stream);
                  else
                  v = value_from_longest (TYPE_FIELD_TYPE (type, i),
                                   unpack_field_as_long (type, valaddr, i));
 
                  if (v == NULL)
                    fputs_filtered ("<optimized out>", stream);
                  else

-                   pascal_object_print_static_field (TYPE_FIELD_TYPE (type, i), v,
-                                               stream, format, recurse + 1,
-                                                     pretty);
+                   pascal_object_print_static_field (v, stream, recurse + 1,
+                                                     options);

                }
              else
                {
                }
              else
                {

+                 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,
                  /* val_print (TYPE_FIELD_TYPE (type, i),
                     valaddr + TYPE_FIELD_BITPOS (type, i) / 8,
                     address + TYPE_FIELD_BITPOS (type, i) / 8, 0,


@@ -877,7 +826,8 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
                  val_print (TYPE_FIELD_TYPE (type, i),
                             valaddr, TYPE_FIELD_BITPOS (type, i) / 8,
                             address + TYPE_FIELD_BITPOS (type, i) / 8,
                  val_print (TYPE_FIELD_TYPE (type, i),
                             valaddr, TYPE_FIELD_BITPOS (type, i) / 8,
                             address + TYPE_FIELD_BITPOS (type, i) / 8,

-                            stream, format, 0, recurse + 1, pretty);
+                            stream, recurse + 1, val, &opts,
+                            current_language);

                }
            }
          annotate_field_end ();
                }
            }
          annotate_field_end ();


@@ -891,7 +841,7 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
          dont_print_statmem_obstack = tmp_obstack;
        }
 
          dont_print_statmem_obstack = tmp_obstack;
        }
 

-      if (pretty)
+      if (options->pretty)

        {
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);
        {
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);


@@ -903,15 +853,17 @@ pascal_object_print_value_fields (struct type *type, char *valaddr,
 /* Special val_print routine to avoid printing multiple copies of virtual
    baseclasses.  */
 
 /* Special val_print routine to avoid printing multiple copies of virtual
    baseclasses.  */
 

-void
-pascal_object_print_value (struct type *type, char *valaddr, CORE_ADDR address,
-                          struct ui_file *stream, int format, int recurse,
-                          enum val_prettyprint pretty,
+static void
+pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
+                          CORE_ADDR address, struct ui_file *stream,
+                          int recurse,
+                          const struct value *val,
+                          const struct value_print_options *options,

                           struct type **dont_print_vb)
 {
                           struct type **dont_print_vb)
 {

-  struct obstack tmp_obstack;

   struct type **last_dont_print
   struct type **last_dont_print

-  = (struct type **) obstack_next_free (&dont_print_vb_obstack);
+    = (struct type **) obstack_next_free (&dont_print_vb_obstack);
+  struct obstack tmp_obstack = dont_print_vb_obstack;

   int i, n_baseclasses = TYPE_N_BASECLASSES (type);
 
   if (dont_print_vb == 0)
   int i, n_baseclasses = TYPE_N_BASECLASSES (type);
 
   if (dont_print_vb == 0)


@@ -919,7 +871,6 @@ pascal_object_print_value (struct type *type, char *valaddr, CORE_ADDR address,
       /* If we're at top level, carve out a completely fresh
          chunk of the obstack and use that until this particular
          invocation returns.  */
       /* If we're at top level, carve out a completely fresh
          chunk of the obstack and use that until this particular
          invocation returns.  */

-      tmp_obstack = dont_print_vb_obstack;

       /* Bump up the high-water mark.  Now alpha is omega.  */
       obstack_finish (&dont_print_vb_obstack);
     }
       /* Bump up the high-water mark.  Now alpha is omega.  */
       obstack_finish (&dont_print_vb_obstack);
     }


@@ -928,16 +879,16 @@ pascal_object_print_value (struct type *type, char *valaddr, CORE_ADDR address,
     {
       int boffset;
       struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
     {
       int boffset;
       struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));

-      char *basename = TYPE_NAME (baseclass);
-      char *base_valaddr;
+      char *basename = type_name_no_tag (baseclass);
+      const gdb_byte *base_valaddr;

 
       if (BASETYPE_VIA_VIRTUAL (type, i))
        {
          struct type **first_dont_print
 
       if (BASETYPE_VIA_VIRTUAL (type, i))
        {
          struct type **first_dont_print

-         = (struct type **) obstack_base (&dont_print_vb_obstack);
+           = (struct type **) obstack_base (&dont_print_vb_obstack);

 
          int j = (struct type **) obstack_next_free (&dont_print_vb_obstack)
 
          int j = (struct type **) obstack_next_free (&dont_print_vb_obstack)

-         - first_dont_print;
+           - first_dont_print;

 
          while (--j >= 0)
            if (baseclass == first_dont_print[j])
 
          while (--j >= 0)
            if (baseclass == first_dont_print[j])


@@ -948,7 +899,7 @@ pascal_object_print_value (struct type *type, char *valaddr, CORE_ADDR address,
 
       boffset = baseclass_offset (type, i, valaddr, address);
 
 
       boffset = baseclass_offset (type, i, valaddr, address);
 

-      if (pretty)
+      if (options->pretty)

        {
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);
        {
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);


@@ -967,8 +918,10 @@ 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. */
       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,
+         gdb_byte *buf = alloca (TYPE_LENGTH (baseclass));
+
+         base_valaddr = buf;
+         if (target_read_memory (address + boffset, buf,

                                  TYPE_LENGTH (baseclass)) != 0)
            boffset = -1;
        }
                                  TYPE_LENGTH (baseclass)) != 0)
            boffset = -1;
        }


@@ -979,7 +932,7 @@ pascal_object_print_value (struct type *type, char *valaddr, CORE_ADDR address,
        fprintf_filtered (stream, "<invalid address>");
       else
        pascal_object_print_value_fields (baseclass, base_valaddr, address + boffset,
        fprintf_filtered (stream, "<invalid address>");
       else
        pascal_object_print_value_fields (baseclass, base_valaddr, address + boffset,

-                                         stream, format, recurse, pretty,
+                                         stream, recurse, val, options,

                     (struct type **) obstack_base (&dont_print_vb_obstack),
                                          0);
       fputs_filtered (", ", stream);
                     (struct type **) obstack_base (&dont_print_vb_obstack),
                                          0);
       fputs_filtered (", ", stream);


@@ -1005,17 +958,21 @@ pascal_object_print_value (struct type *type, char *valaddr, CORE_ADDR address,
    static member classes in an obstack and refuse to print them more
    than once.
 
    static member classes in an obstack and refuse to print them more
    than once.
 

-   VAL contains the value to print, TYPE, STREAM, RECURSE, and PRETTY
+   VAL contains the value to print, STREAM, RECURSE, and OPTIONS

    have the same meanings as in c_val_print.  */
 
 static void
    have the same meanings as in c_val_print.  */
 
 static void

-pascal_object_print_static_field (struct type *type, struct value *val,
-                                 struct ui_file *stream, int format,
-                                 int recurse, enum val_prettyprint pretty)
+pascal_object_print_static_field (struct value *val,
+                                 struct ui_file *stream,
+                                 int recurse,
+                                 const struct value_print_options *options)

 {
 {

+  struct type *type = value_type (val);
+  struct value_print_options opts;
+

   if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
     {
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
     {

-      CORE_ADDR *first_dont_print;
+      CORE_ADDR *first_dont_print, addr;

       int i;
 
       first_dont_print
       int i;
 
       first_dont_print


@@ -1025,7 +982,7 @@ pascal_object_print_static_field (struct type *type, struct value *val,
 
       while (--i >= 0)
        {
 
       while (--i >= 0)
        {

-         if (VALUE_ADDRESS (val) == first_dont_print[i])
+         if (value_address (val) == first_dont_print[i])

            {
              fputs_filtered ("<same as static member of an already seen type>",
                              stream);
            {
              fputs_filtered ("<same as static member of an already seen type>",
                              stream);


@@ -1033,68 +990,20 @@ pascal_object_print_static_field (struct type *type, struct value *val,
            }
        }
 
            }
        }
 

-      obstack_grow (&dont_print_statmem_obstack, (char *) &VALUE_ADDRESS (val),
+      addr = value_address (val);
+      obstack_grow (&dont_print_statmem_obstack, (char *) &addr,

                    sizeof (CORE_ADDR));
 
       CHECK_TYPEDEF (type);
                    sizeof (CORE_ADDR));
 
       CHECK_TYPEDEF (type);

-      pascal_object_print_value_fields (type, VALUE_CONTENTS (val), VALUE_ADDRESS (val),
-                                 stream, format, recurse, pretty, NULL, 1);
+      pascal_object_print_value_fields (type, value_contents (val), addr,
+                                       stream, recurse, NULL, options,
+                                       NULL, 1);

       return;
     }
       return;
     }

-  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,
-                                 struct ui_file *stream, char *prefix)
-{

 
 

-  /* VAL is a byte offset into the structure type DOMAIN.
-     Find the name of the field for that offset and
-     print it.  */
-  int extra = 0;
-  int bits = 0;
-  unsigned int i;
-  unsigned len = TYPE_NFIELDS (domain);
-  /* @@ Make VAL into bit offset */
-  LONGEST val = unpack_long (builtin_type_int, valaddr) << 3;
-  for (i = TYPE_N_BASECLASSES (domain); i < len; i++)
-    {
-      int bitpos = TYPE_FIELD_BITPOS (domain, i);
-      QUIT;
-      if (val == bitpos)
-       break;
-      if (val < bitpos && i != 0)
-       {
-         /* Somehow pointing into a field.  */
-         i -= 1;
-         extra = (val - TYPE_FIELD_BITPOS (domain, i));
-         if (extra & 0x7)
-           bits = 1;
-         else
-           extra >>= 3;
-         break;
-       }
-    }
-  if (i < len)
-    {
-      char *name;
-      fputs_filtered (prefix, stream);
-      name = type_name_no_tag (domain);
-      if (name)
-       fputs_filtered (name, stream);
-      else
-       pascal_type_print_base (domain, stream, 0, 0);
-      fprintf_filtered (stream, "::");
-      fputs_filtered (TYPE_FIELD_NAME (domain, i), stream);
-      if (extra)
-       fprintf_filtered (stream, " + %d bytes", extra);
-      if (bits)
-       fprintf_filtered (stream, " (offset in bits)");
-    }
-  else
-    fprintf_filtered (stream, "%ld", (long int) (val >> 3));
+  opts = *options;
+  opts.deref_ref = 0;
+  common_val_print (val, stream, recurse, &opts, current_language);

 }
 
 extern initialize_file_ftype _initialize_pascal_valprint; /* -Wmissing-prototypes */
 }
 
 extern initialize_file_ftype _initialize_pascal_valprint; /* -Wmissing-prototypes */


@@ -1102,13 +1011,11 @@ extern initialize_file_ftype _initialize_pascal_valprint; /* -Wmissing-prototype
 void
 _initialize_pascal_valprint (void)
 {
 void
 _initialize_pascal_valprint (void)
 {

-  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.",
-                 &setprintlist),
-     &showprintlist);
-  /* Turn on printing of static fields.  */
-  pascal_static_field_print = 1;
-
+  add_setshow_boolean_cmd ("pascal_static-members", class_support,
+                          &user_print_options.pascal_static_field_print, _("\
+Set printing of pascal static members."), _("\
+Show printing of pascal static members."), NULL,
+                          NULL,
+                          show_pascal_static_field_print,
+                          &setprintlist, &showprintlist);

 }
 }