Step over exit with reinsert breakpoints

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

diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index d76a206e25f5e108e858e9b83464e0743e95a3ac..61302a36da9c43d639436c86faf351b0d86336de 100644 (file)
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -1,6 +1,6 @@
 /* Support for printing C values for GDB, the GNU debugger.
 
-   Copyright (C) 1986-2015 Free Software Foundation, Inc.
+   Copyright (C) 1986-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -124,7 +124,9 @@ static const struct generic_val_print_decorations c_decorations =
   " * I",
   "true",
   "false",
-  "void"
+  "void",
+  "{",
+  "}"
 };
 
 /* Print a pointer based on the type of its target.
@@ -193,9 +195,9 @@ print_unpacked_pointer (struct type *type, struct type *elttype,
       if (vt_address && options->vtblprint)
        {
          struct value *vt_val;
-         struct symbol *wsym = (struct symbol *) NULL;
+         struct symbol *wsym = NULL;
          struct type *wtype;
-         struct block *block = (struct block *) NULL;
+         struct block *block = NULL;
          struct field_of_this_result is_this_fld;
 
          if (want_space)
@@ -203,7 +205,7 @@ print_unpacked_pointer (struct type *type, struct type *elttype,
 
          if (msymbol.minsym != NULL)
            wsym = lookup_symbol (MSYMBOL_LINKAGE_NAME(msymbol.minsym), block,
-                                 VAR_DOMAIN, &is_this_fld);
+                                 VAR_DOMAIN, &is_this_fld).symbol;
 
          if (wsym)
            {
@@ -236,6 +238,8 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
 {
   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);
 
   if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (unresolved_elttype) > 0)
     {
@@ -276,7 +280,8 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
              for (temp_len = 0;
                   (temp_len < len
                    && temp_len < options->print_max
-                   && extract_unsigned_integer (valaddr + embedded_offset
+                   && extract_unsigned_integer (valaddr
+                                                + embedded_offset * unit_size
                                                 + temp_len * eltlen,
                                                 eltlen, byte_order) != 0);
                   ++temp_len)
@@ -288,7 +293,8 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
              if (temp_len == options->print_max && temp_len < len)
                {
                  ULONGEST val
-                   = extract_unsigned_integer (valaddr + embedded_offset
+                   = extract_unsigned_integer (valaddr
+                                               + embedded_offset * unit_size
                                                + temp_len * eltlen,
                                                eltlen, byte_order);
                  if (val != 0)
@@ -299,7 +305,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
            }
 
          LA_PRINT_STRING (stream, unresolved_elttype,
-                          valaddr + embedded_offset, len,
+                          valaddr + embedded_offset * unit_size, len,
                           NULL, force_ellipses, options);
          i = len;
        }
@@ -342,6 +348,9 @@ c_val_print_ptr (struct type *type, const gdb_byte *valaddr,
                 const 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->format != 's')
     {
       val_print_scalar_formatted (type, valaddr, embedded_offset,
@@ -363,7 +372,8 @@ c_val_print_ptr (struct type *type, const gdb_byte *valaddr,
     {
       struct type *unresolved_elttype = TYPE_TARGET_TYPE (type);
       struct type *elttype = check_typedef (unresolved_elttype);
-      CORE_ADDR addr = unpack_pointer (type, valaddr + embedded_offset);
+      CORE_ADDR addr = unpack_pointer (type,
+                                      valaddr + embedded_offset * unit_size);
 
       print_unpacked_pointer (type, elttype, unresolved_elttype, valaddr,
                              embedded_offset, addr, stream, recurse, options);
@@ -430,6 +440,9 @@ c_val_print_int (struct type *type, struct type *unresolved_type,
                 struct ui_file *stream, const 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;
@@ -441,7 +454,7 @@ c_val_print_int (struct type *type, struct type *unresolved_type,
     }
   else
     {
-      val_print_type_code_int (type, valaddr + embedded_offset,
+      val_print_type_code_int (type, valaddr + embedded_offset * unit_size,
                               stream);
       /* C and C++ has no single byte int type, char is used
         instead.  Since we don't know whether the value is really
@@ -450,7 +463,8 @@ c_val_print_int (struct type *type, struct type *unresolved_type,
       if (c_textual_element_type (unresolved_type, options->format))
        {
          fputs_filtered (" ", stream);
-         LA_PRINT_CHAR (unpack_long (type, valaddr + embedded_offset),
+         LA_PRINT_CHAR (unpack_long (type,
+                                     valaddr + embedded_offset * unit_size),
                         unresolved_type, stream);
        }
     }
@@ -488,7 +502,7 @@ c_val_print (struct type *type, const gdb_byte *valaddr,
 {
   struct type *unresolved_type = type;
 
-  CHECK_TYPEDEF (type);
+  type = check_typedef (type);
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_ARRAY:
@@ -599,7 +613,7 @@ c_value_print (struct value *val, struct ui_file *stream,
          fprintf_filtered (stream, "(");
 
          if (value_entirely_available (val))
-           {
+           {
              real_type = value_rtti_indirect_type (val, &full, &top,
                                                    &using_enc);
              if (real_type)
@@ -611,18 +625,19 @@ c_value_print (struct value *val, struct ui_file *stream,
                  val = value_from_pointer (real_type,
                                            value_as_address (val) - top);
 
-                 if (is_ref)
-                   {
-                     val = value_ref (value_ind (val));
-                     type = value_type (val);
-                   }
-
                  /* Note: When we look up RTTI entries, we don't get
                     any information on const or volatile
                     attributes.  */
                }
            }
-          type_print (type, "", stream, -1);
+
+         if (is_ref)
+           {
+             val = value_ref (value_ind (val));
+             type = value_type (val);
+           }
+
+         type_print (type, "", stream, -1);
          fprintf_filtered (stream, ") ");
          val_type = type;
        }