diff options
author | Tom Tromey <tromey@adacore.com> | 2020-05-26 14:11:08 -0600 |
---|---|---|
committer | Tom Tromey <tromey@adacore.com> | 2020-05-26 14:11:08 -0600 |
commit | 53a47a3e4904839a902e34d4dfd3f53c397d66e1 (patch) | |
tree | fafe61c8dc8c7d8bda8b5b00278ba0e6f571db49 /gdb/language.h | |
parent | 0bc2354b811e913b39c288e74d7166eaa3639309 (diff) | |
download | binutils-gdb-53a47a3e4904839a902e34d4dfd3f53c397d66e1.tar.gz |
Handle indexing Ada arrays with enum indices
In Ada, like C, an enum can assign values to the constants. However,
unlike C (or any other language supported by gdb), the enum type can
also be used as the range of an array.
In this case, the user's code references the enum constants, but the
compiler translates these to the position of the constant in the enum.
So for example one might write:
type Enum_With_Gaps is
(
LIT0,
LIT1,
LIT2,
LIT3,
LIT4
);
for Enum_With_Gaps use
(
LIT0 => 3,
LIT1 => 5,
LIT2 => 8,
LIT3 => 13,
LIT4 => 21
);
Then index an array like "array(LIT3)" -- but this will be the 4th
element in an array of 5 elements, not the 13th element in an array of
19 (assuming I did the math right) elements.
gdb supports this to some degree, with the only missing piece being
indexing into such an array. This patch implements this missing
feature, and also fixes an existing bug, which is that in some
situations I believe gdb would mis-compute the resulting array's
length.
The approach taken here is to try to integrate this feature into the
core of gdb. My view is that much of the Ada support should be better
integrated with gdb, rather than being "on the side". This, I think,
would help avoid code duplication at least. So, I try to take steps
toward this goal when possible.
Because other languages generally don't allow the user to specify the
index type of an array, I simply made the core of gdb unconditionally
apply discrete_position when computing the range of such an array.
This is a no-op for ordinary types, but applies the enum
value-to-position transformation for TYPE_CODE_ENUM.
gdb/ChangeLog
2020-05-26 Tom Tromey <tromey@adacore.com>
* ada-lang.c (ada_print_array_index): Change type. Call val_atr.
(ada_value_ptr_subscript): Don't call pos_atr on the lower bound.
(val_atr): New function.
(value_val_atr): Use it.
* ada-valprint.c (print_optional_low_bound): Change low bound
handling for enums.
(val_print_packed_array_elements): Don't call discrete_position.
* gdbtypes.c (get_discrete_bounds) <TYPE_CODE_RANGE>: Call
discrete_position for enum types.
* language.c (default_print_array_index): Change type.
* language.h (struct language_defn) <la_print_array_index>: Add
index_type parameter, change type of index_value.
(LA_PRINT_ARRAY_INDEX): Add index_type parameter.
(default_print_array_index): Update.
* valprint.c (maybe_print_array_index): Don't call
value_from_longest. Update.
(value_print_array_elements): Don't call discrete_position.
gdb/testsuite/ChangeLog
2020-05-26 Tom Tromey <tromey@adacore.com>
* gdb.ada/arr_acc_idx_w_gap.exp: Add tests.
Diffstat (limited to 'gdb/language.h')
-rw-r--r-- | gdb/language.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gdb/language.h b/gdb/language.h index ea8aae511b0..e112a91ec57 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -376,7 +376,8 @@ struct language_defn struct language_arch_info *); /* Print the index of an element of an array. */ - void (*la_print_array_index) (struct value *index_value, + void (*la_print_array_index) (struct type *index_type, + LONGEST index_value, struct ui_file *stream, const struct value_print_options *options); @@ -570,8 +571,9 @@ extern enum language set_language (enum language); #define LA_EMIT_CHAR(ch, type, stream, quoter) \ (current_language->la_emitchar(ch, type, stream, quoter)) -#define LA_PRINT_ARRAY_INDEX(index_value, stream, options) \ - (current_language->la_print_array_index(index_value, stream, options)) +#define LA_PRINT_ARRAY_INDEX(index_type, index_value, stream, options) \ + (current_language->la_print_array_index(index_type, index_value, stream, \ + options)) #define LA_ITERATE_OVER_SYMBOLS(BLOCK, NAME, DOMAIN, CALLBACK) \ (current_language->la_iterate_over_symbols (BLOCK, NAME, DOMAIN, CALLBACK)) @@ -634,7 +636,7 @@ extern char *language_class_name_from_physname (const struct language_defn *, extern const char *default_word_break_characters (void); /* Print the index of an array element using the C99 syntax. */ -extern void default_print_array_index (struct value *index_value, +extern void default_print_array_index (struct type *index_type, LONGEST index, struct ui_file *stream, const struct value_print_options *options); |