diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/gdb-gdb.py.in | 28 |
2 files changed, 28 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a31cf70..4ef8a5c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2019-03-26 Joel Brobecker <brobecker@adacore.com> + + * gdb-gdb.py.in (StructMainTypePrettyPrinter.bound_img): New method. + (StructMainTypePrettyPrinter.bounds_img): Use new "bound_img" + method to compute the bounds of range types. Also print "[evaluated]" + if the bounds' values come from a dynamic evaluation. + 2019-03-26 Andrew Burgess <andrew.burgess@embecosm.com> * cp-valprint.c (cp_print_value_fields): Don't print trailing diff --git a/gdb/gdb-gdb.py.in b/gdb/gdb-gdb.py.in index 4b82964..8700689 100644 --- a/gdb/gdb-gdb.py.in +++ b/gdb/gdb-gdb.py.in @@ -181,17 +181,31 @@ class StructMainTypePrettyPrinter: fields.append(self.struct_field_location_img(f)) return label + "\n" + " {" + ",\n ".join(fields) + "}" + def bound_img(self, bound_name): + """Return an image of the given main_type's bound.""" + b = self.val['flds_bnds']['bounds'].dereference()[bound_name] + bnd_kind = str(b['kind']) + if bnd_kind == 'PROP_CONST': + return str(b['data']['const_val']) + elif bnd_kind == 'PROP_UNDEFINED': + return '(undefined)' + else: + info = [bnd_kind] + if bound_name == 'high' and b['flag_upper_bound_is_count']: + info.append('upper_bound_is_count') + return '{} ({})'.format(str(b['data']['baton']), ','.join(info)) + def bounds_img(self): """Return an image of the main_type bounds. """ b = self.val['flds_bnds']['bounds'].dereference() - low = str(b['low']) - if b['low_undefined'] != 0: - low += " (undefined)" - high = str(b['high']) - if b['high_undefined'] != 0: - high += " (undefined)" - return "flds_bnds.bounds = {%s, %s}" % (low, high) + low = self.bound_img('low') + high = self.bound_img('high') + + img = "flds_bnds.bounds = {%s, %s}" % (low, high) + if b['flag_bound_evaluated']: + img += ' [evaluated]' + return img def type_specific_img(self): """Return a string image of the main_type type_specific union. |