Change regcache list to be an hash map
[deliverable/binutils-gdb.git] / gdb / c-valprint.c
index cfdf2c05cc19bb2f95ad918bb0eda2790c034690..607fb80c58f36214026c165eff11c03497cd914d 100644 (file)
@@ -1,8 +1,6 @@
 /* Support for printing C values for GDB, the GNU debugger.
 
-   Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-   1998, 1999, 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1986-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
 #include "c-lang.h"
 #include "cp-abi.h"
 #include "target.h"
+#include "objfiles.h"
 \f
 
-/* Print function pointer with inferior address ADDRESS onto stdio
-   stream STREAM.  */
-
-static void
-print_function_pointer_address (CORE_ADDR address, struct ui_file *stream,
-                               int addressprint)
-{
-  CORE_ADDR func_addr = gdbarch_convert_from_func_ptr_addr (current_gdbarch,
-                                                           address,
-                                                           &current_target);
-
-  /* If the function pointer is represented by a description, print the
-     address of the description.  */
-  if (addressprint && func_addr != address)
-    {
-      fputs_filtered ("@", stream);
-      fputs_filtered (paddress (address), stream);
-      fputs_filtered (": ", stream);
-    }
-  print_address_demangle (func_addr, stream, demangle);
-}
-
-
-/* A helper for textual_element_type.  This checks the name of the
+/* A helper for c_textual_element_type.  This checks the name of the
    typedef.  This is bogus but it isn't apparent that the compiler
    provides us the help we may need.  */
 
@@ -70,39 +45,58 @@ textual_name (const char *name)
 /* Apply a heuristic to decide whether an array of TYPE or a pointer
    to TYPE should be printed as a textual string.  Return non-zero if
    it should, or zero if it should be treated as an array of integers
-   or pointer to integers.  FORMAT is the current format letter,
-   or 0 if none.
+   or pointer to integers.  FORMAT is the current format letter, or 0
+   if none.
 
    We guess that "char" is a character.  Explicitly signed and
    unsigned character types are also characters.  Integer data from
    vector types is not.  The user can override this by using the /s
    format letter.  */
 
