[multiple changes]
Fri May 28 22:20:03 1999 Anthony Green <green@cygnus.com> * java/lang/fdlibm.h: Don't use __uint32_t. Include mprec.h. * java/lang/e_log.c: Don't use __uint32_t. 1999-05-27 Eric Christopher <echristo@cygnus.com> * configure: Rebuilt * configure.in: Fixed ISO C9X and namespace collision with __uint32_t * acconfig.h: Rebuilt * include/config.h.in: Rebuilt * java/lang/mprec.h, java/lang/e_acos.c, java/lang/e_asin.c, java/lang/e_atan2.c, java/lang/e_exp.c, java/lang/e_fmod.c, e_log.c, java/lang/e_pow.c, java/lang/e_rem_pio2.c, java/lang/e_remainder.c, java/lang/e_sqrt.c, java/lang/fdlibm.h, k_tan.c, java/lang/mprec.h, java/lang/s_atan.c, java/lang/s_ceil.c, java/lang/s_copysign.c, java/lang/s_fabs.c, s_floor.c, java/lang/s_rint.c, java/lang/sf_rint.c: Fixed ISO C9X and namespace collision with __uint32_t From-SVN: r27729
This commit is contained in:
parent
fe574d5d92
commit
0d16618c58
31 changed files with 614 additions and 526 deletions
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* Developed at SunPro, a Sun Microsystems, Inc. business.
|
||||
* Permission to use, copy, modify, and distribute this
|
||||
* software is freely granted, provided that this notice
|
||||
* software is freely granted, provided that this notice
|
||||
* is preserved.
|
||||
* ====================================================
|
||||
*/
|
||||
|
@ -34,20 +34,20 @@ TRAD_SYNOPSIS
|
|||
#include <math.h>
|
||||
double floor(<[x]>)
|
||||
double <[x]>;
|
||||
float floorf(<[x]>)
|
||||
float floorf(<[x]>)
|
||||
float <[x]>;
|
||||
double ceil(<[x]>)
|
||||
double ceil(<[x]>)
|
||||
double <[x]>;
|
||||
float ceilf(<[x]>)
|
||||
float ceilf(<[x]>)
|
||||
float <[x]>;
|
||||
|
||||
DESCRIPTION
|
||||
<<floor>> and <<floorf>> find
|
||||
<<floor>> and <<floorf>> find
|
||||
@tex
|
||||
$\lfloor x \rfloor$,
|
||||
$\lfloor x \rfloor$,
|
||||
@end tex
|
||||
the nearest integer less than or equal to <[x]>.
|
||||
<<ceil>> and <<ceilf>> find
|
||||
<<ceil>> and <<ceilf>> find
|
||||
@tex
|
||||
$\lceil x\rceil$,
|
||||
@end tex
|
||||
|
@ -90,14 +90,14 @@ static double huge = 1.0e300;
|
|||
double x;
|
||||
#endif
|
||||
{
|
||||
__int32_t i0,i1,j0;
|
||||
__uint32_t i,j;
|
||||
int32_t i0,i1,j0;
|
||||
uint32_t i,j;
|
||||
EXTRACT_WORDS(i0,i1,x);
|
||||
j0 = ((i0>>20)&0x7ff)-0x3ff;
|
||||
if(j0<20) {
|
||||
if(j0<0) { /* raise inexact if x != 0 */
|
||||
if(huge+x>0.0) {/* return 0*sign(x) if |x|<1 */
|
||||
if(i0>=0) {i0=i1=0;}
|
||||
if(i0>=0) {i0=i1=0;}
|
||||
else if(((i0&0x7fffffff)|i1)!=0)
|
||||
{ i0=0xbff00000;i1=0;}
|
||||
}
|
||||
|
@ -113,14 +113,14 @@ static double huge = 1.0e300;
|
|||
if(j0==0x400) return x+x; /* inf or NaN */
|
||||
else return x; /* x is integral */
|
||||
} else {
|
||||
i = ((__uint32_t)(0xffffffff))>>(j0-20);
|
||||
i = ((uint32_t)(0xffffffff))>>(j0-20);
|
||||
if((i1&i)==0) return x; /* x is integral */
|
||||
if(huge+x>0.0) { /* raise inexact flag */
|
||||
if(i0<0) {
|
||||
if(j0==20) i0+=1;
|
||||
if(j0==20) i0+=1;
|
||||
else {
|
||||
j = i1+(1<<(52-j0));
|
||||
if(j<(__uint32_t)i1) i0 +=1 ; /* got a carry */
|
||||
if(j<(uint32_t)i1) i0 +=1 ; /* got a carry */
|
||||
i1=j;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue