From 67ed3a45ca7d949909c464480b330eaae034c6ac Mon Sep 17 00:00:00 2001 From: martynas Date: Wed, 23 Jul 2008 18:11:13 +0000 Subject: [PATCH] clear sign bit, instead of comparing to zero and setting x=-x. fixes special cases, such as neg. zero, and makes C99 conformant ok miod@, millert@ since there's nothing else in arm's fabs.c, replace 4-clause license w/ the one at /usr/share/misc/license.template --- lib/libc/arch/arm/gen/fabs.c | 57 ++++++++++++++---------------------- lib/libc/arch/sh/gen/fabs.c | 18 ++++++++---- 2 files changed, 34 insertions(+), 41 deletions(-) diff --git a/lib/libc/arch/arm/gen/fabs.c b/lib/libc/arch/arm/gen/fabs.c index 0ff790d29e4..aa1d8e07362 100644 --- a/lib/libc/arch/arm/gen/fabs.c +++ b/lib/libc/arch/arm/gen/fabs.c @@ -1,45 +1,32 @@ -/* $OpenBSD: fabs.c,v 1.2 2004/02/01 05:40:52 drahn Exp $ */ -/* $NetBSD: fabs.c,v 1.2 2002/05/26 11:48:01 wiz Exp $ */ - +/* $OpenBSD: fabs.c,v 1.3 2008/07/23 18:11:13 martynas Exp $ */ /* - * Copyright (c) 1996 Mark Brinicombe + * Copyright (c) 2008 Martynas Venckus * - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Mark Brinicombe - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * 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. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include +#include + /* - * fabs(x) returns the absolute value of x. + * fabs(d) returns the absolute value of d. */ - double -fabs(double x) +fabs(double d) { - if (x < 0) - x = -x; - return(x); + struct ieee_double *p = (struct ieee_double *)&d; + + p->dbl_sign = 0; + + return(d); } diff --git a/lib/libc/arch/sh/gen/fabs.c b/lib/libc/arch/sh/gen/fabs.c index 116e8b4139a..cadfc0e03ed 100644 --- a/lib/libc/arch/sh/gen/fabs.c +++ b/lib/libc/arch/sh/gen/fabs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fabs.c,v 1.3 2007/03/02 06:11:54 miod Exp $ */ +/* $OpenBSD: fabs.c,v 1.4 2008/07/23 18:11:14 martynas Exp $ */ /* * Copyright (c) 2006 Miodrag Vallat. * @@ -16,16 +16,22 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#if !defined(__SH4__) || defined(__SH4_NOFPU__) +#include +#include +#endif /* !defined(__SH4__) || defined(__SH4_NOFPU__) */ + #include double -fabs(double x) +fabs(double d) { #if defined(__SH4__) && !defined(__SH4_NOFPU__) - __asm__ __volatile__("fabs %0" : "=f"(x)); + __asm__ __volatile__("fabs %0" : "=f"(d)); #else - if (x < 0) - x = -x; + struct ieee_double *p = (struct ieee_double *)&d; + + p->dbl_sign = 0; #endif - return (x); + return (d); } -- 2.20.1