-static int
-textual_element_type (struct type *type, char format)
+int
+c_textual_element_type (struct type *type, char format)
 {
-  struct type *true_type = check_typedef (type);
+  struct type *true_type, *iter_type;
 
   if (format != 0 && format != 's')
     return 0;
 
+  /* We also rely on this for its side effect of setting up all the
+     typedef pointers.  */
+  true_type = check_typedef (type);
+
   /* TYPE_CODE_CHAR is always textual.  */
   if (TYPE_CODE (true_type) == TYPE_CODE_CHAR)
     return 1;
+
   /* Any other character-like types must be integral.  */
   if (TYPE_CODE (true_type) != TYPE_CODE_INT)
     return 0;
 
-  /* Check the names of the type and the typedef.  */
-  if (TYPE_NAME (type) && textual_name (TYPE_NAME (type)))
-    return 1;
-  if (TYPE_NAME (true_type) && textual_name (TYPE_NAME (true_type)))
-    return 1;
+  /* We peel typedefs one by one, looking for a match.  */
+  iter_type = type;
+  while (iter_type)
+    {
+      /* Check the name of the type.  */
+      if (TYPE_NAME (iter_type) && textual_name (TYPE_NAME (iter_type)))
+       return 1;
+
+      if (TYPE_CODE (iter_type) != TYPE_CODE_TYPEDEF)
+       break;
+
+      /* Peel a single typedef.  If the typedef doesn't have a target
+        type, we use check_typedef and hope the result is ok -- it
+        might be for C++, where wchar_t is a built-in type.  */
+      if (TYPE_TARGET_TYPE (iter_type))
+       iter_type = TYPE_TARGET_TYPE (iter_type);
+      else
+       iter_type = check_typedef (iter_type);
+    }
 
   if (format == 's')
     {
-      /* Print this as a string if we can manage it.  For now, no
-        wide character support.  */
+      /* Print this as a string if we can manage it.  For now, no wide
+        character support.  */
       if (TYPE_CODE (true_type) == TYPE_CODE_INT
          && TYPE_LENGTH (true_type) == 1)
        return 1;
@@ -121,454 +115,461 @@ textual_element_type (struct type *type, char format)
   return 0;
 }
 
+/* Decorations for C.  */
 
-/* Print data of type TYPE located at VALADDR (within GDB), which came from
-   the inferior at address ADDRESS, onto stdio stream STREAM according to
-   OPTIONS.  The data at VALADDR is in target byte order.
-
-   If the data are a string pointer, returns the number of string characters
-   printed.  */
+static const struct generic_val_print_decorations c_decorations =
+{
+  "",
+  " + ",
+  " * I",
+  "true",
+  "false",
+  "void",
+  "{",
+  "}"
+};
+
+/* Print a pointer based on the type of its target.
+
+   Arguments to this functions are roughly the same as those in c_val_print.
+   A difference is that ADDRESS is the address to print, with embedded_offset
+   already added.  UNRESOLVED_ELTTYPE and ELTTYPE represent the pointed type,
+   respectively before and after check_typedef.  */
 
-int
-c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
-            CORE_ADDR address, struct ui_file *stream, int recurse,
-            const struct value_print_options *options)
+static void
+print_unpacked_pointer (struct type *type, struct type *elttype,
+                       struct type *unresolved_elttype,
+                       const gdb_byte *valaddr, int embedded_offset,
+                       CORE_ADDR address, struct ui_file *stream, int recurse,
+                       const struct value_print_options *options)
 {
-  unsigned int i = 0;  /* Number of characters printed */
-  unsigned len;
-  struct type *elttype, *unresolved_elttype;
-  struct type *unresolved_type = type;
-  unsigned eltlen;
-  LONGEST val;
-  CORE_ADDR addr;
+  int want_space = 0;
+  struct gdbarch *gdbarch = get_type_arch (type);
 
-  CHECK_TYPEDEF (type);
-  switch (TYPE_CODE (type))
+  if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
     {
-    case TYPE_CODE_ARRAY:
-      unresolved_elttype = TYPE_TARGET_TYPE (type);
-      elttype = check_typedef (unresolved_elttype);
-      if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (unresolved_elttype) > 0)
+      /* Try to print what function it points to.  */
+      print_function_pointer_address (options, gdbarch, address, stream);
+      return;
+    }
+
+  if (options->symbol_print)
+    want_space = print_address_demangle (options, gdbarch, address, stream,
+                                        demangle);
+  else if (options->addressprint)
+    {
+      fputs_filtered (paddress (gdbarch, address), stream);
+      want_space = 1;
+    }
+
+  /* For a pointer to a textual type, also print the string
+     pointed to, unless pointer is null.  */
+
+  if (c_textual_element_type (unresolved_elttype, options->format)
+      && address != 0)
+    {
+      if (want_space)
+       fputs_filtered (" ", stream);
+      val_print_string (unresolved_elttype, NULL, address, -1, stream, options);
+    }
+  else if (cp_is_vtbl_member (type))
+    {
+      /* Print vtbl's nicely.  */
+      CORE_ADDR vt_address = unpack_pointer (type, valaddr + embedded_offset);
+      struct bound_minimal_symbol msymbol =
+       lookup_minimal_symbol_by_pc (vt_address);
+
+      /* If 'symbol_print' is set, we did the work above.  */
+      if (!options->symbol_print
+         && (msymbol.minsym != NULL)
+         && (vt_address == BMSYMBOL_VALUE_ADDRESS (msymbol)))
+       {
+         if (want_space)
+           fputs_filtered (" ", stream);
+         fputs_filtered (" <", stream);
+         fputs_filtered (msymbol.minsym->print_name (), stream);
+         fputs_filtered (">", stream);
+         want_space = 1;
+       }
+
+      if (vt_address && options->vtblprint)
        {
-         eltlen = TYPE_LENGTH (elttype);
-         len = TYPE_LENGTH (type) / eltlen;
-         if (options->prettyprint_arrays)
+         struct value *vt_val;
+         struct symbol *wsym = NULL;
+         struct type *wtype;
+
+         if (want_space)
+           fputs_filtered (" ", stream);
+
+         if (msymbol.minsym != NULL)
            {
-             print_spaces_filtered (2 + 2 * recurse, stream);
+             const char *search_name = msymbol.minsym->search_name ();
+             wsym = lookup_symbol_search_name (search_name, NULL,
+                                               VAR_DOMAIN).symbol;
            }
 
-         /* Print arrays of textual chars with a string syntax.  */
-          if (textual_element_type (unresolved_elttype, options->format))
+         if (wsym)
            {
-             /* If requested, look for the first null char and only print
-                elements up to it.  */
-             if (options->stop_print_at_null)
-               {
-                 unsigned int temp_len;
-
-                 for (temp_len = 0;
-                      (temp_len < len
-                       && temp_len < options->print_max
-                       && extract_unsigned_integer (valaddr + embedded_offset
-                                                    + temp_len * eltlen,
-                                                    eltlen) == 0);
-                      ++temp_len)
-                   ;
-                 len = temp_len;
-               }
-
-             LA_PRINT_STRING (stream, unresolved_elttype,
-                              valaddr + embedded_offset, len, 0, options);
-             i = len;
+             wtype = SYMBOL_TYPE (wsym);
            }
          else
            {
-             fprintf_filtered (stream, "{");
-             /* If this is a virtual function table, print the 0th
-                entry specially, and the rest of the members normally.  */
-             if (cp_is_vtbl_ptr_type (elttype))
-               {
-                 i = 1;
-                 fprintf_filtered (stream, _("%d vtable entries"), len - 1);
-               }
-             else
-               {
-                 i = 0;
-               }
-             val_print_array_elements (type, valaddr + embedded_offset, address, stream,
-                                       recurse, options, i);
-             fprintf_filtered (stream, "}");
+             wtype = unresolved_elttype;
+           }
+         vt_val = value_at (wtype, vt_address);
+         common_val_print (vt_val, stream, recurse + 1, options,
+                           current_language);
+         if (options->prettyformat)
+           {
+             fprintf_filtered (stream, "\n");
+             print_spaces_filtered (2 + 2 * recurse, stream);
            }
-         break;
        }
-      /* Array of unspecified length: treat like pointer to first elt.  */
-      addr = address;
-      goto print_unpacked_pointer;
+    }
+}
 
