diff options
author | Tom Tromey <tom@tromey.com> | 2020-03-13 17:39:52 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2020-03-13 18:03:42 -0600 |
commit | 426a9c18dddcdd5f640b702734dd8f9c108b7372 (patch) | |
tree | d9ba80f648c60ab6d3a95de00187889200459f8f /gdb/m2-valprint.c | |
parent | 42331a1ea2a13ce15ec202c5f0fbef3e5171253c (diff) | |
download | gdb-426a9c18dddcdd5f640b702734dd8f9c108b7372.zip gdb-426a9c18dddcdd5f640b702734dd8f9c108b7372.tar.gz gdb-426a9c18dddcdd5f640b702734dd8f9c108b7372.tar.bz2 |
Remove val_print
We can finally remove val_print and various helper functions that are
no longer needed.
gdb/ChangeLog
2020-03-13 Tom Tromey <tom@tromey.com>
* value.h (val_print): Don't declare.
* valprint.h (val_print_array_elements)
(val_print_scalar_formatted, generic_val_print): Don't declare.
* valprint.c (generic_val_print_array): Take a struct value.
(generic_val_print_ptr, generic_val_print_memberptr)
(generic_val_print_bool, generic_val_print_int)
(generic_val_print_char, generic_val_print_complex)
(generic_val_print): Remove.
(generic_value_print): Update.
(do_val_print): Remove unused parameters. Don't call
la_val_print.
(val_print): Remove.
(common_val_print): Update. Don't call value_check_printable.
(val_print_scalar_formatted, val_print_array_elements): Remove.
* rust-lang.c (rust_val_print): Remove.
(rust_language_defn): Update.
* p-valprint.c (pascal_val_print): Remove.
(pascal_value_print_inner): Update.
(pascal_object_print_val_fields, pascal_object_print_val):
Remove.
(pascal_object_print_static_field): Update.
* p-lang.h (pascal_val_print): Don't declare.
* p-lang.c (pascal_language_defn): Update.
* opencl-lang.c (opencl_language_defn): Update.
* objc-lang.c (objc_language_defn): Update.
* m2-valprint.c (m2_print_unbounded_array, m2_val_print): Remove.
* m2-lang.h (m2_val_print): Don't declare.
* m2-lang.c (m2_language_defn): Update.
* language.h (struct language_defn) <la_val_print>: Remove.
* language.c (unk_lang_value_print_inner): Rename. Change
argument types.
(unknown_language_defn, auto_language_defn): Update.
* go-valprint.c (go_val_print): Remove.
* go-lang.h (go_val_print): Don't declare.
* go-lang.c (go_language_defn): Update.
* f-valprint.c (f_val_print): Remove.
* f-lang.h (f_value_print): Don't declare.
* f-lang.c (f_language_defn): Update.
* d-valprint.c (d_val_print): Remove.
* d-lang.h (d_value_print): Don't declare.
* d-lang.c (d_language_defn): Update.
* cp-valprint.c (cp_print_value_fields)
(cp_print_value_fields_rtti, cp_print_value): Remove.
(cp_print_static_field): Update.
* c-valprint.c (c_val_print_array, c_val_print_ptr)
(c_val_print_struct, c_val_print_union, c_val_print_int)
(c_val_print_memberptr, c_val_print): Remove.
* c-lang.h (c_val_print_array, cp_print_value_fields)
(cp_print_value_fields_rtti): Don't declare.
* c-lang.c (c_language_defn, cplus_language_defn)
(asm_language_defn, minimal_language_defn): Update.
* ada-valprint.c (ada_val_print_ptr, ada_val_print_num): Remove.
(ada_val_print_enum): Take a struct value.
(ada_val_print_flt, ada_val_print_array, ada_val_print_1)
(ada_val_print): Remove.
(ada_value_print_1): Update.
(printable_val_type): Remove.
* ada-lang.h (ada_val_print): Don't declare.
* ada-lang.c (ada_language_defn): Update.
Diffstat (limited to 'gdb/m2-valprint.c')
-rw-r--r-- | gdb/m2-valprint.c | 223 |
1 files changed, 0 insertions, 223 deletions
diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c index facd15e..844a63f 100644 --- a/gdb/m2-valprint.c +++ b/gdb/m2-valprint.c @@ -181,31 +181,6 @@ m2_print_unbounded_array (struct value *value, fprintf_filtered (stream, ", HIGH = %d}", (int) len); } -static void -m2_print_unbounded_array (struct type *type, const gdb_byte *valaddr, - int embedded_offset, CORE_ADDR address, - struct ui_file *stream, int recurse, - const struct value_print_options *options) -{ - CORE_ADDR addr; - LONGEST len; - struct value *val; - - type = check_typedef (type); - - addr = unpack_pointer (TYPE_FIELD_TYPE (type, 0), - (TYPE_FIELD_BITPOS (type, 0) / 8) + - valaddr + embedded_offset); - - val = value_at_lazy (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 0)), - addr); - len = unpack_field_as_long (type, valaddr + embedded_offset, 1); - - fprintf_filtered (stream, "{"); - m2_print_array_contents (val, stream, recurse, options, len); - fprintf_filtered (stream, ", HIGH = %d}", (int) len); -} - static int print_unpacked_pointer (struct type *type, CORE_ADDR address, CORE_ADDR addr, @@ -323,204 +298,6 @@ static const struct generic_val_print_decorations m2_decorations = "}" }; -/* See val_print for a description of the various parameters of this - function; they are identical. */ - -void -m2_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) -{ - unsigned len; - struct type *elttype; - CORE_ADDR addr; - const gdb_byte *valaddr = value_contents_for_printing (original_value); - - type = check_typedef (type); - switch (TYPE_CODE (type)) - { - case TYPE_CODE_ARRAY: - if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0) - { - elttype = check_typedef (TYPE_TARGET_TYPE (type)); - len = TYPE_LENGTH (type) / TYPE_LENGTH (elttype); - if (options->prettyformat_arrays) - print_spaces_filtered (2 + 2 * recurse, stream); - /* For an array of chars, print with string syntax. */ - if (TYPE_LENGTH (elttype) == 1 && - ((TYPE_CODE (elttype) == TYPE_CODE_INT) - || ((current_language->la_language == language_m2) - && (TYPE_CODE (elttype) == TYPE_CODE_CHAR))) - && (options->format == 0 || options->format == 's')) - { - /* 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; - - /* Look for a NULL char. */ - for (temp_len = 0; - (valaddr + embedded_offset)[temp_len] - && temp_len < len && temp_len < options->print_max; - temp_len++); - len = temp_len; - } - - LA_PRINT_STRING (stream, TYPE_TARGET_TYPE (type), - valaddr + embedded_offset, len, NULL, - 0, options); - } - else - { - fprintf_filtered (stream, "{"); - val_print_array_elements (type, embedded_offset, - address, stream, - recurse, original_value, - options, 0); - fprintf_filtered (stream, "}"); - } - break; - } - /* Array of unspecified length: treat like pointer to first elt. */ - print_unpacked_pointer (type, address, address, options, stream); - break; - - case TYPE_CODE_PTR: - if (TYPE_CONST (type)) - print_variable_at_address (type, valaddr + embedded_offset, - stream, recurse, options); - else if (options->format && options->format != 's') - val_print_scalar_formatted (type, embedded_offset, - original_value, options, 0, stream); - else - { - addr = unpack_pointer (type, valaddr + embedded_offset); - print_unpacked_pointer (type, addr, address, options, stream); - } - break; - - case TYPE_CODE_UNION: - if (recurse && !options->unionprint) - { - fprintf_filtered (stream, "{...}"); - break; - } - /* Fall through. */ - case TYPE_CODE_STRUCT: - if (m2_is_long_set (type)) - m2_print_long_set (type, valaddr, embedded_offset, address, - stream); - else if (m2_is_unbounded_array (type)) - m2_print_unbounded_array (type, valaddr, embedded_offset, - address, stream, recurse, options); - else - cp_print_value_fields (type, type, embedded_offset, - address, stream, recurse, original_value, - options, NULL, 0); - break; - - case TYPE_CODE_SET: - elttype = TYPE_INDEX_TYPE (type); - elttype = check_typedef (elttype); - if (TYPE_STUB (elttype)) - { - fprintf_styled (stream, metadata_style.style (), - _("<incomplete type>")); - break; - } - else - { - struct type *range = elttype; - LONGEST low_bound, high_bound; - int i; - int need_comma = 0; - - fputs_filtered ("{", stream); - - i = get_discrete_bounds (range, &low_bound, &high_bound); - maybe_bad_bstring: - if (i < 0) - { - fputs_styled (_("<error value>"), metadata_style.style (), - stream); - goto done; - } - - for (i = low_bound; i <= high_bound; i++) - { - int element = value_bit_index (type, valaddr + embedded_offset, - i); - - if (element < 0) - { - i = element; - goto maybe_bad_bstring; - } - if (element) - { - if (need_comma) - fputs_filtered (", ", stream); - print_type_scalar (range, i, stream); - need_comma = 1; - - if (i + 1 <= high_bound - && value_bit_index (type, valaddr + embedded_offset, - ++i)) - { - int j = i; - - fputs_filtered ("..", stream); - while (i + 1 <= high_bound - && value_bit_index (type, - valaddr + embedded_offset, - ++i)) - j = i; - print_type_scalar (range, j, stream); - } - } - } - done: - fputs_filtered ("}", stream); - } - break; - - case TYPE_CODE_RANGE: - if (TYPE_LENGTH (type) == TYPE_LENGTH (TYPE_TARGET_TYPE (type))) - { - m2_val_print (TYPE_TARGET_TYPE (type), embedded_offset, - address, stream, recurse, original_value, options); - break; - } - /* FIXME: create_static_range_type does not set the unsigned bit in a - range type (I think it probably should copy it from the target - type), so we won't print values which are too large to - fit in a signed integer correctly. */ - /* FIXME: Doesn't handle ranges of enums correctly. (Can't just - print with the target type, though, because the size of our type - and the target type might differ). */ - /* FALLTHROUGH */ - - case TYPE_CODE_REF: - case TYPE_CODE_ENUM: - case TYPE_CODE_FUNC: - case TYPE_CODE_INT: - case TYPE_CODE_FLT: - case TYPE_CODE_METHOD: - case TYPE_CODE_VOID: - case TYPE_CODE_ERROR: - case TYPE_CODE_UNDEF: - case TYPE_CODE_BOOL: - case TYPE_CODE_CHAR: - default: - generic_val_print (type, embedded_offset, address, - stream, recurse, original_value, options, - &m2_decorations); - break; - } -} - /* See m2-lang.h. */ void |