projects / deliverable / binutils-gdb.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2009-02-10 Pierre Muller <muller@ics.u-strasbg.fr>
[deliverable/binutils-gdb.git] / gdb / p-valprint.c
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index 9eef4f7d9a0cfc0eee22fa226e82d2413f96e536..27ae619a14b964b0a5abdca7782a8f34a154e94f 100644 (file)
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -1,13 +1,13 @@
 /* Support for printing Pascal values for GDB, the GNU debugger.
 
 /* Support for printing Pascal values for GDB, the GNU debugger.
 
-   Copyright (C) 2000, 2001, 2003, 2005, 2006
+   Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009
    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,
@@ -16,9 +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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, 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 */
 
@@ -46,23 +44,17 @@
 
 /* Print data of type TYPE located at VALADDR (within GDB), which came from
    the inferior at address ADDRESS, onto stdio stream STREAM according to
 
 /* 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
 pascal_val_print (struct type *type, const gdb_byte *valaddr,
                  int embedded_offset, CORE_ADDR address,
 
 
 int
 pascal_val_print (struct type *type, const gdb_byte *valaddr,
                  int embedded_offset, CORE_ADDR address,
-                 struct ui_file *stream, int format, int deref_ref,
-                 int recurse, enum val_prettyprint pretty)
+                 struct ui_file *stream, int recurse,
+                 const struct value_print_options *options)
 {
   unsigned int i = 0;  /* Number of characters printed */
   unsigned len;
 {
   unsigned int i = 0;  /* Number of characters printed */
   unsigned len;
@@ -82,32 +74,34 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
          elttype = check_typedef (TYPE_TARGET_TYPE (type));
          eltlen = TYPE_LENGTH (elttype);
          len = TYPE_LENGTH (type) / eltlen;
          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);
            }
          /* For an array of chars, print with string syntax.  */
            {
              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)
+         if ((eltlen == 1 || eltlen == 2 || eltlen == 4)
+             && ((TYPE_CODE (elttype) == TYPE_CODE_INT)
+              || ((current_language->la_language == language_pascal)
                   && (TYPE_CODE (elttype) == TYPE_CODE_CHAR)))
                   && (TYPE_CODE (elttype) == TYPE_CODE_CHAR)))
