Make lround the alias of llround for wordsize-64

This commit is contained in:
H.J. Lu 2012-03-16 15:14:56 -07:00
parent 6b6cd74bab
commit eb0f39b6b7
3 changed files with 89 additions and 80 deletions

View File

@ -1,3 +1,12 @@
2012-03-16 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c: Moved to ...
* sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c: This.
(__lround): Renamed to ...
(__llround): This. Replace long int with long long int.
Define lround functions as aliases of llround functions.
* sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c: Empty file.
2012-03-16 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/unix/sysv/linux/x86_64/makecontext.c (__makecontext):

View File

@ -1 +1,79 @@
/* The code is the same as lround. Use an alias, see l_round.c. */
/* Round double value to long long int.
Copyright (C) 1997-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#define lround __hidden_lround
#define __lround __hidden___lround
#include <math.h>
#include <math_private.h>
long long int
__llround (double x)
{
int32_t j0;
int64_t i0;
long long int result;
int sign;
EXTRACT_WORDS64 (i0, x);
j0 = ((i0 >> 52) & 0x7ff) - 0x3ff;
sign = i0 < 0 ? -1 : 1;
i0 &= UINT64_C(0xfffffffffffff);
i0 |= UINT64_C(0x10000000000000);
if (j0 < (int32_t) (8 * sizeof (long long int)) - 1)
{
if (j0 < 0)
return j0 < -1 ? 0 : sign;
else if (j0 >= 52)
result = i0 << (j0 - 52);
else
{
i0 += UINT64_C(0x8000000000000) >> j0;
result = i0 >> (52 - j0);
}
}
else
{
/* The number is too large. It is left implementation defined
what happens. */
return (long long int) x;
}
return sign * result;
}
weak_alias (__llround, llround)
#ifdef NO_LONG_DOUBLE
strong_alias (__llround, __lroundl)
weak_alias (__llround, lroundl)
#endif
/* long has the same width as long long on 64-bit machines. */
#undef lround
#undef __lround
strong_alias (__llround, __lround)
weak_alias (__llround, lround)
#ifdef NO_LONG_DOUBLE
strong_alias (__llround, __llroundl)
weak_alias (__llround, llroundl)
#endif

View File

@ -1,79 +1 @@
/* Round double value to long int.
Copyright (C) 1997, 2004, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#define llround __hidden_llround
#define __llround __hidden___llround
#include <math.h>
#include <math_private.h>
long int
__lround (double x)
{
int32_t j0;
int64_t i0;
long int result;
int sign;
EXTRACT_WORDS64 (i0, x);
j0 = ((i0 >> 52) & 0x7ff) - 0x3ff;
sign = i0 < 0 ? -1 : 1;
i0 &= UINT64_C(0xfffffffffffff);
i0 |= UINT64_C(0x10000000000000);
if (j0 < (int32_t) (8 * sizeof (long int)) - 1)
{
if (j0 < 0)
return j0 < -1 ? 0 : sign;
else if (j0 >= 52)
result = i0 << (j0 - 52);
else
{
i0 += UINT64_C(0x8000000000000) >> j0;
result = i0 >> (52 - j0);
}
}
else
{
/* The number is too large. It is left implementation defined
what happens. */
return (long int) x;
}
return sign * result;
}
weak_alias (__lround, lround)
#ifdef NO_LONG_DOUBLE
strong_alias (__lround, __lroundl)
weak_alias (__lround, lroundl)
#endif
/* long long has the same width as long on 64-bit machines. */
#undef llround
#undef __llround
strong_alias (__lround, __llround)
weak_alias (__lround, llround)
#ifdef NO_LONG_DOUBLE
strong_alias (__lround, __llroundl)
weak_alias (__lround, llroundl)
#endif
/* The code is the same as llround. Use an alias, see s_llround.c. */