X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fc-valprint.c;h=607fb80c58f36214026c165eff11c03497cd914d;hb=4a4c04f1f4a926f986a77e72277c16e1b90c2b73;hp=62552ec7fd9090fb03c5f33f39fd8ba61e12f780;hpb=618f726fcb851883a0094aa7fa17003889b7189f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index 62552ec7fd..607fb80c58 100644 --- 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-2016 Free Software Foundation, Inc. + Copyright (C) 1986-2019 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. @@ -185,7 +187,7 @@ print_unpacked_pointer (struct type *type, struct type *elttype, if (want_space) fputs_filtered (" ", stream); fputs_filtered (" <", stream); - fputs_filtered (MSYMBOL_PRINT_NAME (msymbol.minsym), stream); + fputs_filtered (msymbol.minsym->print_name (), stream); fputs_filtered (">", stream); want_space = 1; } @@ -195,15 +197,16 @@ print_unpacked_pointer (struct type *type, struct type *elttype, struct value *vt_val; struct symbol *wsym = NULL; struct type *wtype; - struct block *block = NULL; - struct field_of_this_result is_this_fld; if (want_space) fputs_filtered (" ", stream); if (msymbol.minsym != NULL) - wsym = lookup_symbol (MSYMBOL_LINKAGE_NAME(msymbol.minsym), block, - VAR_DOMAIN, &is_this_fld).symbol; + { + const char *search_name = msymbol.minsym->search_name (); + wsym = lookup_symbol_search_name (search_name, NULL, + VAR_DOMAIN).symbol; + } if (wsym) { @@ -231,7 +234,7 @@ 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, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options) { struct type *unresolved_elttype = TYPE_TARGET_TYPE (type); @@ -243,8 +246,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr, { LONGEST low_bound, high_bound; int eltlen, len; - struct gdbarch *gdbarch = get_type_arch (type); - enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); + enum bfd_endian byte_order = type_byte_order (type); unsigned int i = 0; /* Number of characters printed. */ if (!get_array_bounds (type, &low_bound, &high_bound)) @@ -323,7 +325,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr, { i = 0; } - val_print_array_elements (type, valaddr, embedded_offset, + val_print_array_elements (type, embedded_offset, address, stream, recurse, original_value, options, i); fprintf_filtered (stream, "}"); @@ -343,7 +345,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr, static void c_val_print_ptr (struct type *type, const gdb_byte *valaddr, int embedded_offset, struct ui_file *stream, int recurse, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options) { struct gdbarch *arch = get_type_arch (type); @@ -351,7 +353,7 @@ c_val_print_ptr (struct type *type, const gdb_byte *valaddr, if (options->format && options->format != 's') { - val_print_scalar_formatted (type, valaddr, embedded_offset, + val_print_scalar_formatted (type, embedded_offset, original_value, options, 0, stream); } else if (options->vtblprint && cp_is_vtbl_ptr_type (type)) @@ -384,7 +386,7 @@ 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, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options) { if (options->vtblprint && cp_is_vtbl_ptr_type (type)) @@ -416,7 +418,7 @@ 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, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options) { if (recurse && !options->unionprint) @@ -435,7 +437,7 @@ c_val_print_union (struct type *type, const gdb_byte *valaddr, static void c_val_print_int (struct type *type, struct type *unresolved_type, const gdb_byte *valaddr, int embedded_offset, - struct ui_file *stream, const struct value *original_value, + struct ui_file *stream, struct value *original_value, const struct value_print_options *options) { struct gdbarch *arch = get_type_arch (type); @@ -447,13 +449,13 @@ c_val_print_int (struct type *type, struct type *unresolved_type, opts.format = (options->format ? options->format : options->output_format); - val_print_scalar_formatted (type, valaddr, embedded_offset, + val_print_scalar_formatted (type, embedded_offset, original_value, &opts, 0, stream); } else { - val_print_type_code_int (type, valaddr + embedded_offset * unit_size, - stream); + 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 @@ -474,7 +476,7 @@ 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, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options) { if (!options->format) @@ -483,7 +485,7 @@ c_val_print_memberptr (struct type *type, const gdb_byte *valaddr, } else { - generic_val_print (type, valaddr, embedded_offset, address, stream, + generic_val_print (type, embedded_offset, address, stream, recurse, original_value, options, &c_decorations); } } @@ -492,13 +494,14 @@ c_val_print_memberptr (struct type *type, const gdb_byte *valaddr, function; they are identical. */ void -c_val_print (struct type *type, const gdb_byte *valaddr, +c_val_print (struct type *type, int embedded_offset, CORE_ADDR address, struct ui_file *stream, int recurse, - const struct value *original_value, + 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)) @@ -538,6 +541,7 @@ c_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_REF: + case TYPE_CODE_RVALUE_REF: case TYPE_CODE_ENUM: case TYPE_CODE_FLAGS: case TYPE_CODE_FUNC: @@ -552,12 +556,11 @@ c_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_COMPLEX: case TYPE_CODE_CHAR: default: - generic_val_print (type, valaddr, embedded_offset, address, + generic_val_print (type, embedded_offset, address, stream, recurse, original_value, options, &c_decorations); break; } - gdb_flush (stream); } void @@ -565,7 +568,8 @@ 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; @@ -583,8 +587,7 @@ 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. @@ -602,16 +605,20 @@ c_value_print (struct value *val, struct ui_file *stream, else if (options->objectprint && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_STRUCT)) { - int is_ref = TYPE_CODE (type) == TYPE_CODE_REF; + int is_ref = TYPE_IS_REFERENCE (type); + enum type_code refcode = TYPE_CODE_UNDEF; if (is_ref) - val = value_addr (val); + { + val = value_addr (val); + refcode = TYPE_CODE (type); + } /* Pointer to class, check real type of object. */ fprintf_filtered (stream, "("); if (value_entirely_available (val)) - { + { real_type = value_rtti_indirect_type (val, &full, &top, &using_enc); if (real_type) @@ -623,18 +630,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), refcode); + type = value_type (val); + } + + type_print (type, "", stream, -1); fprintf_filtered (stream, ") "); val_type = type; } @@ -665,7 +673,7 @@ c_value_print (struct value *val, struct ui_file *stream, /* Print out object: enclosing type is same as real_type if full. */ val_print (value_enclosing_type (val), - value_contents_for_printing (val), 0, + 0, value_address (val), stream, 0, val, &opts, current_language); return; @@ -678,7 +686,7 @@ c_value_print (struct value *val, struct ui_file *stream, fprintf_filtered (stream, "(%s ?) ", TYPE_NAME (value_enclosing_type (val))); val_print (value_enclosing_type (val), - value_contents_for_printing (val), 0, + 0, value_address (val), stream, 0, val, &opts, current_language); return; @@ -686,7 +694,7 @@ c_value_print (struct value *val, struct ui_file *stream, /* Otherwise, we end up at the return outside this "if". */ } - val_print (val_type, value_contents_for_printing (val), + val_print (val_type, value_embedded_offset (val), value_address (val), stream, 0,