From c4dfcb3638cbdb33589e3789df45d76178b333bf Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 12 Jul 2020 22:58:50 -0400 Subject: [PATCH] gdb: add type::bounds / type::set_bounds Add the `bounds` and `set_bounds` methods on `struct type`, in order to remove the `TYPE_RANGE_DATA` macro. In this patch, the `TYPE_RANGE_DATA` macro is changed to use `type::bounds`, so all the call sites that are used to set a range type's bounds are changed to use `type::set_bounds`. The next patch will remove `TYPE_RANGE_DATA` completely. gdb/ChangeLog: * gdbtypes.h (struct type) : New methods. (TYPE_RANGE_DATA): Use type::bounds. Change all uses that are used to set the range type's bounds to use set_bounds. Change-Id: I62e15506239b98404e62bbea8120db184ed87847 --- gdb/ChangeLog | 6 ++++++ gdb/gdbtypes.c | 23 ++++++++++++++--------- gdb/gdbtypes.h | 18 +++++++++++++++++- gdb/mdebugread.c | 4 ++-- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8fb5878578f..09bcc670146 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-07-12 Simon Marchi + + * gdbtypes.h (struct type) : New methods. + (TYPE_RANGE_DATA): Use type::bounds. Change all uses that + are used to set the range type's bounds to use set_bounds. + 2020-07-11 Philippe Waroquiers * exec.c (_initialize_exec): Update exec-file-mismatch help. diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index cdf88a4a7d1..66f09432899 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -935,15 +935,17 @@ create_range_type (struct type *result_type, struct type *index_type, else TYPE_LENGTH (result_type) = TYPE_LENGTH (check_typedef (index_type)); - TYPE_RANGE_DATA (result_type) = (struct range_bounds *) - TYPE_ZALLOC (result_type, sizeof (struct range_bounds)); - TYPE_RANGE_DATA (result_type)->low = *low_bound; - TYPE_RANGE_DATA (result_type)->high = *high_bound; - TYPE_RANGE_DATA (result_type)->bias = bias; + range_bounds *bounds + = (struct range_bounds *) TYPE_ZALLOC (result_type, sizeof (range_bounds)); + bounds->low = *low_bound; + bounds->high = *high_bound; + bounds->bias = bias; /* Initialize the stride to be a constant, the value will already be zero thanks to the use of TYPE_ZALLOC above. */ - TYPE_RANGE_DATA (result_type)->stride.kind = PROP_CONST; + bounds->stride.kind = PROP_CONST; + + result_type->set_bounds (bounds); if (low_bound->kind == PROP_CONST && low_bound->data.const_val >= 0) TYPE_UNSIGNED (result_type) = 1; @@ -5363,9 +5365,12 @@ copy_type_recursive (struct objfile *objfile, /* For range types, copy the bounds information. */ if (type->code () == TYPE_CODE_RANGE) { - TYPE_RANGE_DATA (new_type) = (struct range_bounds *) - TYPE_ALLOC (new_type, sizeof (struct range_bounds)); - *TYPE_RANGE_DATA (new_type) = *TYPE_RANGE_DATA (type); + range_bounds *bounds + = ((struct range_bounds *) TYPE_ALLOC + (new_type, sizeof (struct range_bounds))); + + *bounds = *type->bounds (); + new_type->set_bounds (bounds); } if (type->main_type->dyn_prop_list != NULL) diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 28d42efb728..236d37b1ce2 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -953,6 +953,22 @@ struct type this->field (0).set_type (index_type); } + /* Get the bounds bounds of this type. The type must be a range type. */ + range_bounds *bounds () const + { + gdb_assert (this->code () == TYPE_CODE_RANGE); + + return this->main_type->flds_bnds.bounds; + } + + /* Set the bounds of this type. The type must be a range type. */ + void set_bounds (range_bounds *bounds) + { + gdb_assert (this->code () == TYPE_CODE_RANGE); + + this->main_type->flds_bnds.bounds = bounds; + } + /* * Return the dynamic property of the requested KIND from this type's list of dynamic properties. */ dynamic_prop *dyn_prop (dynamic_prop_node_kind kind) const; @@ -1502,7 +1518,7 @@ extern unsigned type_align (struct type *); space in struct type. */ extern bool set_type_align (struct type *, ULONGEST); -#define TYPE_RANGE_DATA(thistype) TYPE_MAIN_TYPE(thistype)->flds_bnds.bounds +#define TYPE_RANGE_DATA(thistype) ((thistype)->bounds ()) #define TYPE_LOW_BOUND(range_type) \ TYPE_RANGE_DATA(range_type)->low.data.const_val #define TYPE_HIGH_BOUND(range_type) \ diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index 6f76bc6a84e..aa0c715b054 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -1734,8 +1734,8 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, if (t->bt == btRange) { tp->set_num_fields (0); - TYPE_RANGE_DATA (tp) = ((struct range_bounds *) - TYPE_ZALLOC (tp, sizeof (struct range_bounds))); + tp->set_bounds (((struct range_bounds *) + TYPE_ZALLOC (tp, sizeof (struct range_bounds)))); TYPE_LOW_BOUND (tp) = AUX_GET_DNLOW (bigend, ax); ax++; TYPE_HIGH_BOUND (tp) = AUX_GET_DNHIGH (bigend, ax); -- 2.30.2