X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fc-valprint.c;h=d117248c44285f991970dabc4fceb46f7cf0788d;hb=7813437494ac39f3aef392d06ed5416e84fe386b;hp=0f40a86872a88727e2ee121f3e1f50d906f28a6e;hpb=64b653ca7058bfd4f91879dea628809d398b488e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index 0f40a86872..d117248c44 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -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. */ @@ -81,7 +81,7 @@ c_textual_element_type (struct type *type, char format) if (TYPE_NAME (iter_type) && textual_name (TYPE_NAME (iter_type))) 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", @@ -146,7 +146,7 @@ print_unpacked_pointer (struct type *type, struct type *elttype, int want_space = 0; struct gdbarch *gdbarch = get_type_arch (type); - 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); @@ -228,113 +228,6 @@ print_unpacked_pointer (struct type *type, struct type *elttype, } } -/* c_val_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) -{ - 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; - 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, - TARGET_CHAR_BIT * TYPE_LENGTH (type))) - { - int force_ellipses = 0; - - /* 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 * 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) - { - ULONGEST val - = extract_unsigned_integer (valaddr - + embedded_offset * unit_size - + temp_len * eltlen, - eltlen, byte_order); - if (val != 0) - force_ellipses = 1; - } - - len = temp_len; - } - - LA_PRINT_STRING (stream, unresolved_elttype, - valaddr + embedded_offset * unit_size, len, - NULL, force_ellipses, options); - } - 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 - normally. */ - if (cp_is_vtbl_ptr_type (elttype)) - { - i = 1; - fprintf_filtered (stream, _("%d vtable entries"), - len - 1); - } - val_print_array_elements (type, embedded_offset, - address, stream, - recurse, original_value, options, i); - fprintf_filtered (stream, "}"); - } - } - 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); - } -} - /* c_value_print helper for TYPE_CODE_ARRAY. */ static void @@ -359,10 +252,6 @@ c_value_print_array (struct value *val, 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. */ @@ -431,46 +320,6 @@ c_value_print_array (struct value *val, } } -/* c_val_print 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) -{ - 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); - } - 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); - - print_unpacked_pointer (type, elttype, unresolved_elttype, valaddr, - embedded_offset, addr, stream, recurse, options); - } -} - /* c_value_print_inner helper for TYPE_CODE_PTR. */ static void @@ -508,38 +357,6 @@ c_value_print_ptr (struct value *val, struct ui_file *stream, int recurse, } } -/* c_val_print helper for TYPE_CODE_STRUCT. */ - -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_value_print helper for TYPE_CODE_STRUCT and TYPE_CODE_UNION. */ static void @@ -548,7 +365,7 @@ c_value_print_struct (struct value *val, struct ui_file *stream, int recurse, { struct type *type = check_typedef (value_type (val)); - if (TYPE_CODE (type) == TYPE_CODE_UNION && recurse && !options->unionprint) + if (type->code () == TYPE_CODE_UNION && recurse && !options->unionprint) fprintf_filtered (stream, "{...}"); else if (options->vtblprint && cp_is_vtbl_ptr_type (type)) { @@ -568,64 +385,6 @@ c_value_print_struct (struct value *val, struct ui_file *stream, int recurse, cp_print_value_fields (val, stream, recurse, 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)) - { - fputs_filtered (" ", stream); - LA_PRINT_CHAR (unpack_long (type, - valaddr + embedded_offset * unit_size), - unresolved_type, stream); - } - } -} - /* c_value_print helper for TYPE_CODE_INT. */ static void @@ -657,26 +416,6 @@ c_value_print_int (struct value *val, struct ui_file *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); - } -} - /* c_value_print helper for TYPE_CODE_MEMBERPTR. */ static void @@ -694,79 +433,6 @@ c_value_print_memberptr (struct value *val, struct ui_file *stream, generic_value_print (val, stream, recurse, 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_METHODPTR: - cplus_print_method_ptr (valaddr + embedded_offset, type, stream); - break; - - case TYPE_CODE_PTR: - c_val_print_ptr (type, valaddr, embedded_offset, stream, recurse, - original_value, 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); - break; - - case TYPE_CODE_INT: - c_val_print_int (type, unresolved_type, valaddr, embedded_offset, stream, - original_value, options); - break; - - 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: - generic_val_print (type, embedded_offset, address, - stream, recurse, original_value, options, - &c_decorations); - break; - } -} - /* See c-lang.h. */ void @@ -777,7 +443,7 @@ c_value_print_inner (struct value *val, struct ui_file *stream, int recurse, const gdb_byte *valaddr = value_contents_for_printing (val); type = check_typedef (type); - switch (TYPE_CODE (type)) + switch (type->code ()) { case TYPE_CODE_ARRAY: c_value_print_array (val, stream, recurse, options); @@ -846,7 +512,7 @@ c_value_print (struct value *val, struct ui_file *stream, 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); @@ -854,7 +520,7 @@ c_value_print (struct value *val, struct ui_file *stream, 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 (original_type) == TYPE_CODE_PTR + if (original_type->code () == TYPE_CODE_PTR && TYPE_NAME (original_type) == NULL && TYPE_NAME (TYPE_TARGET_TYPE (original_type)) != NULL && (strcmp (TYPE_NAME (TYPE_TARGET_TYPE (original_type)), @@ -864,7 +530,7 @@ c_value_print (struct value *val, struct ui_file *stream, /* 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; @@ -872,7 +538,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. */ @@ -915,7 +581,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);