From f30408df5aade314315616cd78aed5dba3870dbc Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Sun, 28 Sep 2008 15:12:07 +0000 Subject: [PATCH] PR middle-end/36575 * fold-const (div_and_round_double) : Fix typo. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@140734 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/fold-const.c | 4 ++-- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gnat.dg/conv_decimal.adb | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/conv_decimal.adb diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c9fc7ae..e0405f6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2008-09-28 Eric Botcazou + PR middle-end/36575 + * fold-const (div_and_round_double) : Fix typo. + +2008-09-28 Eric Botcazou + * expmed.c (store_fixed_bit_field): Always use convert_to_mode in order to convert between modes. (extract_bit_field_1): Test TRULY_NOOP_TRUNCATION on the right mode. diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 2c822b5..0ce122a 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -835,7 +835,7 @@ div_and_round_double (enum tree_code code, int uns, if (hden < 0) neg_double (lden, hden, &labs_den, &habs_den); - /* If (2 * abs (lrem) >= abs (lden)) */ + /* If (2 * abs (lrem) >= abs (lden)), adjust the quotient. */ mul_double ((HOST_WIDE_INT) 2, (HOST_WIDE_INT) 0, labs_rem, habs_rem, <wice, &htwice); @@ -843,7 +843,7 @@ div_and_round_double (enum tree_code code, int uns, < (unsigned HOST_WIDE_INT) htwice) || (((unsigned HOST_WIDE_INT) habs_den == (unsigned HOST_WIDE_INT) htwice) - && (labs_den < ltwice))) + && (labs_den <= ltwice))) { if (*hquo < 0) /* quo = quo - 1; */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cc430ac..41ba8dc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2008-09-28 Eric Botcazou + + * gnat.dg/conv_decimal.adb: New test. + 2008-09-26 Jakub Jelinek PR middle-end/37275 diff --git a/gcc/testsuite/gnat.dg/conv_decimal.adb b/gcc/testsuite/gnat.dg/conv_decimal.adb new file mode 100644 index 0000000..d5199c1 --- /dev/null +++ b/gcc/testsuite/gnat.dg/conv_decimal.adb @@ -0,0 +1,34 @@ +-- PR middle-end/36575 +-- reporter: Laurent Guerby +-- { dg-do run } + +procedure Conv_Decimal is + + type Unsigned_Over_8 is mod 2**8+2; + type Signed_Over_8 is range -200 .. 200; + + procedure Assert(Truth: Boolean) is + begin + if not Truth then + raise Program_Error; + end if; + end; + + type Decim is delta 0.1 digits 5; + + Halfway : Decim := 2.5; + Neg_Half : Decim := -2.5; + + Big : Unsigned_Over_8; + Also_Big : Signed_Over_8; + +begin + Big := Unsigned_Over_8 (Halfway); -- Rounds up by 4.6(33). + Assert(Big = 3); + + Also_Big := Signed_Over_8 (Halfway); -- Rounds up by 4.6(33). + Assert(Also_Big = 3); + + Also_Big := Signed_Over_8 (Neg_Half); -- Rounds down by 4.6(33). + Assert(Also_Big = -3); +end; -- 2.7.4