diff options
Diffstat (limited to 'sysdeps/m68k/fpu')
-rw-r--r-- | sysdeps/m68k/fpu/__math.h | 86 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/e_atan2.c | 100 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/e_atan2f.c | 5 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/e_atan2l.c | 5 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/e_pow.c | 137 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/e_powf.c | 5 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/e_powl.c | 5 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/s_exp2.c (renamed from sysdeps/m68k/fpu/s_logb.c) | 2 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/s_exp2f.c (renamed from sysdeps/m68k/fpu/s_logbf.c) | 2 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/s_exp2l.c (renamed from sysdeps/m68k/fpu/s_logbl.c) | 2 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/s_log2.c | 2 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/s_log2f.c | 2 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/s_log2l.c | 2 |
13 files changed, 254 insertions, 101 deletions
diff --git a/sysdeps/m68k/fpu/__math.h b/sysdeps/m68k/fpu/__math.h index fe01c254d7..d6187015ea 100644 --- a/sysdeps/m68k/fpu/__math.h +++ b/sysdeps/m68k/fpu/__math.h @@ -85,7 +85,6 @@ __inline_mathop(__fabs, abs) __inline_mathop(__rint, int) __inline_mathop(__expm1, etoxm1) __inline_mathop(__log1p, lognp1) -__inline_mathop(__logb, log2) __inline_mathop(__significand, getman) __inline_mathop(__log2, log2) @@ -103,7 +102,6 @@ __inline_mathop(tanh, tanh) __inline_mathop(rint, int) __inline_mathop(expm1, etoxm1) __inline_mathop(log1p, lognp1) -__inline_mathop(logb, log2) #endif #ifdef __USE_MISC @@ -140,90 +138,6 @@ __m81_defun (float_type, __CONCAT(__ieee754_fmod,s), \ return __result; \ } \ \ -__m81_defun (float_type, __CONCAT(__ieee754_atan2,s), \ - (float_type __y, float_type __x)) \ -{ \ - float_type __pi, __pi_2; \ - \ - __asm ("fmovecr%.x %#0, %0" : "=f" (__pi)); \ - __asm ("fscale%.w %#-1, %0" : "=f" (__pi_2) : "0" (__pi)); \ - if (__x > 0) \ - { \ - if (__y > 0) \ - { \ - if (__x > __y) \ - return __m81_u(__CONCAT(__atan,s)) (__y / __x); \ - else \ - return __pi_2 - __m81_u(__CONCAT(__atan,s)) (__x / __y); \ - } \ - else \ - { \ - if (__x > -__y) \ - return __m81_u(__CONCAT(__atan,s)) (__y / __x); \ - else \ - return -__pi_2 - __m81_u(__CONCAT(__atan,s)) (__x / __y); \ - } \ - } \ - else \ - { \ - if (__y > 0) \ - { \ - if (-__x < __y) \ - return __pi + __m81_u(__CONCAT(__atan,s)) (__y / __x); \ - else \ - return __pi_2 - __m81_u(__CONCAT(__atan,s)) (__x / __y); \ - } \ - else \ - { \ - if (-__x > -__y) \ - return -__pi + __m81_u(__CONCAT(__atan,s)) (__y / __x); \ - else \ - return -__pi_2 - __m81_u(__CONCAT(__atan,s)) (__x / __y); \ - } \ - } \ -} \ - \ -__m81_defun (float_type, __CONCAT(__ieee754_pow,s), \ - (float_type __x, float_type __y)) \ -{ \ - float_type __result; \ - if (__x == 0.0) \ - { \ - if (__y <= 0.0) \ - __result = 0.0 / 0.0; \ - else \ - __result = 0.0; \ - } \ - else if (__y == 0.0 || __x == 1.0) \ - __result = 1.0; \ - else if (__y == 1.0) \ - __result = __x; \ - else if (__y == 2.0) \ - __result = __x * __x; \ - else if (__x == 10.0) \ - __asm("ftentox%.x %1, %0" : "=f" (__result) : "f" (__y)); \ - else if (__x == 2.0) \ - __asm("ftwotox%.x %1, %0" : "=f" (__result) : "f" (__y)); \ - else if (__x < 0.0) \ - { \ - float_type __temp = __m81_u (__CONCAT(__rint,s)) (__y); \ - if (__y == __temp) \ - { \ - int __i = (int) __y; \ - __result = (__m81_u(__CONCAT(__ieee754_exp,s)) \ - (__y * __m81_u(__CONCAT(__ieee754_log,s)) (-__x))); \ - if (__i & 1) \ - __result = -__result; \ - } \ - else \ - __result = 0.0 / 0.0; \ - } \ - else \ - __result = (__m81_u(__CONCAT(__ieee754_exp,s)) \ - (__y * __m81_u(__CONCAT(__ieee754_log,s)) (__x))); \ - return __result; \ -} \ - \ __m81_defun (float_type, __CONCAT(__ieee754_scalb,s), \ (float_type __x, float_type __n)) \ { \ diff --git a/sysdeps/m68k/fpu/e_atan2.c b/sysdeps/m68k/fpu/e_atan2.c index ae7a799ad1..58d7555f41 100644 --- a/sysdeps/m68k/fpu/e_atan2.c +++ b/sysdeps/m68k/fpu/e_atan2.c @@ -1,2 +1,98 @@ -#define FUNC __ieee754_atan2 -#include <e_fmod.c> +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#define __LIBC_M81_MATH_INLINES +#include <math.h> +#include "math_private.h" + +#ifndef SUFF +#define SUFF +#endif +#ifndef float_type +#define float_type double +#endif + +#define __CONCATX(a,b) __CONCAT(a,b) + +float_type +__CONCATX(__ieee754_atan2,SUFF) (float_type y, float_type x) +{ + float_type pi, pi_2, z; + + __asm ("fmovecr%.x %#0, %0" : "=f" (pi)); + __asm ("fscale%.w %#-1, %0" : "=f" (pi_2) : "0" (pi)); + if (x != x || y != y) + z = x + y; + else if (y == 0) + { + if (signbit (x)) + z = signbit (y) ? -pi : pi; + else + z = y; + } + else if (__m81_u(__CONCATX(__isinf,SUFF)) (x)) + { + if (__m81_u(__CONCATX(__isinf,SUFF)) (y)) + { + float_type pi_4; + __asm ("fscale%.w %#-1, %0" : "=f" (pi_4) : "0" (pi_2)); + z = x > 0 ? pi_4 : 3 * pi_4; + } + else + z = x > 0 ? 0 : pi; + if (signbit (y)) + z = -z; + } + else if (__m81_u(__CONCATX(__isinf,SUFF)) (y)) + z = y > 0 ? pi_2 : -pi_2; + else if (x > 0) + { + if (y > 0) + { + if (x > y) + z = __m81_u(__CONCATX(__atan,SUFF)) (y / x); + else + z = pi_2 - __m81_u(__CONCATX(__atan,SUFF)) (x / y); + } + else + { + if (x > -y) + z = __m81_u(__CONCATX(__atan,SUFF)) (y / x); + else + z = -pi_2 - __m81_u(__CONCATX(__atan,SUFF)) (x / y); + } + } + else + { + if (y < 0) + { + if (-x > y) + z = -pi + __m81_u(__CONCATX(__atan,SUFF)) (y / x); + else + z = -pi_2 - __m81_u(__CONCATX(__atan,SUFF)) (x / y); + } + else + { + if (-x > y) + z = pi + __m81_u(__CONCATX(__atan,SUFF)) (y / x); + else + z = pi_2 - __m81_u(__CONCATX(__atan,SUFF)) (x / y); + } + } + return z; +} diff --git a/sysdeps/m68k/fpu/e_atan2f.c b/sysdeps/m68k/fpu/e_atan2f.c index a4c5ebdfd3..a0c750a759 100644 --- a/sysdeps/m68k/fpu/e_atan2f.c +++ b/sysdeps/m68k/fpu/e_atan2f.c @@ -1,2 +1,3 @@ -#define FUNC __ieee754_atan2f -#include <e_fmodf.c> +#define SUFF f +#define float_type float +#include <e_atan2.c> diff --git a/sysdeps/m68k/fpu/e_atan2l.c b/sysdeps/m68k/fpu/e_atan2l.c index 0d43a77b9e..426ca94baa 100644 --- a/sysdeps/m68k/fpu/e_atan2l.c +++ b/sysdeps/m68k/fpu/e_atan2l.c @@ -1,2 +1,3 @@ -#define FUNC __ieee754_atan2l -#include <e_fmodl.c> +#define SUFF l +#define float_type long double +#include <e_atan2.c> diff --git a/sysdeps/m68k/fpu/e_pow.c b/sysdeps/m68k/fpu/e_pow.c index 29798a15ca..970e8b821b 100644 --- a/sysdeps/m68k/fpu/e_pow.c +++ b/sysdeps/m68k/fpu/e_pow.c @@ -1,2 +1,135 @@ -#define FUNC __ieee754_pow -#include <e_fmod.c> +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#define __LIBC_M81_MATH_INLINES +#include <math.h> +#include "math_private.h" + +#ifndef SUFF +#define SUFF +#endif +#ifndef float_type +#define float_type double +#endif + +#define __CONCATX(a,b) __CONCAT(a,b) + +float_type +__CONCATX(__ieee754_pow,SUFF) (float_type x, float_type y) +{ + float_type z; + float_type ax; + + if (y == 0.0) + return 1.0; + if (x != x || y != y) + return x + y; + + if (__m81_u(__CONCATX(__isinf,SUFF)) (y)) + { + ax = __CONCATX(fabs,SUFF) (x); + if (ax == 1) + return y - y; + if (ax > 1) + return y > 0 ? y : 0; + else + return y < 0 ? -y : 0; + } + + if (__CONCATX(fabs,SUFF) (y) == 1) + return y > 0 ? x : 1 / x; + + if (y == 2) + return x * x; + if (y == 0 && x >= 0) + return __m81_u(__CONCATX(__ieee754_sqrt,SUFF)) (x); + + if (x == 10.0) + { + __asm ("ftentox%.x %1, %0" : "=f" (z) : "f" (y)); + return z; + } + if (x == 2.0) + { + __asm ("ftwotox%.x %1, %0" : "=f" (z) : "f" (y)); + return z; + } + + ax = __CONCATX(fabs,SUFF) (x); + if (__m81_u(__CONCATX(__isinf,SUFF)) (x) || x == 0 || ax == 1) + { + z = ax; + if (y < 0) + z = 1 / z; + if (signbit (x)) + { + float_type temp = __m81_u (__CONCATX(__rint,SUFF)) (y); + if (y != temp) + { + if (x == -1) + z = (z - z) / (z - z); + } + else + { + if (sizeof (float_type) == sizeof (float)) + { + long i = (long) y; + if (i & 1) + z = -z; + } + else + { + long long i = (long long) y; + if ((float_type) i == y && i & 1) + z = -z; + } + } + } + return z; + } + + if (x < 0.0) + { + float_type temp = __m81_u (__CONCATX(__rint,SUFF)) (y); + if (y == temp) + { + long long i = (long long) y; + z = (__m81_u(__CONCATX(__ieee754_exp,SUFF)) + (y * __m81_u(__CONCATX(__ieee754_log,SUFF)) (-x))); + if (sizeof (float_type) == sizeof (float)) + { + long i = (long) y; + if (i & 1) + z = -z; + } + else + { + /* If the conversion to long long was inexact assume that y + is an even integer. */ + if ((float_type) i == y && i & 1) + z = -z; + } + } + else + z = (x - x) / (x - x); + } + else + z = (__m81_u(__CONCATX(__ieee754_exp,SUFF)) + (y * __m81_u(__CONCATX(__ieee754_log,SUFF)) (x))); + return z; +} diff --git a/sysdeps/m68k/fpu/e_powf.c b/sysdeps/m68k/fpu/e_powf.c index 978d32eacc..379014355a 100644 --- a/sysdeps/m68k/fpu/e_powf.c +++ b/sysdeps/m68k/fpu/e_powf.c @@ -1,2 +1,3 @@ -#define FUNC __ieee754_powf -#include <e_fmodf.c> +#define SUFF f +#define float_type float +#include <e_pow.c> diff --git a/sysdeps/m68k/fpu/e_powl.c b/sysdeps/m68k/fpu/e_powl.c index 0feec54fec..f71fa34a26 100644 --- a/sysdeps/m68k/fpu/e_powl.c +++ b/sysdeps/m68k/fpu/e_powl.c @@ -1,2 +1,3 @@ -#define FUNC __ieee754_powl -#include <e_fmodl.c> +#define SUFF l +#define float_type long double +#include <e_pow.c> diff --git a/sysdeps/m68k/fpu/s_logb.c b/sysdeps/m68k/fpu/s_exp2.c index 9903b3089a..389528092a 100644 --- a/sysdeps/m68k/fpu/s_logb.c +++ b/sysdeps/m68k/fpu/s_exp2.c @@ -1,2 +1,2 @@ -#define FUNC logb +#define FUNC exp2 #include <s_atan.c> diff --git a/sysdeps/m68k/fpu/s_logbf.c b/sysdeps/m68k/fpu/s_exp2f.c index 6dcfee5807..20ac916d1a 100644 --- a/sysdeps/m68k/fpu/s_logbf.c +++ b/sysdeps/m68k/fpu/s_exp2f.c @@ -1,2 +1,2 @@ -#define FUNC logbf +#define FUNC exp2f #include <s_atanf.c> diff --git a/sysdeps/m68k/fpu/s_logbl.c b/sysdeps/m68k/fpu/s_exp2l.c index 7d06ac13c4..19121b929d 100644 --- a/sysdeps/m68k/fpu/s_logbl.c +++ b/sysdeps/m68k/fpu/s_exp2l.c @@ -1,2 +1,2 @@ -#define FUNC logbl +#define FUNC exp2l #include <s_atanl.c> diff --git a/sysdeps/m68k/fpu/s_log2.c b/sysdeps/m68k/fpu/s_log2.c new file mode 100644 index 0000000000..26e26bae95 --- /dev/null +++ b/sysdeps/m68k/fpu/s_log2.c @@ -0,0 +1,2 @@ +#define FUNC log2 +#include <s_atan.c> diff --git a/sysdeps/m68k/fpu/s_log2f.c b/sysdeps/m68k/fpu/s_log2f.c new file mode 100644 index 0000000000..68494322b8 --- /dev/null +++ b/sysdeps/m68k/fpu/s_log2f.c @@ -0,0 +1,2 @@ +#define FUNC log2f +#include <s_atanf.c> diff --git a/sysdeps/m68k/fpu/s_log2l.c b/sysdeps/m68k/fpu/s_log2l.c new file mode 100644 index 0000000000..c4eb06332b --- /dev/null +++ b/sysdeps/m68k/fpu/s_log2l.c @@ -0,0 +1,2 @@ +#define FUNC log2l +#include <s_atanl.c> |