mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-08 04:36:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.in: Rebuilt with Eric's change below.

Browse Source 
* Makefile.in: Rebuilt with Eric's change below.

	* java/lang/natMath.cc (abs(jdouble), abs(jfloat), round(jfloat),
	round(jdouble), min(jfloat), max(jfloat), min(jdouble), min(jfloat)):
	Removed functions which are now implemented in Math.java.

From-SVN: r49782
This commit is contained in:
Bryce McKinlay 2002-02-15 05:53:29 +00:00 committed by Bryce McKinlay
parent 2f999d0fe7
commit 15b28697de
2 changed files with 9 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
2002-02-15 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* Makefile.in: Rebuilt with Eric's change below.
* java/lang/natMath.cc (abs(jdouble), abs(jfloat), round(jfloat),
round(jdouble), min(jfloat), max(jfloat), min(jdouble), min(jfloat)):
Removed functions which are now implemented in Math.java.
2002-02-14 Eric Blake <ebb9@email.byu.edu>
* gcj/javaprims.h (java::lang): Add java::lang::StrictMath.

123
libjava/java/lang/natMath.cc
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
/* Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation
This file is part of libgcj.
@ -27,8 +27,6 @@ details. */
#include "fdlibm.h"
extern "C" float fabsf (float);
jdouble java::lang::Math::cos(jdouble x)
{
return (jdouble)::cos((double)x);
@ -89,45 +87,11 @@ jdouble java::lang::Math::IEEEremainder(jdouble y, jdouble x)
return (jdouble)::__ieee754_remainder((double)y, (double)x);
}
jdouble java::lang::Math::abs(jdouble x)
{
return (jdouble)::fabs((double)x);
}
jfloat java::lang::Math::abs(jfloat x)
{
return (jfloat)::fabsf((float)x);
}
jdouble java::lang::Math::rint(jdouble x)
{
return (jdouble)::rint((double)x);
}
jint java::lang::Math::round(jfloat x)
{
if (x != x)
return 0;
if (x <= (jfloat)java::lang::Integer::MIN_VALUE)
return java::lang::Integer::MIN_VALUE;
if (x >= (jfloat)java::lang::Integer::MAX_VALUE)
return java::lang::Integer::MAX_VALUE;
return (jint)::rintf((float)x);
}
jlong java::lang::Math::round(jdouble x)
{
if (x != x)
return 0;
if (x <= (jdouble)java::lang::Long::MIN_VALUE)
return java::lang::Long::MIN_VALUE;
if (x >= (jdouble)java::lang::Long::MAX_VALUE)
return java::lang::Long::MAX_VALUE;
return (jlong)::rint((double)x);
}
jdouble java::lang::Math::floor(jdouble x)
{
return (jdouble)::floor((double)x);
@ -158,48 +122,6 @@ isNaN (jint bits)
return e == 0x7f800000 && f != 0;
}
jfloat
java::lang::Math::min(jfloat a, jfloat b)
{
jint abits = floatToIntBits (a);
jint bbits = floatToIntBits (b);
if (isNaN (abits) || isNaN (bbits))
return java::lang::Float::NaN;
if (abits >= 0) // a is +ve
return bbits < 0 ? b // a is +ve, b is -ve.
// a and b are both +ve, so compare magnitudes: the number with
// the smallest magnitude is the smallest
: (abits < bbits ? a : b);
else // a is -ve
return bbits >= 0 ? a // a is -ve, b is +ve.
// a and b are both -ve, so compare magnitudes: the number with
// the biggest magnitude is the smallest
: (abits > bbits ? a : b);
}
jfloat
java::lang::Math::max(jfloat a, jfloat b)
{
jint abits = floatToIntBits (a);
jint bbits = floatToIntBits (b);
if (isNaN (abits) || isNaN (bbits))
return java::lang::Float::NaN;
if (abits >= 0) // a is +ve
return bbits < 0 ? a // a is +ve, b is -ve.
// a and b are both +ve, so compare magnitudes: the number with
// the smallest magnitude is the smallest
: (abits > bbits ? a : b);
else // a is -ve
return bbits >= 0 ? b // a is -ve, b is +ve.
// a and b are both -ve, so compare magnitudes: the number with
// the biggest magnitude is the smallest
: (abits < bbits ? a : b);
}
static inline jlong
doubleToLongBits (jdouble value)
{
@ -220,46 +142,3 @@ isNaN (jlong bits)
return e == 0x7ff0000000000000LL && f != 0LL;
}
jdouble
java::lang::Math::min(jdouble a, jdouble b)
{
jlong abits = doubleToLongBits (a);
jlong bbits = doubleToLongBits (b);
if (isNaN (abits) || isNaN (bbits))
return java::lang::Double::NaN;
if (abits >= 0LL) // a is +ve
return bbits < 0LL ? b // a is +ve, b is -ve.
// a and b are both +ve, so compare magnitudes: the number with
// the smallest magnitude is the smallest
: (abits < bbits ? a : b);
else // a is -ve
return bbits >= 0LL ? a // a is -ve, b is +ve.
// a and b are both -ve, so compare magnitudes: the number with
// the biggest magnitude is the smallest
: (abits > bbits ? a : b);
}
jdouble
java::lang::Math::max(jdouble a, jdouble b)
{
jlong abits = doubleToLongBits (a);
jlong bbits = doubleToLongBits (b);
if (isNaN (abits) || isNaN (bbits))
return java::lang::Double::NaN;
if (abits >= 0LL) // a is +ve
return bbits < 0LL ? a // a is +ve, b is -ve.
// a and b are both +ve, so compare magnitudes: the number with
// the smallest magnitude is the smallest
: (abits > bbits ? a : b);
else // a is -ve
return bbits >= 0LL ? b // a is -ve, b is +ve.
// a and b are both -ve, so compare magnitudes: the number with
// the biggest magnitude is the smallest
: (abits < bbits ? a : b);
}