From bac8af9c33af6b39822c9d211b68313f5b6b2b48 Mon Sep 17 00:00:00 2001 From: Aditya Upadhyay Date: Tue, 20 Jun 2017 16:35:12 +0530 Subject: [PATCH] Importing cacoshl.c and its dependencies. --- newlib/libm/complex/Makefile.am | 2 +- newlib/libm/complex/Makefile.in | 26 ++++++++-- newlib/libm/complex/cacoshl.c | 45 ++++++++++++++++ newlib/libm/complex/clogl.c | 46 +++++++++++++++++ newlib/libm/complex/csqrtl.c | 112 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 227 insertions(+), 4 deletions(-) create mode 100644 newlib/libm/complex/cacoshl.c create mode 100644 newlib/libm/complex/clogl.c create mode 100644 newlib/libm/complex/csqrtl.c diff --git a/newlib/libm/complex/Makefile.am b/newlib/libm/complex/Makefile.am index 402053f..9d04a5c 100644 --- a/newlib/libm/complex/Makefile.am +++ b/newlib/libm/complex/Makefile.am @@ -10,7 +10,7 @@ src = cabs.c cacos.c cacosh.c carg.c casin.c casinh.c \ cpow.c cproj.c creal.c \ csin.c csinh.c csqrt.c ctan.c ctanh.c -lsrc = cabsl.c creall.c cimagl.c ccoshl.c +lsrc = cabsl.c creall.c cimagl.c ccoshl.c cacoshl.c csqrtl.c clogl.c fsrc = cabsf.c casinf.c ccosf.c cimagf.c cprojf.c \ csqrtf.c cacosf.c casinhf.c ccoshf.c clogf.c clog10f.c \ diff --git a/newlib/libm/complex/Makefile.in b/newlib/libm/complex/Makefile.in index 55c74a1..581419f 100644 --- a/newlib/libm/complex/Makefile.in +++ b/newlib/libm/complex/Makefile.in @@ -97,7 +97,8 @@ am__objects_2 = lib_a-cabsf.$(OBJEXT) lib_a-casinf.$(OBJEXT) \ lib_a-catanhf.$(OBJEXT) lib_a-cexpf.$(OBJEXT) \ lib_a-cpowf.$(OBJEXT) lib_a-csinhf.$(OBJEXT) am__objects_3 = lib_a-cabsl.$(OBJEXT) lib_a-creall.$(OBJEXT) \ - lib_a-cimagl.$(OBJEXT) lib_a-ccoshl.$(OBJEXT) + lib_a-cimagl.$(OBJEXT) lib_a-ccoshl.$(OBJEXT) lib_a-cacoshl.$(OBJEXT) \ + lib_a-clogl.$(OBJEXT) lib_a-csqrtl.$(OBJEXT) @USE_LIBTOOL_FALSE@am_lib_a_OBJECTS = $(am__objects_1) \ @USE_LIBTOOL_FALSE@ $(am__objects_2) $(am__objects_3) lib_a_OBJECTS = $(am_lib_a_OBJECTS) @@ -112,7 +113,8 @@ am__objects_5 = cabsf.lo casinf.lo ccosf.lo cimagf.lo cprojf.lo \ crealf.lo ctanf.lo cacoshf.lo catanf.lo cephes_subrf.lo \ conjf.lo csinf.lo ctanhf.lo cargf.lo catanhf.lo cexpf.lo \ cpowf.lo csinhf.lo -am__objects_6 = cabsl.lo creall.lo cimagl.lo ccoshl.lo +am__objects_6 = cabsl.lo creall.lo cimagl.lo ccoshl.lo cacoshl.lo \ + clogl.lo csqrtl.lo @USE_LIBTOOL_TRUE@am_libcomplex_la_OBJECTS = $(am__objects_4) \ @USE_LIBTOOL_TRUE@ $(am__objects_5) $(am__objects_6) libcomplex_la_OBJECTS = $(am_libcomplex_la_OBJECTS) @@ -276,7 +278,7 @@ src = cabs.c cacos.c cacosh.c carg.c casin.c casinh.c \ cpow.c cproj.c creal.c \ csin.c csinh.c csqrt.c ctan.c ctanh.c -lsrc = cabsl.c creall.c cimagl.c ccoshl.c +lsrc = cabsl.c creall.c cimagl.c ccoshl.c cacoshl.c clogl.c csqrtl.c fsrc = cabsf.c casinf.c ccosf.c cimagf.c cprojf.c \ csqrtf.c cacosf.c casinhf.c ccoshf.c clogf.c clog10f.c \ crealf.c ctanf.c cacoshf.c catanf.c \ @@ -689,6 +691,24 @@ lib_a-ccoshl.o: ccoshl.c lib_a-ccoshl.obj: ccoshl.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ccoshl.obj `if test -f 'ccoshl.c'; then $(CYGPATH_W) 'ccoshl.c'; else $(CYGPATH_W) '$(srcdir)/ccoshl.c'; fi` +lib_a-cacoshl.o: cacoshl.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-cacoshl.o `test -f 'cacoshl.c' || echo '$(srcdir)/'`cacoshl.c + +lib_a-cacoshl.obj: cacoshl.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-cacoshl.obj `if test -f 'cacoshl.c'; then $(CYGPATH_W) 'cacoshl.c'; else $(CYGPATH_W) '$(srcdir)/cacoshl.c'; fi` + +lib_a-clogl.o: clogl.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-clogl.o `test -f 'clogl.c' || echo '$(srcdir)/'`clogl.c + +lib_a-clogl.obj: clogl.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-clogl.obj `if test -f 'clogl.c'; then $(CYGPATH_W) 'clogl.c'; else $(CYGPATH_W) '$(srcdir)/clogl.c'; fi` + +lib_a-csqrtl.o: csqrtl.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-csqrtl.o `test -f 'csqrtl.c' || echo '$(srcdir)/'`csqrtl.c + +lib_a-csqrtl.obj: csqrtl.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-csqrtl.obj `if test -f 'csqrtl.c'; then $(CYGPATH_W) 'csqrtl.c'; else $(CYGPATH_W) '$(srcdir)/csqrtl.c'; fi` + mostlyclean-libtool: -rm -f *.lo diff --git a/newlib/libm/complex/cacoshl.c b/newlib/libm/complex/cacoshl.c new file mode 100644 index 0000000..4e4e006 --- /dev/null +++ b/newlib/libm/complex/cacoshl.c @@ -0,0 +1,45 @@ +/* $NetBSD: cacoshl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */ + +/*- + * Copyright (c) 2007 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software written by Stephen L. Moshier. + * It is redistributed by the NetBSD Foundation by permission of the author. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +long double complex +cacoshl(long double complex z) +{ + long double complex w; + +#if 0 /* does not give the principal value */ + w = I * cacosl(z); +#else + w = clogl(z + csqrtl(z + 1) * csqrtl(z - 1)); +#endif + return w; +} diff --git a/newlib/libm/complex/clogl.c b/newlib/libm/complex/clogl.c new file mode 100644 index 0000000..3644a44 --- /dev/null +++ b/newlib/libm/complex/clogl.c @@ -0,0 +1,46 @@ +/* $NetBSD: clogl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */ + +/*- + * Copyright (c) 2007 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software written by Stephen L. Moshier. + * It is redistributed by the NetBSD Foundation by permission of the author. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +long double complex +clogl(long double complex z) +{ + long double complex w; + long double p, rr; + + rr = cabsl(z); + p = logl(rr); + rr = atan2l(cimagl(z), creall(z)); + w = p + rr * I; + return w; +} diff --git a/newlib/libm/complex/csqrtl.c b/newlib/libm/complex/csqrtl.c new file mode 100644 index 0000000..72d1d1d --- /dev/null +++ b/newlib/libm/complex/csqrtl.c @@ -0,0 +1,112 @@ +/*- + * Copyright (c) 2007-2008 David Schultz + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#if 0 +__FBSDID("$FreeBSD: head/lib/msun/src/s_csqrtl.c 181402 2008-08-08 00:15:16Z das $"); +#else +__RCSID("$NetBSD: csqrtl.c,v 1.2 2014/10/11 00:43:51 christos Exp $"); +#endif + +#include +#include +#include + +/* + * gcc doesn't implement complex multiplication or division correctly, + * so we need to handle infinities specially. We turn on this pragma to + * notify conforming c99 compilers that the fast-but-incorrect code that + * gcc generates is acceptable, since the special cases have already been + * handled. + */ +// #pragma STDC CX_LIMITED_RANGE ON + +/* We risk spurious overflow for components >= LDBL_MAX / (1 + sqrt(2)). */ +#define THRESH (LDBL_MAX / 2.414213562373095048801688724209698L) + +#define cpackl(r, i) ((r) + (i) * I) + +long double complex +csqrtl(long double complex z) +{ + long double complex result; + long double a, b; + long double t; + bool scale; + + a = creall(z); + b = cimagl(z); + + /* Handle special cases. */ + if (z == 0.0L) + return (cpackl(0.0L, b)); + if (isinf(b)) + return (cpackl(INFINITY, b)); + if (isnan(a)) { + t = (b - b) / (b - b); /* raise invalid if b is not a NaN */ + return (cpackl(a, t)); /* return NaN + NaN i */ + } + if (isinf(a)) { + /* + * csqrt(inf + NaN i) = inf + NaN i + * csqrt(inf + y i) = inf + 0 i + * csqrt(-inf + NaN i) = NaN +- inf i + * csqrt(-inf + y i) = 0 + inf i + */ + if (signbit(a)) + return (cpackl(fabsl(b - b), copysignl(a, b))); + else + return (cpackl(a, copysignl(b - b, b))); + } + /* + * The remaining special case (b is NaN) is handled just fine by + * the normal code path below. + */ + + /* Scale to avoid overflow. */ + if (fabsl(a) >= THRESH || fabsl(b) >= THRESH) { + a *= 0.25L; + b *= 0.25L; + scale = true; + } else { + scale = false; + } + + /* Algorithm 312, CACM vol 10, Oct 1967. */ + if (a >= 0L) { + t = sqrtl((a + hypotl(a, b)) * 0.5L); + result = cpackl(t, b / (2.0L * t)); + } else { + t = sqrtl((-a + hypotl(a, b)) * 0.5L); + result = cpackl(fabsl(b) / (2.0L * t), copysignl(t, b)); + } + + /* Rescale. */ + if (scale) + return (result * 2.0L); + else + return (result); +} -- 2.7.4