diff options
| author | Richard Sandiford <richard.sandiford@linaro.org> | 2017-12-20 12:54:01 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2017-12-20 12:54:01 +0000 |
| commit | 8c59e5e735fcc19f170b4b7d72b55400da99e7b4 (patch) | |
| tree | 970495d1af2f273a8cc5044cb312cb2cd6f24fa2 /gcc/stor-layout.c | |
| parent | fc60a41612bad379060969b6ed3a78eb160aae8a (diff) | |
poly_int: C++ bitfield regions
This patch changes C++ bitregion_start/end values from constants to
poly_ints. Although it's unlikely that the size needs to be polynomial
in practice, the offset could be with future language extensions.
2017-12-20 Richard Sandiford <richard.sandiford@linaro.org>
Alan Hayward <alan.hayward@arm.com>
David Sherwood <david.sherwood@arm.com>
gcc/
* expmed.h (store_bit_field): Change bitregion_start and
bitregion_end from unsigned HOST_WIDE_INT to poly_uint64.
* expmed.c (adjust_bit_field_mem_for_reg, strict_volatile_bitfield_p)
(store_bit_field_1, store_integral_bit_field, store_bit_field)
(store_fixed_bit_field, store_split_bit_field): Likewise.
* expr.c (store_constructor_field, store_field): Likewise.
(optimize_bitfield_assignment_op): Likewise. Make the same change
to bitsize and bitpos.
* machmode.h (bit_field_mode_iterator): Change m_bitregion_start
and m_bitregion_end from HOST_WIDE_INT to poly_int64. Make the
same change in the constructor arguments.
(get_best_mode): Change bitregion_start and bitregion_end from
unsigned HOST_WIDE_INT to poly_uint64.
* stor-layout.c (bit_field_mode_iterator::bit_field_mode_iterator):
Change bitregion_start and bitregion_end from HOST_WIDE_INT to
poly_int64.
(bit_field_mode_iterator::next_mode): Update for new types
of m_bitregion_start and m_bitregion_end.
(get_best_mode): Change bitregion_start and bitregion_end from
unsigned HOST_WIDE_INT to poly_uint64.
Co-Authored-By: Alan Hayward <alan.hayward@arm.com>
Co-Authored-By: David Sherwood <david.sherwood@arm.com>
From-SVN: r255879
Diffstat (limited to 'gcc/stor-layout.c')
| -rw-r--r-- | gcc/stor-layout.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index 0056d75153d..b91b455fac4 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -2751,15 +2751,15 @@ fixup_unsigned_type (tree type) bit_field_mode_iterator ::bit_field_mode_iterator (HOST_WIDE_INT bitsize, HOST_WIDE_INT bitpos, - HOST_WIDE_INT bitregion_start, - HOST_WIDE_INT bitregion_end, + poly_int64 bitregion_start, + poly_int64 bitregion_end, unsigned int align, bool volatilep) : m_mode (NARROWEST_INT_MODE), m_bitsize (bitsize), m_bitpos (bitpos), m_bitregion_start (bitregion_start), m_bitregion_end (bitregion_end), m_align (align), m_volatilep (volatilep), m_count (0) { - if (!m_bitregion_end) + if (known_eq (m_bitregion_end, 0)) { /* We can assume that any aligned chunk of ALIGN bits that overlaps the bitfield is mapped and won't trap, provided that ALIGN isn't @@ -2769,8 +2769,8 @@ bit_field_mode_iterator = MIN (align, MAX (BIGGEST_ALIGNMENT, BITS_PER_WORD)); if (bitsize <= 0) bitsize = 1; - m_bitregion_end = bitpos + bitsize + units - 1; - m_bitregion_end -= m_bitregion_end % units + 1; + HOST_WIDE_INT end = bitpos + bitsize + units - 1; + m_bitregion_end = end - end % units - 1; } } @@ -2807,10 +2807,11 @@ bit_field_mode_iterator::next_mode (scalar_int_mode *out_mode) /* Stop if the mode goes outside the bitregion. */ HOST_WIDE_INT start = m_bitpos - substart; - if (m_bitregion_start && start < m_bitregion_start) + if (maybe_ne (m_bitregion_start, 0) + && maybe_lt (start, m_bitregion_start)) break; HOST_WIDE_INT end = start + unit; - if (end > m_bitregion_end + 1) + if (maybe_gt (end, m_bitregion_end + 1)) break; /* Stop if the mode requires too much alignment. */ @@ -2866,8 +2867,7 @@ bit_field_mode_iterator::prefer_smaller_modes () bool get_best_mode (int bitsize, int bitpos, - unsigned HOST_WIDE_INT bitregion_start, - unsigned HOST_WIDE_INT bitregion_end, + poly_uint64 bitregion_start, poly_uint64 bitregion_end, unsigned int align, unsigned HOST_WIDE_INT largest_mode_bitsize, bool volatilep, scalar_int_mode *best_mode) |