diff options
author | Roland McGrath <roland@gnu.org> | 1996-01-17 02:03:00 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-01-17 02:03:00 +0000 |
commit | 7176f4e4b5ffc9765f3a43c53bc2f96cc3909700 (patch) | |
tree | bb8efb5c93c4fdae80f48c42c0742d738888641f /sysdeps/m68k/fpu | |
parent | b17178fc56b52ad4d251b9286365f6da60c860e6 (diff) | |
download | glibc-7176f4e4b5ffc9765f3a43c53bc2f96cc3909700.tar.gz glibc-7176f4e4b5ffc9765f3a43c53bc2f96cc3909700.tar.xz glibc-7176f4e4b5ffc9765f3a43c53bc2f96cc3909700.zip |
* misc/efgcvt_r.c (ecvt_r): Handle negative values.
* stdlib/stdlib.h: Replace __CONSTVALUE by attribute. * stdlib/abs.c, stdlib/div.c, stdlib/labs.c, stdlib/ldiv.c, sysdeps/generic/hypot.c: Remove obsolete __CONSTVALUE. * stdio-common/printf_fp.c (__printf_fp): Fix parameter declaration. * sysdeps/generic/putenv.c (putenv): Fix second argument of setenv. * sysdeps/ieee754/hypot.c: New file, extracted out of cabs.c. * sysdeps/ieee754/cabs.c: Don't define hypot here. * sysdeps/ieee754/ieee754.h (union ieee854_long_double): Fix definition of ieee_nan alternative. * sysdeps/m68k/__longjmp.c, sysdeps/m68k/setjmp.c: Add register prefix spec. * sysdeps/m68k/ffs.c (ffs): Fix register constraint. * sysdeps/m68k/fpu/__math.h: Include <errno.h>. Replace obsolete __CONSTVALUE by attribute. (floor): Round to negative infinity. (rint, expm1) [__NO_MATH_INLINES]: Don't define, to avoid type clash when compiling source. (pow): Handle x == 0 and x < 0. (ceil, __isinf, __isnan): Fix register constraints. (__isinfl, __isnanl): Added. * sysdeps/m68k/fpu/acos.c, sysdeps/m68k/fpu/atan2.c, sysdeps/m68k/fpu/fmod.c, sysdeps/m68k/fpu/ldexp.c, sysdeps/m68k/fpu/pow.c: Remove obsolete __CONSTVALUE. * sysdeps/m68k/bsd-_setjmp.S, sysdeps/m68k/bsd-setjmp.S: Fix assembler syntax. * sysdeps/unix/bsd/bsd4.4/fchdir.S (fchdir): Take only one argument. * sysdeps/unix/bsd/clock.c (timeval_to_clock_t): Fix timeval to clock_t conversion. (clock): Don't multiply by CLOCKS_PER_SEC. * sysdeps/unix/bsd/poll.c (poll): Fix msec to timeval conversion. * sysdeps/unix/bsd/sun/m68k/brk.S (brk): Compare with address of __end. * sysdeps/unix/bsd/sun/m68k/vfork.S: Fix assembler syntax. * sysdeps/unix/bsd/ualarm.c (ualarm): Fix timeval calculation. * sysdeps/unix/bsd/vax/vfork.S: Remove duplicate label.
Diffstat (limited to 'sysdeps/m68k/fpu')
-rw-r--r-- | sysdeps/m68k/fpu/__math.h | 118 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/acos.c | 2 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/atan2.c | 2 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/fmod.c | 2 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/ldexp.c | 2 | ||||
-rw-r--r-- | sysdeps/m68k/fpu/pow.c | 2 |
6 files changed, 106 insertions, 22 deletions
diff --git a/sysdeps/m68k/fpu/__math.h b/sysdeps/m68k/fpu/__math.h index a9ae2d966c..e357364fb7 100644 --- a/sysdeps/m68k/fpu/__math.h +++ b/sysdeps/m68k/fpu/__math.h @@ -19,6 +19,8 @@ Cambridge, MA 02139, USA. */ #ifdef __GNUC__ #include <sys/cdefs.h> +#define __need_Emath +#include <errno.h> #ifdef __NO_MATH_INLINES /* This is used when defining the functions themselves. Define them with @@ -28,12 +30,14 @@ Cambridge, MA 02139, USA. */ #define __m81_inline static __inline #else #define __m81_u(x) x -#define __m81_inline exter __inline +#define __m81_inline extern __inline #define __MATH_INLINES 1 #endif #define __inline_mathop2(func, op) \ - __m81_inline __CONSTVALUE double \ + __m81_inline double \ + __m81_u(func)(double __mathop_x) __attribute__((__const__)); \ + __m81_inline double \ __m81_u(func)(double __mathop_x) \ { \ double __result; \ @@ -55,20 +59,23 @@ __inline_mathop2(exp, etox) __inline_mathop2(fabs, abs) __inline_mathop(log10) __inline_mathop2(log, logn) -__inline_mathop2(floor, intrz) __inline_mathop(sqrt) __inline_mathop2(__rint, int) __inline_mathop2(__expm1, etoxm1) #ifdef __USE_MISC +#ifndef __NO_MATH_INLINES __inline_mathop2(rint, int) __inline_mathop2(expm1, etoxm1) +#endif __inline_mathop2(log1p, lognp1) __inline_mathop(atanh) #endif -__m81_inline __CONSTVALUE double +__m81_inline double +__m81_u(__drem)(double __x, double __y) __attribute__ ((__const__)); +__m81_inline double __m81_u(__drem)(double __x, double __y) { double __result; @@ -76,7 +83,9 @@ __m81_u(__drem)(double __x, double __y) return __result; } -__m81_inline __CONSTVALUE double +__m81_inline double +__m81_u(ldexp)(double __x, int __e) __attribute__ ((__const__)); +__m81_inline double __m81_u(ldexp)(double __x, int __e) { double __result; @@ -85,7 +94,9 @@ __m81_u(ldexp)(double __x, int __e) return __result; } -__m81_inline __CONSTVALUE double +__m81_inline double +__m81_u(fmod)(double __x, double __y) __attribute__ ((__const__)); +__m81_inline double __m81_u(fmod)(double __x, double __y) { double __result; @@ -103,11 +114,39 @@ __m81_u(frexp)(double __value, int *__expptr) return __mantissa; } -__m81_inline __CONSTVALUE double +__m81_inline double +__m81_u(floor)(double __x) __attribute__ ((__const__)); +__m81_inline double +__m81_u(floor)(double __x) +{ + double __result; + unsigned long int __ctrl_reg; + __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg)); + /* Set rounding towards negative infinity. */ + __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ + : "dmi" ((__ctrl_reg & ~0x10) | 0x20)); + /* Convert X to an integer, using -Inf rounding. */ + __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x)); + /* Restore the previous rounding mode. */ + __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ + : "dmi" (__ctrl_reg)); + return __result; +} + +__m81_inline double +__m81_u(pow)(double __x, double __y) __attribute__ ((__const__)); +__m81_inline double __m81_u(pow)(double __x, double __y) { double __result; - if (__y == 0.0 || __x == 1.0) + if (__x == 0.0) + { + if (__y <= 0.0) + __result = __infnan (EDOM); + else + __result = 0.0; + } + else if (__y == 0.0 || __x == 1.0) __result = 1.0; else if (__y == 1.0) __result = __x; @@ -117,23 +156,40 @@ __m81_u(pow)(double __x, double __y) __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) + { + double __temp = __m81_u (__rint) (__y); + if (__y == __temp) + { + int i = (int) __y; + __result = __m81_u (exp) (__y * __m81_u (log) (-__x)); + if (i & 1) + __result = -__result; + } + else + __result = __infnan (EDOM); + } else __result = __m81_u(exp)(__y * __m81_u(log)(__x)); return __result; } -__m81_inline __CONSTVALUE double +__m81_inline double +__m81_u(ceil)(double __x) __attribute__ ((__const__)); +__m81_inline double __m81_u(ceil)(double __x) { double __result; unsigned long int __ctrl_reg; - __asm("fmove%.l fpcr, %0" : "=g" (__ctrl_reg)); + __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg)); /* Set rounding towards positive infinity. */ - __asm("fmove%.l %0, fpcr" : /* No outputs. */ : "g" (__ctrl_reg | 0x30)); + __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ + : "dmi" (__ctrl_reg | 0x30)); /* Convert X to an integer, using +Inf rounding. */ - __asm("fint%.x %1, %0" : "=f" (__result) : "f" (__x)); + __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x)); /* Restore the previous rounding mode. */ - __asm("fmove%.l %0, fpcr" : /* No outputs. */ : "g" (__ctrl_reg)); + __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */ + : "dmi" (__ctrl_reg)); return __result; } @@ -145,23 +201,51 @@ __m81_u(modf)(double __value, double *__iptr) return __value - __modf_int; } -__m81_inline __CONSTVALUE int +__m81_inline int +__m81_u(__isinf)(double __value) __attribute__ ((__const__)); +__m81_inline int __m81_u(__isinf)(double __value) { /* There is no branch-condition for infinity, so we must extract and examine the condition codes manually. */ unsigned long int __fpsr; __asm("ftst%.x %1\n" - "fmove%.l fpsr, %0" : "=g" (__fpsr) : "f" (__value)); + "fmove%.l %/fpsr, %0" : "=dm" (__fpsr) : "f" (__value)); return (__fpsr & (2 << (3 * 8))) ? (__value < 0 ? -1 : 1) : 0; } -__m81_inline __CONSTVALUE int +__m81_inline int +__m81_u(__isnan)(double __value) __attribute__ ((__const__)); +__m81_inline int __m81_u(__isnan)(double __value) { char __result; __asm("ftst%.x %1\n" - "fsun %0" : "=g" (__result) : "f" (__value)); + "fsun %0" : "=dm" (__result) : "f" (__value)); + return __result; +} + +__m81_inline int +__m81_u(__isinfl)(long double __value) __attribute__ ((__const__)); +__m81_inline int +__m81_u(__isinfl)(long double __value) +{ + /* There is no branch-condition for infinity, + so we must extract and examine the condition codes manually. */ + unsigned long int __fpsr; + __asm("ftst%.x %1\n" + "fmove%.l %/fpsr, %0" : "=dm" (__fpsr) : "f" (__value)); + return (__fpsr & (2 << (3 * 8))) ? (__value < 0 ? -1 : 1) : 0; +} + +__m81_inline int +__m81_u(__isnanl)(long double __value) __attribute__ ((__const__)); +__m81_inline int +__m81_u(__isnanl)(long double __value) +{ + char __result; + __asm("ftst%.x %1\n" + "fsun %0" : "=dm" (__result) : "f" (__value)); return __result; } diff --git a/sysdeps/m68k/fpu/acos.c b/sysdeps/m68k/fpu/acos.c index d4be88f17c..1481ce2cd9 100644 --- a/sysdeps/m68k/fpu/acos.c +++ b/sysdeps/m68k/fpu/acos.c @@ -25,7 +25,7 @@ Cambridge, MA 02139, USA. */ #endif -__CONSTVALUE double +double DEFUN(FUNC, (x), double x) { return __m81_u(FUNC)(x); diff --git a/sysdeps/m68k/fpu/atan2.c b/sysdeps/m68k/fpu/atan2.c index 1efdb1f7a6..753b7f04af 100644 --- a/sysdeps/m68k/fpu/atan2.c +++ b/sysdeps/m68k/fpu/atan2.c @@ -21,7 +21,7 @@ Cambridge, MA 02139, USA. */ #ifdef __GNUC__ -__CONSTVALUE double +double DEFUN(atan2, (y, x), double y AND double x) { static CONST double one = 1.0, zero = 0.0; diff --git a/sysdeps/m68k/fpu/fmod.c b/sysdeps/m68k/fpu/fmod.c index 9a6c8cd162..e3a2de0689 100644 --- a/sysdeps/m68k/fpu/fmod.c +++ b/sysdeps/m68k/fpu/fmod.c @@ -20,7 +20,7 @@ Cambridge, MA 02139, USA. */ #define __NO_MATH_INLINES #include <math.h> -__CONSTVALUE double +double DEFUN(fmod, (x, y), double x AND double y) { return __fmod(x, y); diff --git a/sysdeps/m68k/fpu/ldexp.c b/sysdeps/m68k/fpu/ldexp.c index ba912805d6..7e34882282 100644 --- a/sysdeps/m68k/fpu/ldexp.c +++ b/sysdeps/m68k/fpu/ldexp.c @@ -20,7 +20,7 @@ Cambridge, MA 02139, USA. */ #define __NO_MATH_INLINES #include <math.h> -__CONSTVALUE double +double DEFUN(ldexp, (x, exp), double x AND int exp) { return __ldexp(x, exp); diff --git a/sysdeps/m68k/fpu/pow.c b/sysdeps/m68k/fpu/pow.c index 3360020f1d..5ace4dad2f 100644 --- a/sysdeps/m68k/fpu/pow.c +++ b/sysdeps/m68k/fpu/pow.c @@ -20,7 +20,7 @@ Cambridge, MA 02139, USA. */ #define __NO_MATH_INLINES #include <math.h> -__CONSTVALUE double +double DEFUN(pow, (x, y), double x AND double y) { return __pow(x, y); |