aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/m68k/fpu/s_csinh.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-05-07 15:31:21 +0000
committerUlrich Drepper <drepper@redhat.com>1997-05-07 15:31:21 +0000
commit51702635af8445431054291c86aaace7c30b0970 (patch)
treee9cc4d28c401bd6046f71f62d186865d37c0141f /sysdeps/m68k/fpu/s_csinh.c
parent1f07e6177553845817af5f7c90f148edd2e59d32 (diff)
downloadglibc-51702635af8445431054291c86aaace7c30b0970.tar
glibc-51702635af8445431054291c86aaace7c30b0970.tar.gz
glibc-51702635af8445431054291c86aaace7c30b0970.tar.bz2
glibc-51702635af8445431054291c86aaace7c30b0970.zip
* locale/categories.def: Change type of _NL_CTYPE_CLASS_NAMES and _NL_CTYPE_MAP_NAMES field to stringlist. Change name of _NL_CTYPE_CODESET_NAME to "charmap". * locale/localeinfo.h (enum value_type): Add stringlist. * locale/programs/locale.c (show_info): Handle stringlist. * locale/programs/charmap.c (charmap_read): If charmap file is not using the given name try to find it by looking through all available charmap files and compare the code set name. * locale/programs/locale.c (write_charmaps): Also print names of charset in <code_set_name> fields in the files. * elf/ldd.bash.in: Correct translatable strings. * posix/TESTS: Add some more tests for character class matching. * posix/regex.c: Merge with GNU awk version. (regex_compile): Use ISO C/amend 1 functions for character class handling. * posix/regex.h: Merge with GNU awk version. * posix/getopt.c: Declare as master copies. * posix/getopt1.c: Likewise. * posix/getopt.h: Likewise. * sysdeps/unix/sysv/linux/sys/mount.h: Add definitions for option value to mount functions. Patch by a sun <asun@zoology.washington.edu>. * stdio-common/bug4.c (main): Use /tmp/bug4.test for concurrency with other tests. * sunrpc/svc_run.c (svc_exit): New, defined. (svc_run): Test for svc_stop variable. * sysdeps/m68k/s_cexp.c: Rewritten. * sysdeps/m68k/s_cexpf.c: Likewise. * sysdeps/m68k/s_cexpl.c: Likewise.
Diffstat (limited to 'sysdeps/m68k/fpu/s_csinh.c')
-rw-r--r--sysdeps/m68k/fpu/s_csinh.c91
1 files changed, 17 insertions, 74 deletions
diff --git a/sysdeps/m68k/fpu/s_csinh.c b/sysdeps/m68k/fpu/s_csinh.c
index c409ed0d8f..643a221b57 100644
--- a/sysdeps/m68k/fpu/s_csinh.c
+++ b/sysdeps/m68k/fpu/s_csinh.c
@@ -25,9 +25,6 @@
#ifndef SUFF
#define SUFF
#endif
-#ifndef huge_val
-#define huge_val HUGE_VAL
-#endif
#ifndef float_type
#define float_type double
#endif
@@ -40,87 +37,33 @@ __complex__ float_type
s(__csinh) (__complex__ float_type x)
{
__complex__ float_type retval;
- int negate = m81(__signbit) (__real__ x);
+ unsigned long ix_cond;
- __real__ x = s(fabs) (__real__ x);
+ ix_cond = __m81_test (__imag__ x);
- if (m81(__finite) (__real__ x))
+ if ((ix_cond & (__M81_COND_INF|__M81_COND_NAN)) == 0)
{
- if (m81(__finite) (__imag__ x))
- {
- float_type sinh_val;
- float_type sin_ix, cos_ix;
-
- __asm ("fsincos%.x %2,%1:%0" : "=f" (sin_ix), "=f" (cos_ix)
- : "f" (__imag__ x));
- sinh_val = m81(__ieee754_sinh) (__real__ x);
- __real__ retval = cos_ix * sinh_val;
- __imag__ retval = sin_ix * sinh_val;
+ /* Imaginary part is finite. */
+ float_type sin_ix, cos_ix;
- if (negate)
- __real__ retval = -__real__ retval;
- }
- else if (__real__ x == 0)
- {
- __real__ retval = 0.0;
- __imag__ retval = 0.0/0.0;
-
- if (negate)
- __real__ retval = -__real__ retval;
- }
+ __asm ("fsincos%.x %2,%1:%0" : "=f" (sin_ix), "=f" (cos_ix)
+ : "f" (__imag__ x));
+ __real__ retval = cos_ix * m81(__ieee754_sinh) (__real__ x);
+ if (ix_cond & __M81_COND_ZERO)
+ __imag__ retval = __imag__ x;
else
- __real__ retval = __imag__ retval = 0.0/0.0;
+ __imag__ retval = sin_ix * m81(__ieee754_cosh) (__real__ x);
}
- else if (m81(__isinf) (__real__ x))
+ else
{
- if (__imag__ x == 0.0)
- {
- __real__ retval = negate ? -huge_val : huge_val;
- __imag__ retval = __imag__ x;
- }
- else if (m81(__finite) (__imag__ x))
- {
- float_type remainder, pi_2;
- int quadrant;
- __real__ retval = __imag__ retval = huge_val;
+ unsigned long rx_cond = __m81_test (__real__ x);
- __asm ("fmovecr %#0,%0\n\tfscale%.w %#-1,%0" : "=f" (pi_2));
- __asm ("fmod%.x %2,%0\n\tfmove%.l %/fpsr,%1"
- : "=f" (remainder), "=dm" (quadrant)
- : "f" (pi_2), "0" (__imag__ x));
- quadrant = (quadrant >> 16) & 0x83;
- if (quadrant & 0x80)
- quadrant ^= 0x83;
- if (negate)
- quadrant ^= 1;
- switch (quadrant)
- {
- default:
- break;
- case 1:
- __real__ retval = -__real__ retval;
- break;
- case 2:
- __real__ retval = -__real__ retval;
- case 3:
- __imag__ retval = -__imag__ retval;
- break;
- }
- }
+ __imag__ retval = __imag__ x - __imag__ x;
+ if (rx_cond & (__M81_COND_ZERO|__M81_COND_INF|__M81_COND_NAN))
+ __real__ retval = __real__ x;
else
- {
- /* The subtraction raises the invalid exception. */
- __real__ retval = huge_val;
- __imag__ retval = huge_val - huge_val;
- }
+ __real__ retval = __imag__ retval;
}
- else if (__imag__ x == 0.0)
- {
- __real__ retval = 0.0/0.0;
- __imag__ retval = __imag__ x;
- }
- else
- __real__ retval = __imag__ retval = 0.0/0.0;
return retval;
}