-    case TYPE_CODE_MEMBERPTR:
-      if (options->format)
-       {
-         print_scalar_formatted (valaddr + embedded_offset, type,
-                                 options, 0, stream);
-         break;
-       }
-      cp_print_class_member (valaddr + embedded_offset, type, stream, "&");
-      break;
+/* c_val_print helper for TYPE_CODE_ARRAY.  */
 
-    case TYPE_CODE_METHODPTR:
-      cplus_print_method_ptr (valaddr + embedded_offset, type, stream);
-      break;
+static void
+c_val_print_array (struct type *type, const gdb_byte *valaddr,
+                  int embedded_offset, CORE_ADDR address,
+                  struct ui_file *stream, int recurse,
+                  struct value *original_value,
+                  const struct value_print_options *options)
+{
+  struct type *unresolved_elttype = TYPE_TARGET_TYPE (type);
+  struct type *elttype = check_typedef (unresolved_elttype);
+  struct gdbarch *arch = get_type_arch (type);
+  int unit_size = gdbarch_addressable_memory_unit_size (arch);
 
-    case TYPE_CODE_PTR:
-      if (options->format && options->format != 's')
-       {
-         print_scalar_formatted (valaddr + embedded_offset, type,
-                                 options, 0, stream);
-         break;
-       }
-      if (options->vtblprint && cp_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.) */
-         CORE_ADDR addr
-           = extract_typed_address (valaddr + embedded_offset, type);
-         print_function_pointer_address (addr, stream, options->addressprint);
-         break;
-       }
-      unresolved_elttype = TYPE_TARGET_TYPE (type);
-      elttype = check_typedef (unresolved_elttype);
-       {
-         addr = unpack_pointer (type, valaddr + embedded_offset);
-       print_unpacked_pointer:
+  if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (unresolved_elttype) > 0)
+    {
+      LONGEST low_bound, high_bound;
+      int eltlen, len;
+      enum bfd_endian byte_order = type_byte_order (type);
+      unsigned int i = 0;      /* Number of characters printed.  */
 
-         if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
-           {
-             /* Try to print what function it points to.  */
-             print_function_pointer_address (addr, stream,
-                                             options->addressprint);
-             /* Return value is irrelevant except for string pointers.  */
-             return (0);
-           }
+      if (!get_array_bounds (type, &low_bound, &high_bound))
+       error (_("Could not determine the array high bound"));
 
-         if (options->addressprint)
-           fputs_filtered (paddress (addr), stream);
+      eltlen = TYPE_LENGTH (elttype);
+      len = high_bound - low_bound + 1;
+      if (options->prettyformat_arrays)
+       {
+         print_spaces_filtered (2 + 2 * recurse, stream);
+       }
 
-         /* For a pointer to a textual type, also print the string
-            pointed to, unless pointer is null.  */
+      /* Print arrays of textual chars with a string syntax, as
+        long as the entire array is valid.  */
+      if (c_textual_element_type (unresolved_elttype,
+                                 options->format)
+         && value_bytes_available (original_value, embedded_offset,
+                                   TYPE_LENGTH (type))
+         && !value_bits_any_optimized_out (original_value,
+                                           TARGET_CHAR_BIT * embedded_offset,
+                                           TARGET_CHAR_BIT * TYPE_LENGTH (type)))
+       {
+         int force_ellipses = 0;
 
-         if (textual_element_type (unresolved_elttype, options->format)
-             && addr != 0)
-           {
-             i = val_print_string (unresolved_elttype, addr, -1, stream,
-                                   options);
-           }
-         else if (cp_is_vtbl_member (type))
+         /* If requested, look for the first null char and only
+            print elements up to it.  */
+         if (options->stop_print_at_null)
            {
-             /* 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);
-             if ((msymbol != NULL) &&
-                 (vt_address == SYMBOL_VALUE_ADDRESS (msymbol)))
-               {
-                 fputs_filtered (" <", stream);
-                 fputs_filtered (SYMBOL_PRINT_NAME (msymbol), stream);
-                 fputs_filtered (">", stream);
-               }
-             if (vt_address && options->vtblprint)
+             unsigned int temp_len;
+
+             for (temp_len = 0;
+                  (temp_len < len
+                   && temp_len < options->print_max
+                   && extract_unsigned_integer (valaddr
+                                                + embedded_offset * unit_size
+                                                + temp_len * eltlen,
+                                                eltlen, byte_order) != 0);
+                  ++temp_len)
+               ;
+
+             /* Force LA_PRINT_STRING to print ellipses if
+                we've printed the maximum characters and
+                the next character is not \000.  */
+             if (temp_len == options->print_max && temp_len < len)
                {
-                 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);
-
-                 if (wsym)
-                   {
-                     wtype = SYMBOL_TYPE (wsym);
-                   }
-                 else
-                   {
-                     wtype = unresolved_elttype;
-                   }
-                 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);
-                   }
+                 ULONGEST val
+                   = extract_unsigned_integer (valaddr
+                                               + embedded_offset * unit_size
+                                               + temp_len * eltlen,
+                                               eltlen, byte_order);
+                 if (val != 0)
+                   force_ellipses = 1;
                }
