X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fada-valprint.c;h=f2aed32cc8635dea16b5fa160cafc9343bfa505d;hb=4762f10bd5ccd005a3a2e8d04168ecddd37f323a;hp=6b4b6d47e62629e07a0cef53bd365c8e9d3731f8;hpb=618f726fcb851883a0094aa7fa17003889b7189f;p=external%2Fbinutils.git diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index 6b4b6d4..f2aed32 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -1,6 +1,6 @@ /* Support for printing Ada 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. @@ -31,11 +31,12 @@ #include "c-lang.h" #include "infcall.h" #include "objfiles.h" +#include "target-float.h" static int print_field_values (struct type *, const gdb_byte *, int, struct ui_file *, int, - const struct value *, + struct value *, const struct value_print_options *, int, struct type *, int, const struct language_defn *); @@ -87,9 +88,11 @@ print_optional_low_bound (struct ui_file *stream, struct type *type, index_type = TYPE_TARGET_TYPE (index_type); } + /* Don't print the lower bound if it's the default one. */ switch (TYPE_CODE (index_type)) { case TYPE_CODE_BOOL: + case TYPE_CODE_CHAR: if (low_bound == 0) return 0; break; @@ -122,7 +125,7 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr, int offset, int bitoffset, struct ui_file *stream, int recurse, - const struct value *val, + struct value *val, const struct value_print_options *options) { unsigned int i; @@ -138,11 +141,45 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr, { 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) + { + 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; + } } i = 0; @@ -196,7 +233,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_contents_for_printing (v0), + val_print (elttype, value_embedded_offset (v0), 0, stream, recurse + 1, v0, &opts, current_language); annotate_elt_rep (i - i0); @@ -227,7 +264,7 @@ 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_contents_for_printing (v0), + val_print (elttype, value_embedded_offset (v0), 0, stream, recurse + 1, v0, &opts, current_language); annotate_elt (); @@ -298,51 +335,49 @@ static void ada_print_floating (const gdb_byte *valaddr, struct type *type, struct ui_file *stream) { - char *s, *result; - struct ui_file *tmp_stream = mem_fileopen (); - struct cleanup *cleanups = make_cleanup_ui_file_delete (tmp_stream); + string_file tmp_stream; - print_floating (valaddr, type, tmp_stream); - result = ui_file_xstrdup (tmp_stream, NULL); - make_cleanup (xfree, result); + print_floating (valaddr, type, &tmp_stream); + + std::string &s = tmp_stream.string (); + size_t skip_count = 0; /* Modify for Ada rules. */ - s = strstr (result, "inf"); - if (s == NULL) - s = strstr (result, "Inf"); - if (s == NULL) - s = strstr (result, "INF"); - if (s != NULL) - strcpy (s, "Inf"); + size_t pos = s.find ("inf"); + if (pos == std::string::npos) + pos = s.find ("Inf"); + if (pos == std::string::npos) + pos = s.find ("INF"); + if (pos != std::string::npos) + s.replace (pos, 3, "Inf"); - if (s == NULL) + if (pos == std::string::npos) { - s = strstr (result, "nan"); - if (s == NULL) - s = strstr (result, "NaN"); - if (s == NULL) - s = strstr (result, "Nan"); - if (s != NULL) + pos = s.find ("nan"); + if (pos == std::string::npos) + pos = s.find ("NaN"); + if (pos == std::string::npos) + pos = s.find ("Nan"); + if (pos != std::string::npos) { - s[0] = s[2] = 'N'; - if (result[0] == '-') - result += 1; + s[pos] = s[pos + 2] = 'N'; + if (s[0] == '-') + skip_count = 1; } } - if (s == NULL && strchr (result, '.') == NULL) + if (pos == std::string::npos + && s.find ('.') == std::string::npos) { - s = strchr (result, 'e'); - if (s == NULL) - fprintf_filtered (stream, "%s.0", result); + pos = s.find ('e'); + if (pos == std::string::npos) + fprintf_filtered (stream, "%s.0", s.c_str ()); else - fprintf_filtered (stream, "%.*s.0%s", (int) (s-result), result, s); + fprintf_filtered (stream, "%.*s.0%s", (int) pos, s.c_str (), &s[pos]); } else - fprintf_filtered (stream, "%s", result); - - do_cleanups (cleanups); + fprintf_filtered (stream, "%s", &s[skip_count]); } void @@ -533,7 +568,7 @@ static int print_variant_part (struct type *type, int field_num, const gdb_byte *valaddr, int offset, struct ui_file *stream, int recurse, - const struct value *val, + struct value *val, const struct value_print_options *options, int comma_needed, struct type *outer_type, int outer_offset, @@ -573,7 +608,7 @@ print_variant_part (struct type *type, int field_num, static int print_field_values (struct type *type, const gdb_byte *valaddr, int offset, struct ui_file *stream, int recurse, - const struct value *val, + struct value *val, const struct value_print_options *options, int comma_needed, struct type *outer_type, int outer_offset, @@ -633,8 +668,6 @@ print_field_values (struct type *type, const gdb_byte *valaddr, if (TYPE_FIELD_PACKED (type, i)) { - struct value *v; - /* Bitfields require special handling, especially due to byte order problems. */ if (HAVE_CPLUS_STRUCT (type) && TYPE_FIELD_IGNORE (type, i)) @@ -643,6 +676,7 @@ print_field_values (struct type *type, const gdb_byte *valaddr, } else { + struct value *v; int bit_pos = TYPE_FIELD_BITPOS (type, i); int bit_size = TYPE_FIELD_BITSIZE (type, i); struct value_print_options opts; @@ -656,7 +690,6 @@ print_field_values (struct type *type, const gdb_byte *valaddr, opts = *options; opts.deref_ref = 0; val_print (TYPE_FIELD_TYPE (type, i), - value_contents_for_printing (v), value_embedded_offset (v), 0, stream, recurse + 1, v, &opts, language); @@ -667,7 +700,7 @@ 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), valaddr, + val_print (TYPE_FIELD_TYPE (type, i), (offset + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT), 0, stream, recurse + 1, val, &opts, language); } @@ -684,7 +717,7 @@ static void ada_val_print_string (struct type *type, const gdb_byte *valaddr, int offset, int offset_aligned, CORE_ADDR address, struct ui_file *stream, int recurse, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options) { enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type)); @@ -732,7 +765,7 @@ static void ada_val_print_gnat_array (struct type *type, const gdb_byte *valaddr, int 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, const struct language_defn *language) { @@ -754,7 +787,7 @@ ada_val_print_gnat_array (struct type *type, const gdb_byte *valaddr, fprintf_filtered (stream, "0x0"); } else - val_print (value_type (val), value_contents_for_printing (val), + val_print (value_type (val), value_embedded_offset (val), value_address (val), stream, recurse, val, options, language); value_free_to_mark (mark); @@ -767,11 +800,11 @@ 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, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options, const struct language_defn *language) { - val_print (type, valaddr, offset, address, stream, recurse, + val_print (type, offset, address, stream, recurse, original_value, options, language_def (language_c)); if (ada_is_tag_type (type)) @@ -794,16 +827,21 @@ 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, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options, const struct language_defn *language) { if (ada_is_fixed_point_type (type)) { - LONGEST v = unpack_long (type, valaddr + offset_aligned); - - fprintf_filtered (stream, TYPE_LENGTH (type) < 4 ? "%.11g" : "%.17g", - (double) ada_fixed_to_float (type, v)); + 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) @@ -820,12 +858,12 @@ ada_val_print_num (struct type *type, const gdb_byte *valaddr, = value_from_contents_and_address (type, valaddr + offset, 0); struct value *v = value_cast (target_type, v1); - val_print (target_type, value_contents_for_printing (v), + val_print (target_type, value_embedded_offset (v), 0, stream, recurse + 1, v, options, language); } else - val_print (TYPE_TARGET_TYPE (type), valaddr, offset, + val_print (TYPE_TARGET_TYPE (type), offset, address, stream, recurse, original_value, options, language); return; @@ -840,7 +878,7 @@ ada_val_print_num (struct type *type, const gdb_byte *valaddr, struct value_print_options opts = *options; opts.format = format; - val_print_scalar_formatted (type, valaddr, offset_aligned, + val_print_scalar_formatted (type, offset_aligned, original_value, &opts, 0, stream); } else if (ada_is_system_address_type (type)) @@ -863,7 +901,8 @@ ada_val_print_num (struct type *type, const gdb_byte *valaddr, } else { - val_print_type_code_int (type, valaddr + offset_aligned, stream); + val_print_scalar_formatted (type, offset_aligned, + original_value, options, 0, stream); if (ada_is_character_type (type)) { LONGEST c; @@ -884,7 +923,7 @@ 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, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options, const struct language_defn *language) { @@ -894,7 +933,7 @@ ada_val_print_enum (struct type *type, const gdb_byte *valaddr, if (options->format) { - val_print_scalar_formatted (type, valaddr, offset_aligned, + val_print_scalar_formatted (type, offset_aligned, original_value, options, 0, stream); return; } @@ -928,13 +967,13 @@ 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, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options, const struct language_defn *language) { if (options->format) { - val_print (type, valaddr, offset, address, stream, recurse, + val_print (type, offset, address, stream, recurse, original_value, options, language_def (language_c)); return; } @@ -949,7 +988,7 @@ 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, const struct value *original_value, + int recurse, struct value *original_value, const struct value_print_options *options, const struct language_defn *language) { @@ -980,7 +1019,7 @@ 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, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options) { /* For an array of characters, print with string syntax. */ @@ -1000,7 +1039,7 @@ ada_val_print_array (struct type *type, const gdb_byte *valaddr, 0, stream, recurse, original_value, options); else - val_print_array_elements (type, valaddr, offset_aligned, address, + val_print_array_elements (type, offset_aligned, address, stream, recurse, original_value, options, 0); fprintf_filtered (stream, ")"); @@ -1013,7 +1052,7 @@ static void ada_val_print_ref (struct type *type, const gdb_byte *valaddr, int offset, int offset_aligned, CORE_ADDR address, struct ui_file *stream, int recurse, - const struct value *original_value, + struct value *original_value, const struct value_print_options *options, const struct language_defn *language) { @@ -1062,8 +1101,10 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr, (Eg: an array whose bounds are not set yet). */ ada_ensure_varsize_limit (value_type (deref_val)); + if (value_lazy (deref_val)) + value_fetch_lazy (deref_val); + val_print (value_type (deref_val), - value_contents_for_printing (deref_val), value_embedded_offset (deref_val), value_address (deref_val), stream, recurse + 1, deref_val, options, language); @@ -1073,14 +1114,15 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr, does not catch evaluation errors (leaving that to ada_val_print). */ static void -ada_val_print_1 (struct type *type, const gdb_byte *valaddr, +ada_val_print_1 (struct type *type, int 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, const struct language_defn *language) { int offset_aligned; + const gdb_byte *valaddr = value_contents_for_printing (original_value); type = ada_check_typedef (type); @@ -1102,7 +1144,7 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr, switch (TYPE_CODE (type)) { default: - val_print (type, valaddr, offset, address, stream, recurse, + val_print (type, offset, address, stream, recurse, original_value, options, language_def (language_c)); break; @@ -1156,22 +1198,22 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr, function; they are identical. */ void -ada_val_print (struct type *type, const gdb_byte *valaddr, +ada_val_print (struct type *type, int embedded_offset, CORE_ADDR address, struct ui_file *stream, int recurse, - const struct value *val, + struct value *val, const struct value_print_options *options) { - - /* XXX: this catches QUIT/ctrl-c as well. Isn't that busted? */ TRY { - ada_val_print_1 (type, valaddr, embedded_offset, address, + ada_val_print_1 (type, embedded_offset, address, stream, recurse, val, options, current_language); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { + fprintf_filtered (stream, _(""), + except.message); } END_CATCH } @@ -1182,7 +1224,7 @@ ada_value_print (struct value *val0, struct ui_file *stream, { struct value *val = ada_to_fixed_value (val0); CORE_ADDR address = value_address (val); - struct type *type = ada_check_typedef (value_enclosing_type (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. */ @@ -1221,7 +1263,7 @@ ada_value_print (struct value *val0, struct ui_file *stream, opts = *options; opts.deref_ref = 1; - val_print (type, value_contents_for_printing (val), + val_print (type, value_embedded_offset (val), address, stream, 0, val, &opts, current_language); }