-             && (format == 0 || format == 's'))
+             && (options->format == 0 || options->format == 's'))
            {
              /* 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)
+                      && 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, valaddr + embedded_offset, len, 
+                              eltlen, 0, options);
              i = len;
            }
          else
              i = len;
            }
          else
@@ -125,7 +119,7 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
                  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, options, i);
              fprintf_filtered (stream, "}");
            }
          break;
              fprintf_filtered (stream, "}");
            }
          break;
@@ -135,12 +129,13 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
       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
        {
          /* Print the unmangled name if desired.  */
          /* Print vtable entry - we only get here if we ARE using
@@ -151,17 +146,6 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
          break;
        }
       elttype = check_typedef (TYPE_TARGET_TYPE (type));
          break;
        }
       elttype = check_typedef (TYPE_TARGET_TYPE (type));
-      if (TYPE_CODE (elttype) == TYPE_CODE_METHOD)
-       {
-         pascal_object_print_class_method (valaddr + embedded_offset, type, stream);
-       }
-      else if (TYPE_CODE (elttype) == TYPE_CODE_MEMBER)
-       {
-         pascal_object_print_class_member (valaddr + embedded_offset,
-                                TYPE_DOMAIN_TYPE (TYPE_TARGET_TYPE (type)),
-                                           stream, "&");
-       }
-      else
        {
          addr = unpack_pointer (type, valaddr + embedded_offset);
        print_unpacked_pointer:
        {
          addr = unpack_pointer (type, valaddr + embedded_offset);
        print_unpacked_pointer:
@@ -175,20 +159,24 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
              return (0);
            }
 
              return (0);
            }
 
-         if (addressprint && format != 's')
+         if (options->addressprint && options->format != 's')
            {
            {
-             deprecated_print_address_numeric (addr, 1, stream);
+             fputs_filtered (paddress (addr), stream);
            }
 
          /* For a pointer to char or unsigned char, also print the string
             pointed to, unless pointer is null.  */
            }
 
          /* 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')
+         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 */
              && addr != 0)
            {
              /* no wide string yet */
-             i = val_print_string (addr, -1, 1, stream);
+             i = val_print_string (addr, -1, TYPE_LENGTH (elttype), stream, 
+                   options);
            }
          /* also for pointers to pascal strings */
          /* Note: this is Free Pascal specific:
            }
          /* also for pointers to pascal strings */
          /* Note: this is Free Pascal specific:
@@ -205,7 +193,7 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
               read_memory (addr + length_pos, buffer, length_size);
              string_length = extract_unsigned_integer (buffer, length_size);
               xfree (buffer);
               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);
+              i = val_print_string (addr + string_pos, string_length, char_size, stream, options);
            }
          else if (pascal_object_is_vtbl_member (type))
            {
            }
          else if (pascal_object_is_vtbl_member (type))
            {
@@ -221,7 +209,7 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
                  fputs_filtered (SYMBOL_PRINT_NAME (msymbol), stream);
                  fputs_filtered (">", stream);
                }
                  fputs_filtered (SYMBOL_PRINT_NAME (msymbol), stream);
                  fputs_filtered (">", stream);
                }
-             if (vt_address && vtblprint)
+             if (vt_address && options->vtblprint)
                {
                  struct value *vt_val;
                  struct symbol *wsym = (struct symbol *) NULL;
                {
                  struct value *vt_val;
                  struct symbol *wsym = (struct symbol *) NULL;
@@ -230,8 +218,8 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
                  int is_this_fld;
 
                  if (msymbol != NULL)
                  int is_this_fld;
 
                  if (msymbol != NULL)
-                   wsym = lookup_symbol (DEPRECATED_SYMBOL_NAME (msymbol), block,
-                                         VAR_DOMAIN, &is_this_fld, NULL);
+                   wsym = lookup_symbol (SYMBOL_LINKAGE_NAME (msymbol), block,
+                                         VAR_DOMAIN, &is_this_fld);
 
                  if (wsym)
                    {
 
                  if (wsym)
                    {
@@ -242,9 +230,9 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
                      wtype = TYPE_TARGET_TYPE (type);
                    }
                  vt_val = value_at (wtype, vt_address);
                      wtype = TYPE_TARGET_TYPE (type);
                    }
                  vt_val = value_at (wtype, vt_address);
-                 common_val_print (vt_val, stream, format, deref_ref,
-                                   recurse + 1, pretty);
-                 if (pretty)
+                 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);
                    {
                      fprintf_filtered (stream, "\n");
                      print_spaces_filtered (2 + 2 * recurse, stream);
@@ -259,42 +247,29 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
        }
       break;
 
        }
       break;
 
-    case TYPE_CODE_MEMBER:
-      error (_("not implemented: member type in pascal_val_print"));
-      break;
-
     case TYPE_CODE_REF:
       elttype = check_typedef (TYPE_TARGET_TYPE (type));
     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)
        {
          fprintf_filtered (stream, "@");
          /* Extract the address, assume that it is unsigned.  */
        {
          fprintf_filtered (stream, "@");
          /* Extract the address, assume that it is unsigned.  */
-         deprecated_print_address_numeric
-           (extract_unsigned_integer (valaddr + embedded_offset,
-                                      TARGET_PTR_BIT / HOST_CHAR_BIT),
-            1, stream);
-         if (deref_ref)
+         fputs_filtered (paddress (
+           extract_unsigned_integer (valaddr + embedded_offset,
+              gdbarch_ptr_bit (current_gdbarch) / HOST_CHAR_BIT)), 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 =
              value_at
              (TYPE_TARGET_TYPE (type),
        {
          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));
-             common_val_print (deref_val, stream, format, deref_ref,
-                               recurse + 1, pretty);
+              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,14 +277,14 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
       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
        {
          /* Print the unmangled name if desired.  */
          /* Print vtable entry - we only get here if NOT using
@@ -326,18 +301,19 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
                                      &string_pos, &char_size, NULL))
            {
              len = extract_unsigned_integer (valaddr + embedded_offset + length_pos, length_size);
                                      &string_pos, &char_size, 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);
+             LA_PRINT_STRING (stream, valaddr + embedded_offset + string_pos, len, char_size, 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, 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);
@@ -361,16 +337,18 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
       break;
 
     case TYPE_CODE_FLAGS:
       break;
 
     case TYPE_CODE_FLAGS:
-      if (format)
-         print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
+      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:
       else
        val_print_type_code_flags (type, valaddr + embedded_offset, stream);
       break;
 
     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
@@ -383,9 +361,14 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
       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);
@@ -412,10 +395,13 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
       /* 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
        {
@@ -424,10 +410,13 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
       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
        {
@@ -442,9 +431,10 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
       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
        {
@@ -542,8 +532,8 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
 }
 \f
 int
 }
 \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);
 
@@ -553,14 +543,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 */
@@ -572,18 +562,10 @@ pascal_value_print (struct value *val, struct ui_file *stream, int format,
          fprintf_filtered (stream, ") ");
        }
     }
          fprintf_filtered (stream, ") ");
        }
     }