-           }
 
-         /* 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;
+             len = temp_len;
+           }
 
-    case TYPE_CODE_REF:
-      elttype = check_typedef (TYPE_TARGET_TYPE (type));
-      if (options->addressprint)
-       {
-         CORE_ADDR addr
-           = extract_typed_address (valaddr + embedded_offset, type);
-         fprintf_filtered (stream, "@");
-         fputs_filtered (paddress (addr), stream);
-         if (options->deref_ref)
-           fputs_filtered (": ", stream);
+         LA_PRINT_STRING (stream, unresolved_elttype,
+                          valaddr + embedded_offset * unit_size, len,
+                          NULL, force_ellipses, options);
+         i = len;
        }
-      /* De-reference the reference.  */
-      if (options->deref_ref)
+      else
        {
-         if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
+         fprintf_filtered (stream, "{");
+         /* If this is a virtual function table, print the 0th
+            entry specially, and the rest of the members
+            normally.  */
+         if (cp_is_vtbl_ptr_type (elttype))
            {
-             struct value *deref_val =
-             value_at
-             (TYPE_TARGET_TYPE (type),
-              unpack_pointer (type, valaddr + embedded_offset));
-             common_val_print (deref_val, stream, recurse, options,
-                               current_language);
+             i = 1;
+             fprintf_filtered (stream, _("%d vtable entries"),
+                               len - 1);
            }
          else
-           fputs_filtered ("???", stream);
-       }
-      break;
-
-    case TYPE_CODE_UNION:
-      if (recurse && !options->unionprint)
-       {
-         fprintf_filtered (stream, "{...}");
-         break;
-       }
-      /* Fall through.  */
-    case TYPE_CODE_STRUCT:
-      /*FIXME: Abstract this away */
-      if (options->vtblprint && cp_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.) */
-         int offset = (embedded_offset +
-                       TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8);
-         struct type *field_type = TYPE_FIELD_TYPE (type, VTBL_FNADDR_OFFSET);
-         CORE_ADDR addr
-           = extract_typed_address (valaddr + offset, field_type);
-
-         print_function_pointer_address (addr, stream, options->addressprint);
-       }
-      else
-       cp_print_value_fields (type, type, valaddr, embedded_offset, address, stream,
-                              recurse, options, NULL, 0);
-      break;
-
-    case TYPE_CODE_ENUM:
-      if (options->format)
-       {
-         print_scalar_formatted (valaddr + embedded_offset, type,
-                                 options, 0, stream);
-         break;
-       }
-      len = TYPE_NFIELDS (type);
-      val = unpack_long (type, valaddr + embedded_offset);
-      for (i = 0; i < len; i++)
-       {
-         QUIT;
-         if (val == TYPE_FIELD_BITPOS (type, i))
            {
-             break;
+             i = 0;
            }
+         val_print_array_elements (type, embedded_offset,
+                                   address, stream,
+                                   recurse, original_value, options, i);
+         fprintf_filtered (stream, "}");
        }
-      if (i < len)
-       {
-         fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
-       }
-      else
-       {
-         print_longest (stream, 'd', 0, val);
-       }
-      break;
+    }
+  else
+    {
+      /* Array of unspecified length: treat like pointer to first elt.  */
+      print_unpacked_pointer (type, elttype, unresolved_elttype, valaddr,
+                             embedded_offset, address + embedded_offset,
+                             stream, recurse, options);
+    }
+}
 
