From 6395ba73f84930d5ebcf692a3bd570da600f9da9 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 23 Jan 2019 13:41:59 -0800 Subject: [PATCH] libgcc2.c: Correct DI/TI -> SF/DF conversions FSTYPE FUNC (DWtype u) in libgcc2.c, which converts DI/TI to SF/DF, has /* No leading bits means u == minimum. */ if (count == 0) return -(Wtype_MAXp1_F * (Wtype_MAXp1_F / 2)); in the third case (where actually count == 0 only means the high part is minimum). It should be: /* No leading bits means u == minimum. */ if (count == 0) return Wtype_MAXp1_F * (FSTYPE) (hi | ((UWtype) u != 0)); instead. gcc/testsuite/ 2019-01-23 H.J. Lu PR libgcc/88931 * gcc.dg/torture/fp-int-convert-timode-1.c: New test. * gcc.dg/torture/fp-int-convert-timode-2.c: Likewise. * gcc.dg/torture/fp-int-convert-timode-3.c: Likewise. * gcc.dg/torture/fp-int-convert-timode-4.c: Likewise. libgcc/ 2019-01-23 Joseph Myers PR libgcc/88931 * libgcc2.c (FSTYPE FUNC (DWtype u)): Correct no leading bits case. From-SVN: r268216 --- gcc/testsuite/ChangeLog | 8 ++++++ .../gcc.dg/torture/fp-int-convert-timode-1.c | 25 +++++++++++++++++ .../gcc.dg/torture/fp-int-convert-timode-2.c | 27 +++++++++++++++++++ .../gcc.dg/torture/fp-int-convert-timode-3.c | 27 +++++++++++++++++++ .../gcc.dg/torture/fp-int-convert-timode-4.c | 27 +++++++++++++++++++ libgcc/ChangeLog | 6 +++++ libgcc/libgcc2.c | 2 +- 7 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-1.c create mode 100644 gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-2.c create mode 100644 gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-3.c create mode 100644 gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-4.c diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 977009dc7f7..64cd7e2f332 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2019-01-23 H.J. Lu + + PR libgcc/88931 + * gcc.dg/torture/fp-int-convert-timode-1.c: New test. + * gcc.dg/torture/fp-int-convert-timode-2.c: Likewise. + * gcc.dg/torture/fp-int-convert-timode-3.c: Likewise. + * gcc.dg/torture/fp-int-convert-timode-4.c: Likewise. + 2019-01-23 Uroš Bizjak PR target/88998 diff --git a/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-1.c b/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-1.c new file mode 100644 index 00000000000..d6454fada72 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-1.c @@ -0,0 +1,25 @@ +/* Test for correct rounding of conversions from __int128 to + float. */ +/* { dg-do run } */ +/* { dg-require-effective-target int128 } */ +/* { dg-options "-frounding-math" } */ + +#include +#include + +int +main (void) +{ + volatile unsigned long long h = 0x8000000000000000LL; + volatile unsigned long long l = 0xdLL; + volatile unsigned __int128 u128 = (((unsigned __int128) h) << 64) | l; + volatile __int128 s128 = u128; + fesetround (FE_TONEAREST); + float fs = s128; + if (fs != -0x1p+127) + abort (); + double ds = s128; + if (ds != -0x1p+127) + abort (); + exit (0); +} diff --git a/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-2.c b/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-2.c new file mode 100644 index 00000000000..dbfa481b4fb --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-2.c @@ -0,0 +1,27 @@ +/* Test for correct rounding of conversions from __int128 to + float. */ +/* { dg-do run } */ +/* { dg-require-effective-target int128 } */ +/* { dg-options "-frounding-math" } */ + +#include +#include + +int +main (void) +{ +#ifdef FE_DOWNWARD + volatile unsigned long long h = 0x8000000000000000LL; + volatile unsigned long long l = 0xdLL; + volatile unsigned __int128 u128 = (((unsigned __int128) h) << 64) | l; + volatile __int128 s128 = u128; + fesetround (FE_DOWNWARD); + float fs = s128; + if (fs != -0x1p+127) + abort (); + double ds = s128; + if (ds != -0x1p+127) + abort (); +#endif + exit (0); +} diff --git a/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-3.c b/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-3.c new file mode 100644 index 00000000000..63a305ec3c2 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-3.c @@ -0,0 +1,27 @@ +/* Test for correct rounding of conversions from __int128 to + float. */ +/* { dg-do run } */ +/* { dg-require-effective-target int128 } */ +/* { dg-options "-frounding-math" } */ + +#include +#include + +int +main (void) +{ +#ifdef FE_UPWARD + volatile unsigned long long h = 0x8000000000000000LL; + volatile unsigned long long l = 0xdLL; + volatile unsigned __int128 u128 = (((unsigned __int128) h) << 64) | l; + volatile __int128 s128 = u128; + fesetround (FE_UPWARD); + float fs = s128; + if (fs != -0x1.fffffep+126) + abort (); + double ds = s128; + if (ds != -0x1.fffffffffffffp+126) + abort (); +#endif + exit (0); +} diff --git a/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-4.c b/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-4.c new file mode 100644 index 00000000000..e71610995cd --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/fp-int-convert-timode-4.c @@ -0,0 +1,27 @@ +/* Test for correct rounding of conversions from __int128 to + float. */ +/* { dg-do run } */ +/* { dg-require-effective-target int128 } */ +/* { dg-options "-frounding-math" } */ + +#include +#include + +int +main (void) +{ +#ifdef FE_TOWARDZERO + volatile unsigned long long h = 0x8000000000000000LL; + volatile unsigned long long l = 0xdLL; + volatile unsigned __int128 u128 = (((unsigned __int128) h) << 64) | l; + volatile __int128 s128 = u128; + fesetround (FE_TOWARDZERO); + float fs = s128; + if (fs != -0x1.fffffep+126) + abort (); + double ds = s128; + if (ds != -0x1.fffffffffffffp+126) + abort (); +#endif + exit (0); +} diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 9d157c2afc3..8f6f9ca8311 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2019-01-23 Joseph Myers + + PR libgcc/88931 + * libgcc2.c (FSTYPE FUNC (DWtype u)): Correct no leading bits + case. + 2019-01-18 Martin Liska * libgcov-profiler.c (__gcov_indirect_call_profiler_v2): Rename diff --git a/libgcc/libgcc2.c b/libgcc/libgcc2.c index d84f25b0779..04d3185e805 100644 --- a/libgcc/libgcc2.c +++ b/libgcc/libgcc2.c @@ -1684,7 +1684,7 @@ FUNC (DWtype u) /* No leading bits means u == minimum. */ if (count == 0) - return -(Wtype_MAXp1_F * (Wtype_MAXp1_F / 2)); + return Wtype_MAXp1_F * (FSTYPE) (hi | ((UWtype) u != 0)); shift = 1 + W_TYPE_SIZE - count; -- 2.30.2