-  return common_val_print (val, stream, format, 1, 0, pretty);
+  return common_val_print (val, stream, 0, options, 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 void
 show_pascal_static_field_print (struct ui_file *file, int from_tty,
                                struct cmd_list_element *c, const char *value)
 static void
 show_pascal_static_field_print (struct ui_file *file, int from_tty,
                                struct cmd_list_element *c, const char *value)
@@ -596,104 +578,14 @@ static struct obstack dont_print_vb_obstack;
 static struct obstack dont_print_statmem_obstack;
 
 static void pascal_object_print_static_field (struct value *,
 static struct obstack dont_print_statmem_obstack;
 
 static void pascal_object_print_static_field (struct value *,
-                                             struct ui_file *, int, int,
-                                             enum val_prettyprint);
+                                             struct ui_file *, int,
+                                             const struct value_print_options *);
 
 static void pascal_object_print_value (struct type *, const gdb_byte *,
 
 static void pascal_object_print_value (struct type *, const gdb_byte *,
-                                      CORE_ADDR, struct ui_file *,
-                                      int, int, enum val_prettyprint,
+                                      CORE_ADDR, struct ui_file *, int,
+                                      const struct value_print_options *,
                                       struct type **);
 
                                       struct type **);
 
-void
-pascal_object_print_class_method (const gdb_byte *valaddr, struct type *type,
-                                 struct ui_file *stream)
-{
-  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));
-
-  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);
-
-         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);
-
-         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);
-    }
-}
-
 /* It was changed to this after 2.4.5.  */
 const char pascal_vtbl_ptr_name[] =
 {'_', '_', 'v', 't', 'b', 'l', '_', 'p', 't', 'r', '_', 't', 'y', 'p', 'e', 0};
 /* It was changed to this after 2.4.5.  */
 const char pascal_vtbl_ptr_name[] =
 {'_', '_', 'v', 't', 'b', 'l', '_', 'p', 't', 'r', '_', 't', 'y', 'p', 'e', 0};
@@ -738,7 +630,7 @@ pascal_object_is_vtbl_member (struct type *type)
    c_val_print to print out a structure's fields:
    pascal_object_print_value_fields and pascal_object_print_value.
 
    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
    same meanings as in pascal_object_print_value and c_val_print.
 
    DONT_PRINT is an array of baseclass types that we
@@ -747,13 +639,12 @@ pascal_object_is_vtbl_member (struct type *type)
 void
 pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
                                  CORE_ADDR address, struct ui_file *stream,
 void
 pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
                                  CORE_ADDR address, struct ui_file *stream,