-    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;
+/* c_val_print helper for TYPE_CODE_PTR.  */
 
-    case TYPE_CODE_FUNC:
-    case TYPE_CODE_METHOD:
-      if (options->format)
-       {
-         print_scalar_formatted (valaddr + embedded_offset, type,
-                                 options, 0, stream);
-         break;
-       }
-      /* FIXME, we should consider, at least for ANSI C language, eliminating
-         the distinction made between FUNCs and POINTERs to FUNCs.  */
-      fprintf_filtered (stream, "{");
-      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);
-      break;
+static void
+c_val_print_ptr (struct type *type, const gdb_byte *valaddr,
+                int embedded_offset, struct ui_file *stream, int recurse,
+                struct value *original_value,
+                const struct value_print_options *options)
+{
+  struct gdbarch *arch = get_type_arch (type);
+  int unit_size = gdbarch_addressable_memory_unit_size (arch);
 
-    case TYPE_CODE_BOOL:
-      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);
-         if (val == 0)
-           fputs_filtered ("false", stream);
-         else if (val == 1)
-           fputs_filtered ("true", stream);
-         else
-           print_longest (stream, 'd', 0, val);
-       }
-      break;
+  if (options->format && options->format != 's')
+    {
+      val_print_scalar_formatted (type, embedded_offset,
+                                 original_value, options, 0, stream);
+    }
+  else if (options->vtblprint && cp_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.)  */
+      CORE_ADDR addr
+       = extract_typed_address (valaddr + embedded_offset, type);
+      struct gdbarch *gdbarch = get_type_arch (type);
+
+      print_function_pointer_address (options, gdbarch, addr, stream);
+    }
+  else
+    {
+      struct type *unresolved_elttype = TYPE_TARGET_TYPE (type);
+      struct type *elttype = check_typedef (unresolved_elttype);
+      CORE_ADDR addr = unpack_pointer (type,
+                                      valaddr + embedded_offset * unit_size);
 
-    case TYPE_CODE_RANGE:
-      /* FIXME: create_range_type does not set the unsigned bit in a
-         range type (I think it probably should copy it from the target
-         type), so we won't print values which are too large to
-         fit in a signed integer correctly.  */
-      /* FIXME: Doesn't handle ranges of enums correctly.  (Can't just
-         print with the target type, though, because the size of our type
-         and the target type might differ).  */
-      /* FALLTHROUGH */
+      print_unpacked_pointer (type, elttype, unresolved_elttype, valaddr,
+                             embedded_offset, addr, stream, recurse, options);
+    }
+}
 
-    case TYPE_CODE_INT:
-      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_print_type_code_int (type, valaddr + embedded_offset, stream);
-         /* C and C++ has no single byte int type, char is used instead.
-            Since we don't know whether the value is really intended to
-            be used as an integer or a character, print the character
-            equivalent as well.  */
-         if (textual_element_type (unresolved_type, options->format))
-           {
-             fputs_filtered (" ", stream);
-             LA_PRINT_CHAR ((unsigned char) unpack_long (type, valaddr + embedded_offset),
-                            unresolved_type, stream);
-           }
-       }
-      break;
+/* c_val_print helper for TYPE_CODE_STRUCT.  */
 
