diff options
| -rw-r--r-- | src/math/llround.c | 14 | ||||
| -rw-r--r-- | src/math/llroundf.c | 12 | ||||
| -rw-r--r-- | src/math/llroundl.c | 14 | ||||
| -rw-r--r-- | src/math/lround.c | 66 | ||||
| -rw-r--r-- | src/math/lroundf.c | 12 | ||||
| -rw-r--r-- | src/math/lroundl.c | 14 |
6 files changed, 20 insertions, 112 deletions
diff --git a/src/math/llround.c b/src/math/llround.c index c11fc3ba..4d94787d 100644 --- a/src/math/llround.c +++ b/src/math/llround.c @@ -1,10 +1,6 @@ -#define type double -#define roundit round -#define dtype long long -#define DTYPE_MIN LLONG_MIN -#define DTYPE_MAX LLONG_MAX -#define fn llround - -#include "lround.c" - +#include <math.h> +long long llround(double x) +{ + return round(x); +} diff --git a/src/math/llroundf.c b/src/math/llroundf.c index 594ce967..19eb77ee 100644 --- a/src/math/llroundf.c +++ b/src/math/llroundf.c @@ -1,8 +1,6 @@ -#define type float -#define roundit roundf -#define dtype long long -#define DTYPE_MIN LLONG_MIN -#define DTYPE_MAX LLONG_MAX -#define fn llroundf +#include <math.h> -#include "lround.c" +long long llroundf(float x) +{ + return roundf(x); +} diff --git a/src/math/llroundl.c b/src/math/llroundl.c index 107744a9..2c2ee5ec 100644 --- a/src/math/llroundl.c +++ b/src/math/llroundl.c @@ -1,18 +1,6 @@ #include <math.h> -#include <float.h> -#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long long llroundl(long double x) { - return llround(x); + return roundl(x); } -#else -#define type long double -#define roundit roundl -#define dtype long long -#define DTYPE_MIN LLONG_MIN -#define DTYPE_MAX LLONG_MAX -#define fn llroundl - -#include "lround.c" -#endif diff --git a/src/math/lround.c b/src/math/lround.c index f62c8d40..b8b79547 100644 --- a/src/math/lround.c +++ b/src/math/lround.c @@ -1,66 +1,6 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/s_lround.c */ -/*- - * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG> - * 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 <math.h> -#include <limits.h> -#include <fenv.h> -#include "libm.h" - -#ifndef type -#define type double -#define roundit round -#define dtype long -#define DTYPE_MIN LONG_MIN -#define DTYPE_MAX LONG_MAX -#define fn lround -#endif - -/* - * If type has more precision than dtype, the endpoints dtype_(min|max) are - * of the form xxx.5; they are "out of range" because lround() rounds away - * from 0. On the other hand, if type has less precision than dtype, then - * all values that are out of range are integral, so we might as well assume - * that everything is in range. At compile time, INRANGE(x) should reduce to - * two floating-point comparisons in the former case, or TRUE otherwise. - */ -static const type dtype_min = DTYPE_MIN - 0.5; -static const type dtype_max = DTYPE_MAX + 0.5; -#define INRANGE(x) \ - (dtype_max - DTYPE_MAX != 0.5 || ((x) > dtype_min && (x) < dtype_max)) - -dtype fn(type x) +long lround(double x) { - - if (INRANGE(x)) { - x = roundit(x); - return (dtype)x; - } else { -#ifdef FE_INVALID - feraiseexcept(FE_INVALID); -#endif - return DTYPE_MAX; - } + return round(x); } diff --git a/src/math/lroundf.c b/src/math/lroundf.c index 135ba583..c4707e7d 100644 --- a/src/math/lroundf.c +++ b/src/math/lroundf.c @@ -1,8 +1,6 @@ -#define type float -#define roundit roundf -#define dtype long -#define DTYPE_MIN LONG_MIN -#define DTYPE_MAX LONG_MAX -#define fn lroundf +#include <math.h> -#include "lround.c" +long lroundf(float x) +{ + return roundf(x); +} diff --git a/src/math/lroundl.c b/src/math/lroundl.c index 7b593f77..094fdf64 100644 --- a/src/math/lroundl.c +++ b/src/math/lroundl.c @@ -1,18 +1,6 @@ #include <math.h> -#include <float.h> -#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long lroundl(long double x) { - return lround(x); + return roundl(x); } -#else -#define type long double -#define roundit roundl -#define dtype long -#define DTYPE_MIN LONG_MIN -#define DTYPE_MAX LONG_MAX -#define fn lroundl - -#include "lround.c" -#endif |