-                                 int format, int recurse,
-                                 enum val_prettyprint pretty,
+                                 int recurse,
+                                 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);
@@ -766,12 +657,13 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *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, 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)
@@ -779,20 +671,20 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *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);
@@ -803,7 +695,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *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);
@@ -812,13 +704,13 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *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,
@@ -833,7 +725,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *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,
@@ -843,7 +735,8 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *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;
 
@@ -855,10 +748,13 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
                }
              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));
 
-                 common_val_print (v, stream, format, 0, recurse + 1, pretty);
+                 opts.deref_ref = 0;
+                 common_val_print (v, stream, recurse + 1, &opts,
+                                   current_language);
                }
            }
          else
                }
            }
          else
@@ -867,7 +763,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *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;
@@ -877,11 +773,13 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
                  if (v == NULL)
                    fputs_filtered ("<optimized out>", stream);
                  else
                  if (v == NULL)
                    fputs_filtered ("<optimized out>", stream);
                  else
-                   pascal_object_print_static_field (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,
@@ -889,7 +787,8 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *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, &opts,
+                            current_language);
                }
            }
          annotate_field_end ();
                }
            }
          annotate_field_end ();
@@ -903,7 +802,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *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);
@@ -915,16 +814,16 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *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
+static void
 pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
                           CORE_ADDR address, struct ui_file *stream,
 pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
                           CORE_ADDR address, struct ui_file *stream,
-                          int format, int recurse,
-                          enum val_prettyprint pretty,
+                          int recurse,
+                          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 **) obstack_next_free (&dont_print_vb_obstack);
   struct type **last_dont_print
   = (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)
@@ -932,7 +831,6 @@ pascal_object_print_value (struct type *type, const gdb_byte *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_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);
     }
@@ -941,7 +839,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
     {
       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 *basename = type_name_no_tag (baseclass);
       const gdb_byte *base_valaddr;
 
       if (BASETYPE_VIA_VIRTUAL (type, i))
       const gdb_byte *base_valaddr;
 
       if (BASETYPE_VIA_VIRTUAL (type, i))
@@ -961,7 +859,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
 
       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);
@@ -993,7 +891,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
        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, 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);
@@ -1019,15 +917,17 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
    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, 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
 pascal_object_print_static_field (struct value *val,
    have the same meanings as in c_val_print.  */
 
 static void
 pascal_object_print_static_field (struct value *val,
-                                 struct ui_file *stream, int format,
-                                 int recurse, enum val_prettyprint pretty)
+                                 struct ui_file *stream,
+                                 int recurse,
+                                 const struct value_print_options *options)
 {
   struct type *type = value_type (val);
 {
   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)
     {
@@ -1054,62 +954,13 @@ pascal_object_print_static_field (struct value *val,
 
       CHECK_TYPEDEF (type);
       pascal_object_print_value_fields (type, value_contents (val), VALUE_ADDRESS (val),
 
       CHECK_TYPEDEF (type);
       pascal_object_print_value_fields (type, value_contents (val), VALUE_ADDRESS (val),
-                                 stream, format, recurse, pretty, NULL, 1);
+                                       stream, recurse, options, NULL, 1);
       return;
     }
       return;
     }
-  common_val_print (val, stream, format, 0, recurse, pretty);
-}
 
 
-void
-pascal_object_print_class_member (const gdb_byte *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 */
@@ -1118,13 +969,10 @@ void
 _initialize_pascal_valprint (void)
 {
   add_setshow_boolean_cmd ("pascal_static-members", class_support,
 _initialize_pascal_valprint (void)
 {
   add_setshow_boolean_cmd ("pascal_static-members", class_support,
-                          &pascal_static_field_print, _("\
+                          &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);
 Set printing of pascal static members."), _("\
 Show printing of pascal static members."), NULL,
                           NULL,
                           show_pascal_static_field_print,
                           &setprintlist, &showprintlist);
-  /* Turn on printing of static fields.  */
-  pascal_static_field_print = 1;
-
 }
 }
GDB Binutils - Deliverables
This page took 0.059117 seconds and 4 git commands to generate.