-    case TYPE_CODE_CHAR:
-      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
+static void
+c_val_print_struct (struct type *type, const gdb_byte *valaddr,
+                   int embedded_offset, CORE_ADDR address,
+                   struct ui_file *stream, int recurse,
+                   struct value *original_value,
+                   const struct value_print_options *options)
+{
+  if (options->vtblprint && cp_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.)  */
+      struct gdbarch *gdbarch = get_type_arch (type);
+      int offset = (embedded_offset
+                   + TYPE_FIELD_BITPOS (type,
+                                        VTBL_FNADDR_OFFSET) / 8);
+      struct type *field_type = TYPE_FIELD_TYPE (type, VTBL_FNADDR_OFFSET);
+      CORE_ADDR addr = extract_typed_address (valaddr + offset, field_type);
+
+      print_function_pointer_address (options, gdbarch, addr, stream);
+    }
+  else
+    cp_print_value_fields_rtti (type, valaddr,
+                               embedded_offset, address,
+                               stream, recurse,
+                               original_value, options,
+                               NULL, 0);
+}
+
+/* c_val_print helper for TYPE_CODE_UNION.  */
+
+static void
+c_val_print_union (struct type *type, const gdb_byte *valaddr,
+                  int embedded_offset, CORE_ADDR address,
+                  struct ui_file *stream, int recurse,
+                  struct value *original_value,
+                  const struct value_print_options *options)
+{
+  if (recurse && !options->unionprint)
+    {
+      fprintf_filtered (stream, "{...}");
+     }
+  else
+    {
+      c_val_print_struct (type, valaddr, embedded_offset, address, stream,
+                         recurse, original_value, options);
+    }
+}
+
+/* c_val_print helper for TYPE_CODE_INT.  */
+
+static void
+c_val_print_int (struct type *type, struct type *unresolved_type,
+                const gdb_byte *valaddr, int embedded_offset,
+                struct ui_file *stream, struct value *original_value,
+                const struct value_print_options *options)
+{
+  struct gdbarch *arch = get_type_arch (type);
+  int unit_size = gdbarch_addressable_memory_unit_size (arch);
+
+  if (options->format || options->output_format)
+    {
+      struct value_print_options opts = *options;
+
+      opts.format = (options->format ? options->format
+                    : options->output_format);
+      val_print_scalar_formatted (type, embedded_offset,
+                                 original_value, &opts, 0, stream);
+    }
+  else
+    {
+      val_print_scalar_formatted (type, embedded_offset,
+                                 original_value, options, 0, stream);
+      /* C and C++ has no single byte int type, char is used
+        instead.  Since we don't know whether the value is really
+        intended to be used as an integer or a character, print
+        the character equivalent as well.  */
+      if (c_textual_element_type (unresolved_type, options->format))
        {
-         val = unpack_long (type, valaddr + embedded_offset);
-         if (TYPE_UNSIGNED (type))
-           fprintf_filtered (stream, "%u", (unsigned int) val);
-         else
-           fprintf_filtered (stream, "%d", (int) val);
          fputs_filtered (" ", stream);
-         LA_PRINT_CHAR ((unsigned char) val, unresolved_type, stream);
+         LA_PRINT_CHAR (unpack_long (type,
+                                     valaddr + embedded_offset * unit_size),
+                        unresolved_type, stream);
        }
+    }
+}
+
+/* c_val_print helper for TYPE_CODE_MEMBERPTR.  */
+
+static void
+c_val_print_memberptr (struct type *type, const gdb_byte *valaddr,
+                      int embedded_offset, CORE_ADDR address,
+                      struct ui_file *stream, int recurse,
+                      struct value *original_value,
+                      const struct value_print_options *options)
+{
+  if (!options->format)
+    {
+      cp_print_class_member (valaddr + embedded_offset, type, stream, "&");
+    }
+  else
+    {
+      generic_val_print (type, embedded_offset, address, stream,
+                        recurse, original_value, options, &c_decorations);
+    }
+}
+
+/* See val_print for a description of the various parameters of this
+   function; they are identical.  */
+
+void
+c_val_print (struct type *type,
+            int embedded_offset, CORE_ADDR address,
+            struct ui_file *stream, int recurse,
+            struct value *original_value,
+            const struct value_print_options *options)
+{
+  struct type *unresolved_type = type;
+  const gdb_byte *valaddr = value_contents_for_printing (original_value);
+
+  type = check_typedef (type);
+  switch (TYPE_CODE (type))
+    {
+    case TYPE_CODE_ARRAY:
+      c_val_print_array (type, valaddr, embedded_offset, address, stream,
+                        recurse, original_value, options);
       break;
 
-    case TYPE_CODE_FLT:
-      if (options->format)
-       {
-         print_scalar_formatted (valaddr + embedded_offset, type,
-                                 options, 0, stream);
-       }
-      else
-       {
-         print_floating (valaddr + embedded_offset, type, stream);
-       }
+    case TYPE_CODE_METHODPTR:
+      cplus_print_method_ptr (valaddr + embedded_offset, type, stream);
       break;
 
-    case TYPE_CODE_DECFLOAT:
-      if (options->format)
-       print_scalar_formatted (valaddr + embedded_offset, type,
-                               options, 0, stream);
-      else
-       print_decimal_floating (valaddr + embedded_offset, type, stream);
+    case TYPE_CODE_PTR:
+      c_val_print_ptr (type, valaddr, embedded_offset, stream, recurse,
+                      original_value, options);
       break;
 
-    case TYPE_CODE_VOID:
-      fprintf_filtered (stream, "void");
+    case TYPE_CODE_UNION:
+      c_val_print_union (type, valaddr, embedded_offset, address, stream,
+                        recurse, original_value, options);
       break;
 
-    case TYPE_CODE_ERROR:
-      fprintf_filtered (stream, _("<error type>"));
+    case TYPE_CODE_STRUCT:
+      c_val_print_struct (type, valaddr, embedded_offset, address, stream,
+                         recurse, original_value, options);
       break;
 
-    case TYPE_CODE_UNDEF:
-      /* This happens (without TYPE_FLAG_STUB set) on systems which don't use
-         dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar"
-         and no complete type for struct foo in that file.  */
-      fprintf_filtered (stream, _("<incomplete type>"));
+    case TYPE_CODE_INT:
+      c_val_print_int (type, unresolved_type, valaddr, embedded_offset, stream,
+                      original_value, options);
       break;
 
-    case TYPE_CODE_COMPLEX:
-      if (options->format)
-       print_scalar_formatted (valaddr + embedded_offset,
-                               TYPE_TARGET_TYPE (type),
-                               options, 0, stream);
-      else
-       print_floating (valaddr + embedded_offset, TYPE_TARGET_TYPE (type),
-                       stream);
-      fprintf_filtered (stream, " + ");
-      if (options->format)
-       print_scalar_formatted (valaddr + embedded_offset
-                               + TYPE_LENGTH (TYPE_TARGET_TYPE (type)),
-                               TYPE_TARGET_TYPE (type),
-                               options, 0, stream);
-      else
-       print_floating (valaddr + embedded_offset
-                       + TYPE_LENGTH (TYPE_TARGET_TYPE (type)),
-                       TYPE_TARGET_TYPE (type),
-                       stream);
-      fprintf_filtered (stream, " * I");
+    case TYPE_CODE_MEMBERPTR:
+      c_val_print_memberptr (type, valaddr, embedded_offset, address, stream,
+                            recurse, original_value, options);
       break;
 
+    case TYPE_CODE_REF:
+    case TYPE_CODE_RVALUE_REF:
+    case TYPE_CODE_ENUM:
+    case TYPE_CODE_FLAGS:
+    case TYPE_CODE_FUNC:
+    case TYPE_CODE_METHOD:
+    case TYPE_CODE_BOOL:
+    case TYPE_CODE_RANGE:
+    case TYPE_CODE_FLT:
+    case TYPE_CODE_DECFLOAT:
+    case TYPE_CODE_VOID:
+    case TYPE_CODE_ERROR:
+    case TYPE_CODE_UNDEF:
+    case TYPE_CODE_COMPLEX:
+    case TYPE_CODE_CHAR:
     default:
-      error (_("Invalid C/C++ type code %d in symbol table."), TYPE_CODE (type));
+      generic_val_print (type, embedded_offset, address,
+                        stream, recurse, original_value, options,
+                        &c_decorations);
+      break;
     }
-  gdb_flush (stream);
-  return (0);
 }
 \f
