X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fc-valprint.c;h=9c82869525f7b4969bf5b295f6eafe78b90a7f94;hb=e34a209edf13f64c2b13a79186563a501ee28df5;hp=c4c0918e26afe58dc488f0d1ba2a39af4b1bddd7;hpb=de63c46b549d1cf4f7851e47872cb759a12983f4;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index c4c0918e26..9c82869525 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-2018 Free Software Foundation, Inc. + Copyright (C) 1986-2021 Free Software Foundation, Inc. This file is part of GDB. @@ -66,11 +66,11 @@ c_textual_element_type (struct type *type, char format) true_type = check_typedef (type); /* TYPE_CODE_CHAR is always textual. */ - if (TYPE_CODE (true_type) == TYPE_CODE_CHAR) + if (true_type->code () == TYPE_CODE_CHAR) return 1; /* Any other character-like types must be integral. */ - if (TYPE_CODE (true_type) != TYPE_CODE_INT) + if (true_type->code () != TYPE_CODE_INT) return 0; /* We peel typedefs one by one, looking for a match. */ @@ -78,10 +78,10 @@ c_textual_element_type (struct type *type, char format) while (iter_type) { /* Check the name of the type. */ - if (TYPE_NAME (iter_type) && textual_name (TYPE_NAME (iter_type))) + if (iter_type->name () && textual_name (iter_type->name ())) return 1; - if (TYPE_CODE (iter_type) != TYPE_CODE_TYPEDEF) + if (iter_type->code () != TYPE_CODE_TYPEDEF) break; /* Peel a single typedef. If the typedef doesn't have a target @@ -97,7 +97,7 @@ c_textual_element_type (struct type *type, char format) { /* Print this as a string if we can manage it. For now, no wide character support. */ - if (TYPE_CODE (true_type) == TYPE_CODE_INT + if (true_type->code () == TYPE_CODE_INT && TYPE_LENGTH (true_type) == 1) return 1; } @@ -106,7 +106,7 @@ c_textual_element_type (struct type *type, char format) /* If a one-byte TYPE_CODE_INT is missing the not-a-character flag, then we treat it as text; otherwise, we assume it's being used as data. */ - if (TYPE_CODE (true_type) == TYPE_CODE_INT + if (true_type->code () == TYPE_CODE_INT && TYPE_LENGTH (true_type) == 1 && !TYPE_NOTTEXT (true_type)) return 1; @@ -121,7 +121,7 @@ static const struct generic_val_print_decorations c_decorations = { "", " + ", - " * I", + "i", "true", "false", "void", @@ -144,9 +144,9 @@ print_unpacked_pointer (struct type *type, struct type *elttype, const struct value_print_options *options) { int want_space = 0; - struct gdbarch *gdbarch = get_type_arch (type); + struct gdbarch *gdbarch = type->arch (); - if (TYPE_CODE (elttype) == TYPE_CODE_FUNC) + if (elttype->code () == TYPE_CODE_FUNC) { /* Try to print what function it points to. */ print_function_pointer_address (options, gdbarch, address, stream); @@ -187,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; } @@ -197,16 +197,14 @@ print_unpacked_pointer (struct type *type, struct type *elttype, struct value *vt_val; struct symbol *wsym = NULL; struct type *wtype; - struct block *block = NULL; if (want_space) fputs_filtered (" ", stream); if (msymbol.minsym != NULL) { - const char *search_name - = MSYMBOL_SEARCH_NAME (msymbol.minsym); - wsym = lookup_symbol_search_name (search_name, block, + const char *search_name = msymbol.minsym->search_name (); + wsym = lookup_symbol_search_name (search_name, NULL, VAR_DOMAIN).symbol; } @@ -230,46 +228,37 @@ print_unpacked_pointer (struct type *type, struct type *elttype, } } -/* c_val_print helper for TYPE_CODE_ARRAY. */ +/* c_value_print helper for TYPE_CODE_ARRAY. */ 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) +c_value_print_array (struct value *val, + struct ui_file *stream, int recurse, + const struct value_print_options *options) { + struct type *type = check_typedef (value_type (val)); + CORE_ADDR address = value_address (val); + const gdb_byte *valaddr = value_contents_for_printing (val); 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) { LONGEST low_bound, high_bound; int eltlen, len; - struct gdbarch *gdbarch = get_type_arch (type); - enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); - unsigned int i = 0; /* Number of characters printed. */ + enum bfd_endian byte_order = type_byte_order (type); if (!get_array_bounds (type, &low_bound, &high_bound)) error (_("Could not determine the array high bound")); eltlen = TYPE_LENGTH (elttype); len = high_bound - low_bound + 1; - if (options->prettyformat_arrays) - { - print_spaces_filtered (2 + 2 * recurse, stream); - } /* 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, + && value_bytes_available (val, 0, TYPE_LENGTH (type)) + && !value_bits_any_optimized_out (val, 0, TARGET_CHAR_BIT * TYPE_LENGTH (type))) { int force_ellipses = 0; @@ -283,9 +272,7 @@ 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 * unit_size - + temp_len * eltlen, + && extract_unsigned_integer (valaddr + temp_len * eltlen, eltlen, byte_order) != 0); ++temp_len) ; @@ -295,25 +282,22 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr, the next character is not \000. */ if (temp_len == options->print_max && temp_len < len) { - ULONGEST val - = extract_unsigned_integer (valaddr - + embedded_offset * unit_size - + temp_len * eltlen, + ULONGEST ival + = extract_unsigned_integer (valaddr + temp_len * eltlen, eltlen, byte_order); - if (val != 0) + if (ival != 0) force_ellipses = 1; } len = temp_len; } - LA_PRINT_STRING (stream, unresolved_elttype, - valaddr + embedded_offset * unit_size, len, + LA_PRINT_STRING (stream, unresolved_elttype, valaddr, len, NULL, force_ellipses, options); - i = len; } else { + unsigned int i = 0; fprintf_filtered (stream, "{"); /* If this is a virtual function table, print the 0th entry specially, and the rest of the members @@ -324,13 +308,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr, fprintf_filtered (stream, _("%d vtable entries"), len - 1); } - else - { - i = 0; - } - val_print_array_elements (type, embedded_offset, - address, stream, - recurse, original_value, options, i); + value_print_array_elements (val, stream, recurse, options, i); fprintf_filtered (stream, "}"); } } @@ -338,211 +316,134 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr, { /* 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); + 0, address, stream, recurse, options); } } -/* c_val_print helper for TYPE_CODE_PTR. */ +/* c_value_print_inner helper for TYPE_CODE_PTR. */ 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) +c_value_print_ptr (struct value *val, struct ui_file *stream, int recurse, + 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, embedded_offset, - original_value, options, 0, stream); + value_print_scalar_formatted (val, options, 0, stream); + return; } - else if (options->vtblprint && cp_is_vtbl_ptr_type (type)) + + struct type *type = check_typedef (value_type (val)); + const gdb_byte *valaddr = value_contents_for_printing (val); + + 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); + CORE_ADDR addr = extract_typed_address (valaddr, type); - print_function_pointer_address (options, gdbarch, addr, stream); + print_function_pointer_address (options, type->arch (), 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); + CORE_ADDR addr = unpack_pointer (type, valaddr); print_unpacked_pointer (type, elttype, unresolved_elttype, valaddr, - embedded_offset, addr, stream, recurse, options); + 0, addr, stream, recurse, options); } } -/* c_val_print helper for TYPE_CODE_STRUCT. */ +/* c_value_print helper for TYPE_CODE_STRUCT and TYPE_CODE_UNION. */ 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) +c_value_print_struct (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) { - if (options->vtblprint && cp_is_vtbl_ptr_type (type)) + struct type *type = check_typedef (value_type (val)); + + if (type->code () == TYPE_CODE_UNION && recurse && !options->unionprint) + fprintf_filtered (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 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); + int offset = TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8; + struct type *field_type = type->field (VTBL_FNADDR_OFFSET).type (); + const gdb_byte *valaddr = value_contents_for_printing (val); CORE_ADDR addr = extract_typed_address (valaddr + offset, field_type); - print_function_pointer_address (options, gdbarch, addr, stream); + print_function_pointer_address (options, type->arch (), addr, stream); } else - cp_print_value_fields_rtti (type, valaddr, - embedded_offset, address, - stream, recurse, - original_value, options, - NULL, 0); + cp_print_value_fields (val, stream, recurse, options, NULL, 0); } -/* c_val_print helper for TYPE_CODE_UNION. */ +/* c_value_print helper for TYPE_CODE_INT. */ 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, +c_value_print_int (struct value *val, struct ui_file *stream, 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); + value_print_scalar_formatted (val, &opts, 0, stream); } else { - val_print_scalar_formatted (type, embedded_offset, - original_value, options, 0, stream); + value_print_scalar_formatted (val, 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)) + struct type *type = value_type (val); + const gdb_byte *valaddr = value_contents_for_printing (val); + if (c_textual_element_type (type, options->format)) { fputs_filtered (" ", stream); - LA_PRINT_CHAR (unpack_long (type, - valaddr + embedded_offset * unit_size), - unresolved_type, stream); + LA_PRINT_CHAR (unpack_long (type, valaddr), 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. */ +/* See c-lang.h. */ 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) +c_value_print_inner (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) { - struct type *unresolved_type = type; - const gdb_byte *valaddr = value_contents_for_printing (original_value); + struct type *type = value_type (val); type = check_typedef (type); - switch (TYPE_CODE (type)) + switch (type->code ()) { case TYPE_CODE_ARRAY: - c_val_print_array (type, valaddr, embedded_offset, address, stream, - recurse, original_value, options); - break; - - case TYPE_CODE_METHODPTR: - cplus_print_method_ptr (valaddr + embedded_offset, type, stream); + c_value_print_array (val, stream, recurse, options); break; case TYPE_CODE_PTR: - c_val_print_ptr (type, valaddr, embedded_offset, stream, recurse, - original_value, options); + c_value_print_ptr (val, stream, recurse, options); break; case TYPE_CODE_UNION: - c_val_print_union (type, valaddr, embedded_offset, address, stream, - recurse, original_value, options); - break; - case TYPE_CODE_STRUCT: - c_val_print_struct (type, valaddr, embedded_offset, address, stream, - recurse, original_value, options); + c_value_print_struct (val, stream, recurse, options); break; case TYPE_CODE_INT: - c_val_print_int (type, unresolved_type, valaddr, embedded_offset, stream, - original_value, options); + c_value_print_int (val, stream, options); break; + case TYPE_CODE_METHODPTR: 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: @@ -559,19 +460,17 @@ c_val_print (struct type *type, case TYPE_CODE_COMPLEX: case TYPE_CODE_CHAR: default: - generic_val_print (type, embedded_offset, address, - stream, recurse, original_value, options, - &c_decorations); + generic_value_print (val, stream, recurse, options, &c_decorations); break; } - gdb_flush (stream); } + void c_value_print (struct value *val, struct ui_file *stream, const struct value_print_options *options) { - struct type *type, *real_type, *val_type; + struct type *type, *real_type; int full, using_enc; LONGEST top; struct value_print_options opts = *options; @@ -585,29 +484,27 @@ c_value_print (struct value *val, struct ui_file *stream, C++: if it is a member pointer, we will take care of that when we print it. */ - /* Preserve the original type before stripping typedefs. We prefer - to pass down the original type when possible, but for local - checks it is better to look past the typedefs. */ - val_type = value_type (val); - type = check_typedef (val_type); + type = check_typedef (value_type (val)); - if (TYPE_CODE (type) == TYPE_CODE_PTR || TYPE_IS_REFERENCE (type)) + if (type->code () == TYPE_CODE_PTR || TYPE_IS_REFERENCE (type)) { + struct type *original_type = value_type (val); + /* Hack: remove (char *) for char strings. Their - type is indicated by the quoted string anyway. - (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)), + type is indicated by the quoted string anyway. + (Don't use c_textual_element_type here; quoted strings + are always exactly (char *), (wchar_t *), or the like. */ + if (original_type->code () == TYPE_CODE_PTR + && original_type->name () == NULL + && TYPE_TARGET_TYPE (original_type)->name () != NULL + && (strcmp (TYPE_TARGET_TYPE (original_type)->name (), "char") == 0 - || textual_name (TYPE_NAME (TYPE_TARGET_TYPE (val_type))))) + || textual_name (TYPE_TARGET_TYPE (original_type)->name ()))) { /* Print nothing. */ } else if (options->objectprint - && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_STRUCT)) + && (TYPE_TARGET_TYPE (type)->code () == TYPE_CODE_STRUCT)) { int is_ref = TYPE_IS_REFERENCE (type); enum type_code refcode = TYPE_CODE_UNDEF; @@ -615,7 +512,7 @@ c_value_print (struct value *val, struct ui_file *stream, if (is_ref) { val = value_addr (val); - refcode = TYPE_CODE (type); + refcode = type->code (); } /* Pointer to class, check real type of object. */ @@ -628,7 +525,6 @@ c_value_print (struct value *val, struct ui_file *stream, if (real_type) { /* RTTI entry found. */ - type = real_type; /* Need to adjust pointer value. */ val = value_from_pointer (real_type, @@ -641,14 +537,11 @@ c_value_print (struct value *val, struct ui_file *stream, } if (is_ref) - { - val = value_ref (value_ind (val), refcode); - type = value_type (val); - } + val = value_ref (value_ind (val), refcode); + type = value_type (val); type_print (type, "", stream, -1); fprintf_filtered (stream, ") "); - val_type = type; } else { @@ -662,7 +555,7 @@ 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_STRUCT)) + if (options->objectprint && (type->code () == TYPE_CODE_STRUCT)) { /* Attempt to determine real type of object. */ real_type = value_rtti_type (val, &full, &top, &using_enc); @@ -671,36 +564,25 @@ c_value_print (struct value *val, struct ui_file *stream, /* We have RTTI information, so use it. */ val = value_full_object (val, real_type, full, top, using_enc); + /* In a destructor we might see a real type that is a + superclass of the object's type. In this case it is + better to leave the object as-is. */ + if (!(full + && (TYPE_LENGTH (real_type) + < TYPE_LENGTH (value_enclosing_type (val))))) + val = value_cast (real_type, val); fprintf_filtered (stream, "(%s%s) ", - TYPE_NAME (real_type), + real_type->name (), full ? "" : _(" [incomplete object]")); - /* 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. */ fprintf_filtered (stream, "(%s ?) ", - TYPE_NAME (value_enclosing_type (val))); - val_print (value_enclosing_type (val), - 0, - value_address (val), stream, 0, - val, &opts, current_language); - return; + value_enclosing_type (val)->name ()); + val = value_cast (value_enclosing_type (val), val); } - /* Otherwise, we end up at the return outside this "if". */ } - val_print (val_type, - value_embedded_offset (val), - value_address (val), - stream, 0, - val, &opts, current_language); + common_val_print (val, stream, 0, &opts, current_language); }