X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fada-valprint.c;h=61893d5cad3fe2dbfcef0582101e51a03de8b911;hb=348fe36b1d64f12c60e08f6313520b3191663063;hp=1d3b06ddfddb16fd6ef007c24cfabdeea4ba1336;hpb=2e088f8b6ea61fa9db1b592cbd4a6aa80b4e0ab5;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index 1d3b06ddfd..61893d5cad 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -30,20 +30,18 @@ #include "cli/cli-style.h" #include "gdbarch.h" -static int print_field_values (struct type *, const gdb_byte *, - int, +static int print_field_values (struct value *, struct value *, struct ui_file *, int, - struct value *, const struct value_print_options *, - int, struct type *, int, - const struct language_defn *); + int, const struct language_defn *); + /* Make TYPE unsigned if its range of values includes no negatives. */ static void adjust_type_signedness (struct type *type) { - if (type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE + if (type != NULL && type->code () == TYPE_CODE_RANGE && TYPE_LOW_BOUND (type) >= 0) TYPE_UNSIGNED (type) = 1; } @@ -73,9 +71,9 @@ print_optional_low_bound (struct ui_file *stream, struct type *type, if (low_bound > high_bound) return 0; - index_type = TYPE_INDEX_TYPE (type); + index_type = type->index_type (); - while (TYPE_CODE (index_type) == TYPE_CODE_RANGE) + while (index_type->code () == TYPE_CODE_RANGE) { /* We need to know what the base type is, in order to do the appropriate check below. Otherwise, if this is a subrange @@ -86,7 +84,7 @@ print_optional_low_bound (struct ui_file *stream, struct type *type, } /* Don't print the lower bound if it's the default one. */ - switch (TYPE_CODE (index_type)) + switch (index_type->code ()) { case TYPE_CODE_BOOL: case TYPE_CODE_CHAR: @@ -94,8 +92,9 @@ print_optional_low_bound (struct ui_file *stream, struct type *type, return 0; break; case TYPE_CODE_ENUM: - if (low_bound == TYPE_FIELD_ENUMVAL (index_type, 0)) + if (low_bound == 0) return 0; + low_bound = TYPE_FIELD_ENUMVAL (index_type, low_bound); break; case TYPE_CODE_UNDEF: index_type = NULL; @@ -112,17 +111,15 @@ print_optional_low_bound (struct ui_file *stream, struct type *type, } /* Version of val_print_array_elements for GNAT-style packed arrays. - Prints elements of packed array of type TYPE at bit offset - BITOFFSET from VALADDR on STREAM. Formats according to OPTIONS and - separates with commas. RECURSE is the recursion (nesting) level. - TYPE must have been decoded (as by ada_coerce_to_simple_array). */ + Prints elements of packed array of type TYPE from VALADDR on + STREAM. Formats according to OPTIONS and separates with commas. + RECURSE is the recursion (nesting) level. TYPE must have been + decoded (as by ada_coerce_to_simple_array). */ static void val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr, - int offset, - int bitoffset, struct ui_file *stream, + int offset, struct ui_file *stream, int recurse, - struct value *val, const struct value_print_options *options) { unsigned int i; @@ -134,51 +131,28 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr, LONGEST low = 0; elttype = TYPE_TARGET_TYPE (type); - index_type = TYPE_INDEX_TYPE (type); + index_type = type->index_type (); { LONGEST high; - struct type *base_index_type; if (get_discrete_bounds (index_type, &low, &high) < 0) len = 1; - else - len = high - low + 1; - - if (TYPE_CODE (index_type) == TYPE_CODE_RANGE) - base_index_type = TYPE_TARGET_TYPE (index_type); - else - base_index_type = index_type; - - if (TYPE_CODE (base_index_type) == TYPE_CODE_ENUM) + else if (low > high) { - LONGEST low_pos, high_pos; - - /* Non-contiguous enumerations types can by used as index types - so the array length is computed from the positions of the - first and last literal in the enumeration type, and not from - the values of these literals. */ - - if (!discrete_position (base_index_type, low, &low_pos) - || !discrete_position (base_index_type, high, &high_pos)) - { - warning (_("unable to get positions in array, use bounds instead")); - low_pos = low; - high_pos = high; - } - /* The array length should normally be HIGH_POS - LOW_POS + 1. But in Ada we allow LOW_POS to be greater than HIGH_POS for empty arrays. In that situation, the array length is just zero, not negative! */ - - if (low_pos > high_pos) - len = 0; - else - len = high_pos - low_pos + 1; + len = 0; } + else + len = high - low + 1; } + if (index_type->code () == TYPE_CODE_RANGE) + index_type = TYPE_TARGET_TYPE (index_type); + i = 0; annotate_array_section_begin (i, elttype); @@ -199,6 +173,11 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr, fprintf_filtered (stream, ", "); } } + else if (options->prettyformat_arrays) + { + fprintf_filtered (stream, "\n"); + print_spaces_filtered (2 + 2 * recurse, stream); + } wrap_here (n_spaces (2 + 2 * recurse)); maybe_print_array_index (index_type, i + low, stream, options); @@ -230,9 +209,7 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr, struct value_print_options opts = *options; opts.deref_ref = 0; - val_print (elttype, - value_embedded_offset (v0), 0, stream, - recurse + 1, v0, &opts, current_language); + common_val_print (v0, stream, recurse + 1, &opts, current_language); annotate_elt_rep (i - i0); fprintf_filtered (stream, _(" %p[%p]"), metadata_style.style ().ptr (), i - i0, nullptr); @@ -262,9 +239,8 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr, maybe_print_array_index (index_type, j + low, stream, options); } - val_print (elttype, - value_embedded_offset (v0), 0, stream, - recurse + 1, v0, &opts, current_language); + common_val_print (v0, stream, recurse + 1, &opts, + current_language); annotate_elt (); } } @@ -279,12 +255,6 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr, value_free_to_mark (mark); } -static struct type * -printable_val_type (struct type *type, const gdb_byte *valaddr) -{ - return ada_to_fixed_type (ada_aligned_type (type), valaddr, 0, NULL, 1); -} - /* Print the character C on STREAM as part of the contents of a literal string whose delimiter is QUOTER. TYPE_LEN is the length in bytes of the character. */ @@ -404,11 +374,11 @@ ada_print_scalar (struct type *type, LONGEST val, struct ui_file *stream) type = ada_check_typedef (type); - switch (TYPE_CODE (type)) + switch (type->code ()) { case TYPE_CODE_ENUM: - len = TYPE_NFIELDS (type); + len = type->num_fields (); for (i = 0; i < len; i++) { if (TYPE_FIELD_ENUMVAL (type, i) == val) @@ -564,39 +534,33 @@ ada_printstr (struct ui_file *stream, struct type *type, } static int -print_variant_part (struct type *type, int field_num, - const gdb_byte *valaddr, int offset, +print_variant_part (struct value *value, int field_num, + struct value *outer_value, struct ui_file *stream, int recurse, - struct value *val, const struct value_print_options *options, int comma_needed, - struct type *outer_type, int outer_offset, const struct language_defn *language) { - struct type *var_type = TYPE_FIELD_TYPE (type, field_num); - int which = ada_which_variant_applies (var_type, outer_type, - valaddr + outer_offset); + struct type *type = value_type (value); + struct type *var_type = type->field (field_num).type (); + int which = ada_which_variant_applies (var_type, outer_value); if (which < 0) return 0; - else - return print_field_values - (TYPE_FIELD_TYPE (var_type, which), - valaddr, - offset + TYPE_FIELD_BITPOS (type, field_num) / HOST_CHAR_BIT - + TYPE_FIELD_BITPOS (var_type, which) / HOST_CHAR_BIT, - stream, recurse, val, options, - comma_needed, outer_type, outer_offset, language); + + struct value *variant_field = value_field (value, field_num); + struct value *active_component = value_field (variant_field, which); + return print_field_values (active_component, outer_value, stream, recurse, + options, comma_needed, language); } -/* Print out fields of value at VALADDR + OFFSET having structure type TYPE. +/* Print out fields of VALUE. - TYPE, VALADDR, OFFSET, STREAM, RECURSE, and OPTIONS have the same - meanings as in ada_print_value and ada_val_print. + STREAM, RECURSE, and OPTIONS have the same meanings as in + ada_print_value and ada_value_print. - OUTER_TYPE and OUTER_OFFSET give type and address of enclosing - record (used to get discriminant values when printing variant - parts). + OUTER_VALUE gives the enclosing record (used to get discriminant + values when printing variant parts). COMMA_NEEDED is 1 if fields have been printed at the current recursion level, so that a comma is needed before any field printed by this @@ -605,17 +569,16 @@ print_variant_part (struct type *type, int field_num, Returns 1 if COMMA_NEEDED or any fields were printed. */ static int -print_field_values (struct type *type, const gdb_byte *valaddr, - int offset, struct ui_file *stream, int recurse, - struct value *val, +print_field_values (struct value *value, struct value *outer_value, + struct ui_file *stream, int recurse, const struct value_print_options *options, int comma_needed, - struct type *outer_type, int outer_offset, const struct language_defn *language) { int i, len; - len = TYPE_NFIELDS (type); + struct type *type = value_type (value); + len = type->num_fields (); for (i = 0; i < len; i += 1) { @@ -624,22 +587,19 @@ print_field_values (struct type *type, const gdb_byte *valaddr, if (ada_is_wrapper_field (type, i)) { + struct value *field_val = ada_value_primitive_field (value, 0, + i, type); comma_needed = - print_field_values (TYPE_FIELD_TYPE (type, i), - valaddr, - (offset - + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT), - stream, recurse, val, options, - comma_needed, type, offset, language); + print_field_values (field_val, field_val, + stream, recurse, options, + comma_needed, language); continue; } else if (ada_is_variant_part (type, i)) { comma_needed = - print_variant_part (type, i, valaddr, - offset, stream, recurse, val, - options, comma_needed, - outer_type, outer_offset, language); + print_variant_part (value, i, outer_value, stream, recurse, + options, comma_needed, language); continue; } @@ -657,7 +617,7 @@ print_field_values (struct type *type, const gdb_byte *valaddr, wrap_here (n_spaces (2 + 2 * recurse)); } - annotate_field_begin (TYPE_FIELD_TYPE (type, i)); + annotate_field_begin (type->field (i).type ()); fprintf_filtered (stream, "%.*s", ada_name_prefix_len (TYPE_FIELD_NAME (type, i)), TYPE_FIELD_NAME (type, i)); @@ -681,18 +641,15 @@ print_field_values (struct type *type, const gdb_byte *valaddr, int bit_size = TYPE_FIELD_BITSIZE (type, i); struct value_print_options opts; - adjust_type_signedness (TYPE_FIELD_TYPE (type, i)); + adjust_type_signedness (type->field (i).type ()); v = ada_value_primitive_packed_val - (NULL, valaddr, - offset + bit_pos / HOST_CHAR_BIT, + (value, nullptr, + bit_pos / HOST_CHAR_BIT, bit_pos % HOST_CHAR_BIT, - bit_size, TYPE_FIELD_TYPE (type, i)); + bit_size, type->field (i).type ()); opts = *options; opts.deref_ref = 0; - val_print (TYPE_FIELD_TYPE (type, i), - value_embedded_offset (v), 0, - stream, recurse + 1, v, - &opts, language); + common_val_print (v, stream, recurse + 1, &opts, language); } } else @@ -700,9 +657,9 @@ print_field_values (struct type *type, const gdb_byte *valaddr, struct value_print_options opts = *options; opts.deref_ref = 0; - val_print (TYPE_FIELD_TYPE (type, i), - (offset + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT), - 0, stream, recurse + 1, val, &opts, language); + + struct value *v = value_field (value, i); + common_val_print (v, stream, recurse + 1, &opts, language); } annotate_field_end (); } @@ -715,9 +672,8 @@ print_field_values (struct type *type, const gdb_byte *valaddr, static void ada_val_print_string (struct type *type, const gdb_byte *valaddr, - int offset, int offset_aligned, CORE_ADDR address, + int offset_aligned, struct ui_file *stream, int recurse, - struct value *original_value, const struct value_print_options *options) { enum bfd_endian byte_order = type_byte_order (type); @@ -735,9 +691,6 @@ ada_val_print_string (struct type *type, const gdb_byte *valaddr, eltlen = TYPE_LENGTH (elttype); len = TYPE_LENGTH (type) / eltlen; - if (options->prettyformat_arrays) - print_spaces_filtered (2 + 2 * recurse, stream); - /* If requested, look for the first null char and only print elements up to it. */ if (options->stop_print_at_null) @@ -774,13 +727,13 @@ ada_val_print_gnat_array (struct value *val, of the case where ADDRESS is meaningless because original_value was not an lval. */ val = coerce_ref (val); - if (TYPE_CODE (type) == TYPE_CODE_TYPEDEF) /* array access type. */ + if (type->code () == TYPE_CODE_TYPEDEF) /* array access type. */ val = ada_coerce_to_simple_array_ptr (val); else val = ada_coerce_to_simple_array (val); if (val == NULL) { - gdb_assert (TYPE_CODE (type) == TYPE_CODE_TYPEDEF); + gdb_assert (type->code () == TYPE_CODE_TYPEDEF); fprintf_filtered (stream, "0x0"); } else @@ -788,32 +741,6 @@ ada_val_print_gnat_array (struct value *val, language_def (language_ada)); } -/* Implement Ada val_print'ing for the case where TYPE is - a TYPE_CODE_PTR. */ - -static void -ada_val_print_ptr (struct type *type, const gdb_byte *valaddr, - int offset, int offset_aligned, CORE_ADDR address, - struct ui_file *stream, int recurse, - struct value *original_value, - const struct value_print_options *options) -{ - val_print (type, offset, address, stream, recurse, - original_value, options, language_def (language_c)); - - if (ada_is_tag_type (type)) - { - struct value *val = - value_from_contents_and_address (type, - valaddr + offset_aligned, - address + offset_aligned); - const char *name = ada_tag_name (val); - - if (name != NULL) - fprintf_filtered (stream, " (%s)", name); - } -} - /* Implement Ada value_print'ing for the case where TYPE is a TYPE_CODE_PTR. */ @@ -827,113 +754,10 @@ ada_value_print_ptr (struct value *val, struct type *type = ada_check_typedef (value_type (val)); if (ada_is_tag_type (type)) { - const char *name = ada_tag_name (val); + gdb::unique_xmalloc_ptr name = ada_tag_name (val); if (name != NULL) - fprintf_filtered (stream, " (%s)", name); - } -} - -/* Implement Ada val_print'ing for the case where TYPE is - a TYPE_CODE_INT or TYPE_CODE_RANGE. */ - -static void -ada_val_print_num (struct type *type, const gdb_byte *valaddr, - int offset, int offset_aligned, CORE_ADDR address, - struct ui_file *stream, int recurse, - struct value *original_value, - const struct value_print_options *options) -{ - if (ada_is_fixed_point_type (type)) - { - struct value *scale = ada_scaling_factor (type); - struct value *v = value_from_contents (type, valaddr + offset_aligned); - v = value_cast (value_type (scale), v); - v = value_binop (v, scale, BINOP_MUL); - - const char *fmt = TYPE_LENGTH (type) < 4 ? "%.11g" : "%.17g"; - std::string str - = target_float_to_string (value_contents (v), value_type (v), fmt); - fputs_filtered (str.c_str (), stream); - return; - } - else if (TYPE_CODE (type) == TYPE_CODE_RANGE - && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ENUM - || TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_BOOL - || TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CHAR)) - { - /* For enum-valued ranges, we want to recurse, because we'll end - up printing the constant's name rather than its numeric - value. Character and fixed-point types are also printed - differently, so recuse for those as well. */ - struct type *target_type = TYPE_TARGET_TYPE (type); - - if (TYPE_LENGTH (type) != TYPE_LENGTH (target_type)) - { - /* Obscure case of range type that has different length from - its base type. Perform a conversion, or we will get a - nonsense value. Actually, we could use the same - code regardless of lengths; I'm just avoiding a cast. */ - struct value *v1 - = value_from_contents_and_address (type, valaddr + offset, 0); - struct value *v = value_cast (target_type, v1); - - val_print (target_type, - value_embedded_offset (v), 0, stream, - recurse + 1, v, options, - language_def (language_ada)); - } - else - val_print (TYPE_TARGET_TYPE (type), offset, - address, stream, recurse, original_value, - options, language_def (language_ada)); - return; - } - else - { - int format = (options->format ? options->format - : options->output_format); - - if (format) - { - struct value_print_options opts = *options; - - opts.format = format; - val_print_scalar_formatted (type, offset_aligned, - original_value, &opts, 0, stream); - } - else if (ada_is_system_address_type (type)) - { - /* FIXME: We want to print System.Address variables using - the same format as for any access type. But for some - reason GNAT encodes the System.Address type as an int, - so we have to work-around this deficiency by handling - System.Address values as a special case. */ - - struct gdbarch *gdbarch = get_type_arch (type); - struct type *ptr_type = builtin_type (gdbarch)->builtin_data_ptr; - CORE_ADDR addr = extract_typed_address (valaddr + offset_aligned, - ptr_type); - - fprintf_filtered (stream, "("); - type_print (type, "", stream, -1); - fprintf_filtered (stream, ") "); - fputs_filtered (paddress (gdbarch, addr), stream); - } - else - { - val_print_scalar_formatted (type, offset_aligned, - original_value, options, 0, stream); - if (ada_is_character_type (type)) - { - LONGEST c; - - fputs_filtered (" ", stream); - c = unpack_long (type, valaddr + offset_aligned); - ada_printchar (c, type, stream); - } - } - return; + fprintf_filtered (stream, " (%s)", name.get ()); } } @@ -947,7 +771,7 @@ ada_value_print_num (struct value *val, struct ui_file *stream, int recurse, struct type *type = ada_check_typedef (value_type (val)); const gdb_byte *valaddr = value_contents_for_printing (val); - if (ada_is_fixed_point_type (type)) + if (ada_is_gnat_encoded_fixed_point_type (type)) { struct value *scale = ada_scaling_factor (type); val = value_cast (value_type (scale), val); @@ -959,10 +783,10 @@ ada_value_print_num (struct value *val, struct ui_file *stream, int recurse, fputs_filtered (str.c_str (), stream); return; } - else if (TYPE_CODE (type) == TYPE_CODE_RANGE - && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ENUM - || TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_BOOL - || TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CHAR)) + else if (type->code () == TYPE_CODE_RANGE + && (TYPE_TARGET_TYPE (type)->code () == TYPE_CODE_ENUM + || TYPE_TARGET_TYPE (type)->code () == TYPE_CODE_BOOL + || TYPE_TARGET_TYPE (type)->code () == TYPE_CODE_CHAR)) { /* For enum-valued ranges, we want to recurse, because we'll end up printing the constant's name rather than its numeric @@ -1023,10 +847,7 @@ ada_value_print_num (struct value *val, struct ui_file *stream, int recurse, a TYPE_CODE_ENUM. */ static void -ada_val_print_enum (struct type *type, const gdb_byte *valaddr, - int offset, int offset_aligned, CORE_ADDR address, - struct ui_file *stream, int recurse, - struct value *original_value, +ada_val_print_enum (struct value *value, struct ui_file *stream, int recurse, const struct value_print_options *options) { int i; @@ -1035,12 +856,15 @@ ada_val_print_enum (struct type *type, const gdb_byte *valaddr, if (options->format) { - val_print_scalar_formatted (type, offset_aligned, - original_value, options, 0, stream); + value_print_scalar_formatted (value, options, 0, stream); return; } - len = TYPE_NFIELDS (type); + struct type *type = ada_check_typedef (value_type (value)); + const gdb_byte *valaddr = value_contents_for_printing (value); + int offset_aligned = ada_aligned_value_addr (type, valaddr) - valaddr; + + len = type->num_fields (); val = unpack_long (type, valaddr + offset_aligned); for (i = 0; i < len; i++) { @@ -1064,37 +888,16 @@ ada_val_print_enum (struct type *type, const gdb_byte *valaddr, print_longest (stream, 'd', 0, val); } -/* Implement Ada val_print'ing for the case where TYPE is - a TYPE_CODE_FLT. */ +/* Implement Ada val_print'ing for the case where the type is + TYPE_CODE_STRUCT or TYPE_CODE_UNION. */ static void -ada_val_print_flt (struct type *type, const gdb_byte *valaddr, - int offset, int offset_aligned, CORE_ADDR address, - struct ui_file *stream, int recurse, - struct value *original_value, - const struct value_print_options *options) +ada_val_print_struct_union (struct value *value, + struct ui_file *stream, + int recurse, + const struct value_print_options *options) { - if (options->format) - { - val_print (type, offset, address, stream, recurse, - original_value, options, language_def (language_c)); - return; - } - - ada_print_floating (valaddr + offset, type, stream); -} - -/* Implement Ada val_print'ing for the case where TYPE is - a TYPE_CODE_STRUCT or TYPE_CODE_UNION. */ - -static void -ada_val_print_struct_union - (struct type *type, const gdb_byte *valaddr, int offset, - int offset_aligned, CORE_ADDR address, struct ui_file *stream, - int recurse, struct value *original_value, - const struct value_print_options *options) -{ - if (ada_is_bogus_array_descriptor (type)) + if (ada_is_bogus_array_descriptor (value_type (value))) { fprintf_filtered (stream, "(...?)"); return; @@ -1102,10 +905,8 @@ ada_val_print_struct_union fprintf_filtered (stream, "("); - if (print_field_values (type, valaddr, offset_aligned, - stream, recurse, original_value, options, - 0, type, offset_aligned, - language_def (language_ada)) != 0 + if (print_field_values (value, value, stream, recurse, options, + 0, language_def (language_ada)) != 0 && options->prettyformat) { fprintf_filtered (stream, "\n"); @@ -1115,22 +916,23 @@ ada_val_print_struct_union fprintf_filtered (stream, ")"); } -/* Implement Ada val_print'ing for the case where TYPE is - a TYPE_CODE_ARRAY. */ +/* Implement Ada value_print'ing for the case where TYPE is a + TYPE_CODE_ARRAY. */ static void -ada_val_print_array (struct type *type, const gdb_byte *valaddr, - int offset, int offset_aligned, CORE_ADDR address, - struct ui_file *stream, int recurse, - struct value *original_value, - const struct value_print_options *options) +ada_value_print_array (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) { + struct type *type = ada_check_typedef (value_type (val)); + /* For an array of characters, print with string syntax. */ if (ada_is_string_type (type) && (options->format == 0 || options->format == 's')) { - ada_val_print_string (type, valaddr, offset, offset_aligned, - address, stream, recurse, original_value, + const gdb_byte *valaddr = value_contents_for_printing (val); + int offset_aligned = ada_aligned_value_addr (type, valaddr) - valaddr; + + ada_val_print_string (type, valaddr, offset_aligned, stream, recurse, options); return; } @@ -1138,13 +940,14 @@ ada_val_print_array (struct type *type, const gdb_byte *valaddr, fprintf_filtered (stream, "("); print_optional_low_bound (stream, type, options); if (TYPE_FIELD_BITSIZE (type, 0) > 0) - val_print_packed_array_elements (type, valaddr, offset_aligned, - 0, stream, recurse, - original_value, options); + { + const gdb_byte *valaddr = value_contents_for_printing (val); + int offset_aligned = ada_aligned_value_addr (type, valaddr) - valaddr; + val_print_packed_array_elements (type, valaddr, offset_aligned, + stream, recurse, options); + } else - val_print_array_elements (type, offset_aligned, address, - stream, recurse, original_value, - options, 0); + value_print_array_elements (val, stream, recurse, options, 0); fprintf_filtered (stream, ")"); } @@ -1167,7 +970,7 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr, struct value *deref_val; CORE_ADDR deref_val_int; - if (TYPE_CODE (elttype) == TYPE_CODE_UNDEF) + if (elttype->code () == TYPE_CODE_UNDEF) { fputs_styled ("", metadata_style.style (), stream); @@ -1211,113 +1014,6 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr, options, language_def (language_ada)); } -/* See the comment on ada_val_print. This function differs in that it - does not catch evaluation errors (leaving that to ada_val_print). */ - -static void -ada_val_print_1 (struct type *type, - int offset, CORE_ADDR address, - struct ui_file *stream, int recurse, - struct value *original_value, - const struct value_print_options *options) -{ - int offset_aligned; - const gdb_byte *valaddr = value_contents_for_printing (original_value); - - type = ada_check_typedef (type); - - if (ada_is_array_descriptor_type (type) - || (ada_is_constrained_packed_array_type (type) - && TYPE_CODE (type) != TYPE_CODE_PTR)) - { - struct value *val = value_from_contents_and_address (type, - valaddr + offset, - address); - ada_val_print_gnat_array (val, stream, recurse, options); - return; - } - - offset_aligned = offset + ada_aligned_value_addr (type, valaddr) - valaddr; - type = printable_val_type (type, valaddr + offset_aligned); - type = resolve_dynamic_type (type, valaddr + offset_aligned, - address + offset_aligned); - - switch (TYPE_CODE (type)) - { - default: - val_print (type, offset, address, stream, recurse, - original_value, options, language_def (language_c)); - break; - - case TYPE_CODE_PTR: - ada_val_print_ptr (type, valaddr, offset, offset_aligned, - address, stream, recurse, original_value, - options); - break; - - case TYPE_CODE_INT: - case TYPE_CODE_RANGE: - ada_val_print_num (type, valaddr, offset, offset_aligned, - address, stream, recurse, original_value, - options); - break; - - case TYPE_CODE_ENUM: - ada_val_print_enum (type, valaddr, offset, offset_aligned, - address, stream, recurse, original_value, - options); - break; - - case TYPE_CODE_FLT: - ada_val_print_flt (type, valaddr, offset, offset_aligned, - address, stream, recurse, original_value, - options); - break; - - case TYPE_CODE_UNION: - case TYPE_CODE_STRUCT: - ada_val_print_struct_union (type, valaddr, offset, offset_aligned, - address, stream, recurse, - original_value, options); - break; - - case TYPE_CODE_ARRAY: - ada_val_print_array (type, valaddr, offset, offset_aligned, - address, stream, recurse, original_value, - options); - return; - - case TYPE_CODE_REF: - ada_val_print_ref (type, valaddr, offset, offset_aligned, - address, stream, recurse, original_value, - options); - break; - } -} - -/* See val_print for a description of the various parameters of this - function; they are identical. */ - -void -ada_val_print (struct type *type, - int embedded_offset, CORE_ADDR address, - struct ui_file *stream, int recurse, - struct value *val, - const struct value_print_options *options) -{ - try - { - ada_val_print_1 (type, embedded_offset, address, - stream, recurse, val, options); - } - catch (const gdb_exception_error &except) - { - fprintf_styled (stream, metadata_style.style (), - _(""), - except.what ()); - } -} - /* See the comment on ada_value_print. This function differs in that it does not catch evaluation errors (leaving that to ada_value_print). */ @@ -1330,7 +1026,7 @@ ada_value_print_1 (struct value *val, struct ui_file *stream, int recurse, if (ada_is_array_descriptor_type (type) || (ada_is_constrained_packed_array_type (type) - && TYPE_CODE (type) != TYPE_CODE_PTR)) + && type->code () != TYPE_CODE_PTR)) { ada_val_print_gnat_array (val, stream, recurse, options); return; @@ -1342,14 +1038,16 @@ ada_value_print_1 (struct value *val, struct ui_file *stream, int recurse, const gdb_byte *valaddr = value_contents_for_printing (val); CORE_ADDR address = value_address (val); - type = ada_check_typedef (resolve_dynamic_type (type, valaddr, address)); + gdb::array_view view + = gdb::make_array_view (valaddr, TYPE_LENGTH (type)); + type = ada_check_typedef (resolve_dynamic_type (type, view, address)); if (type != saved_type) { val = value_copy (val); deprecated_set_value_type (val, type); } - switch (TYPE_CODE (type)) + switch (type->code ()) { default: common_val_print (val, stream, recurse, options, @@ -1366,9 +1064,7 @@ ada_value_print_1 (struct value *val, struct ui_file *stream, int recurse, break; case TYPE_CODE_ENUM: - ada_val_print_enum (type, valaddr, 0, 0, - address, stream, recurse, val, - options); + ada_val_print_enum (val, stream, recurse, options); break; case TYPE_CODE_FLT: @@ -1384,15 +1080,11 @@ ada_value_print_1 (struct value *val, struct ui_file *stream, int recurse, case TYPE_CODE_UNION: case TYPE_CODE_STRUCT: - ada_val_print_struct_union (type, valaddr, 0, 0, - address, stream, recurse, - val, options); + ada_val_print_struct_union (val, stream, recurse, options); break; case TYPE_CODE_ARRAY: - ada_val_print_array (type, valaddr, 0, 0, - address, stream, recurse, val, - options); + ada_value_print_array (val, stream, recurse, options); return; case TYPE_CODE_REF: @@ -1427,17 +1119,16 @@ ada_value_print (struct value *val0, struct ui_file *stream, const struct value_print_options *options) { struct value *val = ada_to_fixed_value (val0); - CORE_ADDR address = value_address (val); struct type *type = ada_check_typedef (value_type (val)); struct value_print_options opts; /* If it is a pointer, indicate what it points to. */ - if (TYPE_CODE (type) == TYPE_CODE_PTR) + if (type->code () == TYPE_CODE_PTR) { /* Hack: don't print (char *) for char strings. Their type is indicated by the quoted string anyway. */ if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) != sizeof (char) - || TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_INT + || TYPE_TARGET_TYPE (type)->code () != TYPE_CODE_INT || TYPE_UNSIGNED (TYPE_TARGET_TYPE (type))) { fprintf_filtered (stream, "("); @@ -1450,7 +1141,7 @@ ada_value_print (struct value *val0, struct ui_file *stream, /* We do not print the type description unless TYPE is an array access type (this is encoded by the compiler as a typedef to a fat pointer - hence the check against TYPE_CODE_TYPEDEF). */ - if (TYPE_CODE (type) == TYPE_CODE_TYPEDEF) + if (type->code () == TYPE_CODE_TYPEDEF) { fprintf_filtered (stream, "("); type_print (type, "", stream, -1); @@ -1467,7 +1158,5 @@ ada_value_print (struct value *val0, struct ui_file *stream, opts = *options; opts.deref_ref = 1; - val_print (type, - value_embedded_offset (val), address, - stream, 0, val, &opts, current_language); + common_val_print (val, stream, 0, &opts, current_language); }