diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2020-07-12 22:58:53 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2020-07-12 22:58:53 -0400 |
| commit | 509971ae766fdba08437cbd8bc266aae8d2aa9e9 (patch) | |
| tree | 9f8e98dc0370c62f8ff8739f60ed8ef199769660 /gdb | |
| parent | 107406b7380489559c70702b8e6e9b3395c2662a (diff) | |
| download | gdb-509971ae766fdba08437cbd8bc266aae8d2aa9e9.zip gdb-509971ae766fdba08437cbd8bc266aae8d2aa9e9.tar.gz gdb-509971ae766fdba08437cbd8bc266aae8d2aa9e9.tar.bz2 | |
gdb: remove TYPE_ARRAY_BIT_STRIDE
Remove it and update all callers to use the equivalent accessor methods.
A subsequent patch will make type::bit_stride work for array types
(effectively replacing this macro), but I wanted to keep this patch a
simple mechanical change.
gdb/ChangeLog:
* gdbtypes.c (TYPE_ARRAY_BIT_STRIDE): Remove. Update all
callers to use the equivalent accessor methods.
Change-Id: I09e14bd45075f98567adce8a0b93edea7722f812
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/f-valprint.c | 3 | ||||
| -rw-r--r-- | gdb/gdbtypes.h | 7 | ||||
| -rw-r--r-- | gdb/valarith.c | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 444315e..0d54f5e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2020-07-12 Simon Marchi <simon.marchi@efficios.com> + * gdbtypes.c (TYPE_ARRAY_BIT_STRIDE): Remove. Update all + callers to use the equivalent accessor methods. + +2020-07-12 Simon Marchi <simon.marchi@efficios.com> + * gdbtypes.h (struct range_bounds) <bit_stride>: New method. (struct type) <bit_stride>: New method. (TYPE_BIT_STRIDE): Remove. diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index bda4803..17e15f9 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -124,7 +124,8 @@ f77_print_array_1 (int nss, int ndimensions, struct type *type, struct gdbarch *gdbarch = get_type_arch (type); size_t dim_size = type_length_units (TYPE_TARGET_TYPE (type)); int unit_size = gdbarch_addressable_memory_unit_size (gdbarch); - size_t byte_stride = TYPE_ARRAY_BIT_STRIDE (type) / (unit_size * 8); + size_t byte_stride + = type->index_type ()->bounds ()->bit_stride () / (unit_size * 8); if (byte_stride == 0) byte_stride = dim_size; size_t offs = 0; diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index bf6b270..d8ddc41 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -1633,13 +1633,6 @@ extern bool set_type_align (struct type *, ULONGEST); #define TYPE_DYN_PROP_KIND(dynprop) \ (dynprop->kind ()) - -/* Accessors for struct range_bounds data attached to an array type's - index type. */ - -#define TYPE_ARRAY_BIT_STRIDE(arraytype) \ - ((arraytype)->index_type ()->bounds ()->bit_stride ()) - /* C++ */ #define TYPE_SELF_TYPE(thistype) internal_type_self_type (thistype) diff --git a/gdb/valarith.c b/gdb/valarith.c index 0b1f43f..775c603 100644 --- a/gdb/valarith.c +++ b/gdb/valarith.c @@ -191,7 +191,7 @@ value_subscripted_rvalue (struct value *array, LONGEST index, LONGEST lowerbound /* Fetch the bit stride and convert it to a byte stride, assuming 8 bits in a byte. */ - LONGEST stride = TYPE_ARRAY_BIT_STRIDE (array_type); + LONGEST stride = array_type->index_type ()->bounds ()->bit_stride (); if (stride != 0) { struct gdbarch *arch = get_type_arch (elt_type); |