From 41272e2a5dadf20e3477b4b4451bce1fb4240d31 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Wed, 16 Nov 2011 09:27:56 +0000 Subject: [PATCH] re PR middle-end/50325 (76 new fails with rev. 177691) 2011-11-16 Andreas Krebbel PR middle-end/50325 * expmed.c (store_bit_field_1): Use extract_bit_field on big endian targets if the source cannot be exactly covered by word mode chunks. From-SVN: r181405 --- gcc/ChangeLog | 7 +++++++ gcc/expmed.c | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 09b031315af..ce6df44a2f3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-11-16 Andreas Krebbel + + PR middle-end/50325 + * expmed.c (store_bit_field_1): Use extract_bit_field on big + endian targets if the source cannot be exactly covered by word + mode chunks. + 2011-11-15 Joseph Myers * config/i386/i386elf.h (ASM_OUTPUT_ASCII): Change STRING_LIMIT to diff --git a/gcc/expmed.c b/gcc/expmed.c index b3e6d6d1816..6a9da64e37c 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -543,7 +543,8 @@ store_bit_field_1 (rtx str_rtx, unsigned HOST_WIDE_INT bitsize, is not allowed. */ fieldmode = GET_MODE (value); if (fieldmode == VOIDmode) - fieldmode = smallest_mode_for_size (nwords * BITS_PER_WORD, MODE_INT); + fieldmode = smallest_mode_for_size (nwords * + BITS_PER_WORD, MODE_INT); last = get_last_insn (); for (i = 0; i < nwords; i++) @@ -557,9 +558,18 @@ store_bit_field_1 (rtx str_rtx, unsigned HOST_WIDE_INT bitsize, 0) : (int) i * BITS_PER_WORD); rtx value_word = operand_subword_force (value, wordnum, fieldmode); + unsigned HOST_WIDE_INT new_bitsize = + MIN (BITS_PER_WORD, bitsize - i * BITS_PER_WORD); - if (!store_bit_field_1 (op0, MIN (BITS_PER_WORD, - bitsize - i * BITS_PER_WORD), + /* If the remaining chunk doesn't have full wordsize we have + to make sure that for big endian machines the higher order + bits are used. */ + if (new_bitsize < BITS_PER_WORD && BYTES_BIG_ENDIAN) + value_word = extract_bit_field (value_word, new_bitsize, 0, + true, false, NULL_RTX, + BLKmode, word_mode); + + if (!store_bit_field_1 (op0, new_bitsize, bitnum + bit_offset, bitregion_start, bitregion_end, word_mode,