mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-18 14:30:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Always use wordsize-64 version of s_ceil.c.

Browse Source 
This patch replaces s_ceil.c in sysdeps/dbl-64 with the one in
sysdeps/dbl-64/wordsize-64 and removes the latter one.
The code is not changed except changes in code style.

Also adjusted the include path in x86_64 and sparc64 files.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Stefan Liebler 2019-12-11 15:09:16 +01:00
parent 95b0c2c431
commit 9f234eafe8
5 changed files with 22 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
sysdeps/ieee754/dbl-64/s_ceil.c
View File

@ -25,61 +25,38 @@
double
__ceil (double x)
{
int32_t i0, i1, j0;
uint32_t i, j;
EXTRACT_WORDS (i0, i1, x);
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
if (j0 < 20)
int64_t i0, i;
int32_t j0;
EXTRACT_WORDS64 (i0, x);
j0 = ((i0 >> 52) & 0x7ff) - 0x3ff;
if (j0 <= 51)
{
if (j0 < 0)
{
/* return 0*sign(x) if |x|<1 */
/* return 0 * sign(x) if |x| < 1 */
if (i0 < 0)
{
i0 = 0x80000000; i1 = 0;
}
else if ((i0 | i1) != 0)
{
i0 = 0x3ff00000; i1 = 0;
}
i0 = INT64_C (0x8000000000000000);
else if (i0 != 0)
i0 = INT64_C (0x3ff0000000000000);
}
else
{
i = (0x000fffff) >> j0;
if (((i0 & i) | i1) == 0)
return x; /* x is integral */
i = INT64_C (0x000fffffffffffff) >> j0;
if ((i0 & i) == 0)
return x; /* x is integral */
if (i0 > 0)
i0 += (0x00100000) >> j0;
i0 &= (~i); i1 = 0;
i0 += UINT64_C (0x0010000000000000) >> j0;
i0 &= ~i;
}
}
else if (j0 > 51)
{
if (j0 == 0x400)
return x + x; /* inf or NaN */
else
return x; /* x is integral */
}
else
{
i = ((uint32_t) (0xffffffff)) >> (j0 - 20);
if ((i1 & i) == 0)
return x; /* x is integral */
if (i0 > 0)
{
if (j0 == 20)
i0 += 1;
else
{
j = i1 + (1 << (52 - j0));
if (j < i1)
i0 += 1; /* got a carry */
i1 = j;
}
}
i1 &= (~i);
if (j0 == 0x400)
return x + x; /* inf or NaN */
else
return x; /* x is integral */
}
INSERT_WORDS (x, i0, i1);
INSERT_WORDS64 (x, i0);
return x;
}
#ifndef __ceil

52
sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c
View File

@ -1,52 +0,0 @@
/* @(#)s_ceil.c 5.1 93/09/24 */
/*
* ====================================================
* Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
*
* Developed at SunPro, a Sun Microsystems, Inc. business.
* Permission to use, copy, modify, and distribute this
* software is freely granted, provided that this notice
* is preserved.
* ====================================================
*/
/*
* ceil(x)
* Return x rounded toward -inf to integral value
* Method:
* Bit twiddling.
*/
#define NO_MATH_REDIRECT
#include <math.h>
#include <math_private.h>
#include <libm-alias-double.h>
double
__ceil(double x)
{
int64_t i0,i;
int32_t j0;
EXTRACT_WORDS64(i0,x);
j0 = ((i0>>52)&0x7ff)-0x3ff;
if(j0<=51) {
if(j0<0) {
/* return 0*sign(x) if |x|<1 */
if(i0<0) {i0=INT64_C(0x8000000000000000);}
else if(i0!=0) { i0=INT64_C(0x3ff0000000000000);}
} else {
i = INT64_C(0x000fffffffffffff)>>j0;
if((i0&i)==0) return x; /* x is integral */
if(i0>0) i0 += UINT64_C(0x0010000000000000)>>j0;
i0 &= (~i);
}
} else {
if(j0==0x400) return x+x; /* inf or NaN */
else return x; /* x is integral */
}
INSERT_WORDS64(x,i0);
return x;
}
#ifndef __ceil
libm_alias_double (__ceil, ceil)
#endif

2
sysdeps/sparc/sparc64/fpu/multiarch/s_ceil-generic.c
View File

@ -1,2 +1,2 @@
#define __ceil __ceil_generic
#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
#include <sysdeps/ieee754/dbl-64/s_ceil.c>

2
sysdeps/sparc/sparc64/fpu/multiarch/s_ceil-vis3.c
View File

@ -20,4 +20,4 @@
#define __ceil __ceil_vis3
#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
#include <sysdeps/ieee754/dbl-64/s_ceil.c>

2
sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
View File

@ -1,2 +1,2 @@
#define __ceil __ceil_c
#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
#include <sysdeps/ieee754/dbl-64/s_ceil.c>