From 86c3c1fccc917b1674bde0d41c24c4331c758e6b Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 23 Jun 2011 09:51:57 +0000 Subject: [PATCH] http://sourceware.org/ml/gdb-patches/2011-06/msg00136.html 2011-06-23 Andrew Burgess * gdbtypes.c (append_composite_type_field_aligned): Fix calculation of bit position based on alignment. --- gdb/ChangeLog | 5 +++++ gdb/gdbtypes.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fb4c664797..b2ff7ffdf6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-06-23 Andrew Burgess + + * gdbtypes.c (append_composite_type_field_aligned): Fix + calculation of bit position based on alignment. + 2011-06-22 Pedro Alves * breakpoint.c (bpstat_stop_status): Call the check_status diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 2bdb4ebe72..2572046e39 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -3654,12 +3654,15 @@ append_composite_type_field_aligned (struct type *t, char *name, if (alignment) { - int left = FIELD_BITPOS (f[0]) % (alignment * TARGET_CHAR_BIT); + int left; + + alignment *= TARGET_CHAR_BIT; + left = FIELD_BITPOS (f[0]) % alignment; if (left) { - FIELD_BITPOS (f[0]) += left; - TYPE_LENGTH (t) += left / TARGET_CHAR_BIT; + FIELD_BITPOS (f[0]) += (alignment - left); + TYPE_LENGTH (t) += (alignment - left) / TARGET_CHAR_BIT; } } }