diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dd91159..6e3aa7d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2010-11-22 Joel Brobecker <brobecker@adacore.com> + * ada-lang.c (ada_template_to_fixed_record_type_1): Delete bit_incr. + +2010-11-22 Joel Brobecker <brobecker@adacore.com> + * ada-lang.c (ada_to_fixed_type): Expand function documentation. Return the original type if the main type portions match rather than when the type themselves match. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 4471481..7ea01c7 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -7030,7 +7030,7 @@ ada_template_to_fixed_record_type_1 (struct type *type, int nfields, bit_len; int variant_field; long off; - int fld_bit_len, bit_incr; + int fld_bit_len; int f; /* Compute the number of fields in this record type that are going @@ -7072,7 +7072,7 @@ ada_template_to_fixed_record_type_1 (struct type *type, if (ada_is_variant_part (type, f)) { variant_field = f; - fld_bit_len = bit_incr = 0; + fld_bit_len = 0; } else if (is_dynamic_field (type, f)) { @@ -7139,7 +7139,7 @@ ada_template_to_fixed_record_type_1 (struct type *type, an overflow should not happen in practice. So rather than adding overflow recovery code to this already complex code, we just assume that it's not going to happen. */ - bit_incr = fld_bit_len = + fld_bit_len = TYPE_LENGTH (TYPE_FIELD_TYPE (rtype, f)) * TARGET_CHAR_BIT; } else @@ -7149,15 +7149,15 @@ ada_template_to_fixed_record_type_1 (struct type *type, TYPE_FIELD_TYPE (rtype, f) = field_type; TYPE_FIELD_NAME (rtype, f) = TYPE_FIELD_NAME (type, f); if (TYPE_FIELD_BITSIZE (type, f) > 0) - bit_incr = fld_bit_len = + fld_bit_len = TYPE_FIELD_BITSIZE (rtype, f) = TYPE_FIELD_BITSIZE (type, f); else - bit_incr = fld_bit_len = + fld_bit_len = TYPE_LENGTH (ada_check_typedef (field_type)) * TARGET_CHAR_BIT; } if (off + fld_bit_len > bit_len) bit_len = off + fld_bit_len; - off += bit_incr; + off += fld_bit_len; TYPE_LENGTH (rtype) = align_value (bit_len, TARGET_CHAR_BIT) / TARGET_CHAR_BIT; } |