From 8c5b85e155e251743fa65a57282ae95e14d63e0d Mon Sep 17 00:00:00 2001 From: des Date: Sat, 25 Oct 2003 09:32:18 +0000 Subject: - fabsl.c should be named s_fabsl.c for consistency with libmsun's documented naming scheme (unfortunately the documentation isn't in the tree as far as I can tell); no repocopy is required as there is no history to preserve. - replace simple and almost-correct implementation with slightly hackish but definitely correct implementation (tested on i386, alpha, sparc64) which requires pulling in fpmath.h and the MD _fpmath.h from libc. - try not to make a mess of the Makefile in the process. - enterprising minds are encouraged to implement more C99 long double functions. --- lib/msun/Makefile | 9 +++++++-- lib/msun/src/fabsl.c | 37 ------------------------------------- lib/msun/src/s_fabsl.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 39 deletions(-) delete mode 100644 lib/msun/src/fabsl.c create mode 100644 lib/msun/src/s_fabsl.c (limited to 'lib/msun') diff --git a/lib/msun/Makefile b/lib/msun/Makefile index aa9eda9..667bfcf 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -97,11 +97,16 @@ COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \ w_sinh.c w_sinhf.c w_sqrt.c w_sqrtf.c \ w_y0.c w_y0f.c w_y1.c w_y1f.c w_yn.c w_ynf.c +# Location of fpmath.h and _fpmath.h +LIBCDIR= ${.CURDIR}/../libc +CFLAGS+= -I${LIBCDIR}/include -I${LIBCDIR}/${MACHINE_ARCH} + +# C99 long double functions +COMMON_SRCS+= s_fabsl.c + # FreeBSD's C library supplies these functions: #COMMON_SRCS+= s_fabs.c s_frexp.c s_isnan.c s_ldexp.c s_modf.c -COMMON_SRCS+= fabsl.c - # Exclude the generic versions of what we provide in the MD area. .if defined(ARCH_SRCS) .PATH: ${.CURDIR}/${ARCH} diff --git a/lib/msun/src/fabsl.c b/lib/msun/src/fabsl.c deleted file mode 100644 index a78612f..0000000 --- a/lib/msun/src/fabsl.c +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * Copyright (c) 2003 Dag-Erling Coïdan Smørgrav - * 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 - * in this position and unchanged. - * 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. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - * - * $FreeBSD$ - */ - -#include - -long double -fabsl(long double x) -{ - return (x < 0) ? -x : x; -} diff --git a/lib/msun/src/s_fabsl.c b/lib/msun/src/s_fabsl.c new file mode 100644 index 0000000..3c986f4 --- /dev/null +++ b/lib/msun/src/s_fabsl.c @@ -0,0 +1,40 @@ +/*- + * Copyright (c) 2003 Dag-Erling Coïdan Smørgrav + * 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 + * in this position and unchanged. + * 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. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + * + * $FreeBSD$ + */ + +#include + +#include "fpmath.h" + +long double +fabsl(long double x) +{ + ((union IEEEl2bits *)&x)->bits.sign = 0; + return (x); +} -- cgit v1.1