-int
+void
 c_value_print (struct value *val, struct ui_file *stream, 
               const struct value_print_options *options)
 {
   struct type *type, *real_type, *val_type;
-  int full, top, using_enc;
+  int full, using_enc;
+  LONGEST top;
   struct value_print_options opts = *options;
 
   opts.deref_ref = 1;
@@ -586,59 +587,62 @@ c_value_print (struct value *val, struct ui_file *stream,
   val_type = value_type (val);
   type = check_typedef (val_type);
 
-  if (TYPE_CODE (type) == TYPE_CODE_PTR
-      || TYPE_CODE (type) == TYPE_CODE_REF)
+  if (TYPE_CODE (type) == TYPE_CODE_PTR || TYPE_IS_REFERENCE (type))
     {
       /* Hack:  remove (char *) for char strings.  Their
          type is indicated by the quoted string anyway.
-         (Don't use textual_element_type here; quoted strings
+         (Don't use c_textual_element_type here; quoted strings
          are always exactly (char *), (wchar_t *), or the like.  */
       if (TYPE_CODE (val_type) == TYPE_CODE_PTR
          && TYPE_NAME (val_type) == NULL
          && TYPE_NAME (TYPE_TARGET_TYPE (val_type)) != NULL
-         && (strcmp (TYPE_NAME (TYPE_TARGET_TYPE (val_type)), "char") == 0
+         && (strcmp (TYPE_NAME (TYPE_TARGET_TYPE (val_type)),
+                     "char") == 0
              || textual_name (TYPE_NAME (TYPE_TARGET_TYPE (val_type)))))
        {
-         /* Print nothing */
+         /* Print nothing */
        }
       else if (options->objectprint
-              && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS))
+              && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_STRUCT))
        {
+         int is_ref = TYPE_IS_REFERENCE (type);
+         enum type_code refcode = TYPE_CODE_UNDEF;
 
-         if (TYPE_CODE(type) == TYPE_CODE_REF)
+         if (is_ref)
            {
-             /* Copy value, change to pointer, so we don't get an
-              * error about a non-pointer type in value_rtti_target_type
-              */
-             struct value *temparg;
-             temparg=value_copy(val);
-             deprecated_set_value_type (temparg, lookup_pointer_type (TYPE_TARGET_TYPE(type)));
-             val=temparg;
+             val = value_addr (val);
+             refcode = TYPE_CODE (type);
            }
-         /* Pointer to class, check real type of object */
+
+         /* Pointer to class, check real type of object.  */
          fprintf_filtered (stream, "(");
-          real_type = value_rtti_target_type (val, &full, &top, &using_enc);
-          if (real_type)
+
+         if (value_entirely_available (val))
            {
-             /* RTTI entry found */
-              if (TYPE_CODE (type) == TYPE_CODE_PTR)
-                {
-                  /* create a pointer type pointing to the real type */
-                  type = lookup_pointer_type (real_type);
-                }
-              else
-                {
-                  /* create a reference type referencing the real type */
-                  type = lookup_reference_type (real_type);
-                }
-             /* JYG: Need to adjust pointer value. */
-             /* NOTE: cagney/2005-01-02: THIS IS BOGUS.  */
-              value_contents_writeable (val)[0] -= top;
-
-              /* Note: When we look up RTTI entries, we don't get any 
-                 information on const or volatile attributes */
-            }
-          type_print (type, "", stream, -1);
+             real_type = value_rtti_indirect_type (val, &full, &top,
+                                                   &using_enc);
+             if (real_type)
+               {
+                 /* RTTI entry found.  */
+                 type = real_type;
+
+                 /* Need to adjust pointer value.  */
+                 val = value_from_pointer (real_type,
+                                           value_as_address (val) - top);
+
+                 /* Note: When we look up RTTI entries, we don't get
+                    any information on const or volatile
+                    attributes.  */
+               }
+           }
+
+         if (is_ref)
+           {
+             val = value_ref (value_ind (val), refcode);
+             type = value_type (val);
+           }
+
+         type_print (type, "", stream, -1);
          fprintf_filtered (stream, ") ");
          val_type = type;
        }
@@ -654,40 +658,45 @@ c_value_print (struct value *val, struct ui_file *stream,
   if (!value_initialized (val))
     fprintf_filtered (stream, " [uninitialized] ");
 
-  if (options->objectprint && (TYPE_CODE (type) == TYPE_CODE_CLASS))
+  if (options->objectprint && (TYPE_CODE (type) == TYPE_CODE_STRUCT))
     {
-      /* Attempt to determine real type of object */
+      /* Attempt to determine real type of object */
       real_type = value_rtti_type (val, &full, &top, &using_enc);
       if (real_type)
        {
-         /* We have RTTI information, so use it */
-         val = value_full_object (val, real_type, full, top, using_enc);
+         /* We have RTTI information, so use it.  */
+         val = value_full_object (val, real_type, 
+                                  full, top, using_enc);
          fprintf_filtered (stream, "(%s%s) ",
                            TYPE_NAME (real_type),
                            full ? "" : _(" [incomplete object]"));
-         /* Print out object: enclosing type is same as real_type if full */
-         return val_print (value_enclosing_type (val),
-                           value_contents_all (val), 0,
-                           VALUE_ADDRESS (val), stream, 0,
-                           &opts, current_language);
-          /* Note: When we look up RTTI entries, we don't get any information on
-             const or volatile attributes */
+         /* Print out object: enclosing type is same as real_type if
+            full.  */
+         val_print (value_enclosing_type (val),
+                    0,
+                    value_address (val), stream, 0,
+                    val, &opts, current_language);
+         return;
+          /* Note: When we look up RTTI entries, we don't get any
+             information on const or volatile attributes.  */
        }
       else if (type != check_typedef (value_enclosing_type (val)))
        {
-         /* No RTTI information, so let's do our best */
+         /* No RTTI information, so let's do our best */
          fprintf_filtered (stream, "(%s ?) ",
                            TYPE_NAME (value_enclosing_type (val)));
-         return val_print (value_enclosing_type (val),
-                           value_contents_all (val), 0,
-                           VALUE_ADDRESS (val), stream, 0,
-                           &opts, current_language);
+         val_print (value_enclosing_type (val),
+                    0,
+                    value_address (val), stream, 0,
+                    val, &opts, current_language);
+         return;
        }
-      /* Otherwise, we end up at the return outside this "if" */
+      /* Otherwise, we end up at the return outside this "if" */
     }
 
-  return val_print (val_type, value_contents_all (val),
-                   value_embedded_offset (val),
-                   VALUE_ADDRESS (val) + value_offset (val),
-                   stream, 0, &opts, current_language);
+  val_print (val_type,
+            value_embedded_offset (val),
+            value_address (val),
+            stream, 0,
+            val, &opts, current_language);
 }
This page took 0.034779 seconds and 4 git commands to generate.