simplify lround and llround functions

Simple wrappers around round is enough because
spurious inexact exception is allowed.

diff --git a/src/math/llround.c b/src/math/llround.c
index c11fc3ba002005f1ccde7ee6b83ea5d365a4aef4..4d94787d6227596e0d692622d320f159d8396694 100644 (file)
--- 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 594ce967f808ddc341bf8e86d763556122a07f59..19eb77ee3d568c9d95826a9a29ba5e90e24af819 100644 (file)
--- 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 107744a97034ab76c95f01d37ea709658cab942d..2c2ee5ecd68596965567a90347a9b7fc4111b864 100644 (file)
--- 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 f62c8d40772b47d0a49a465ef163767fbcf02ecc..b8b795470f1868d831e7c2893c7f3b7f019ddbdb 100644 (file)
--- 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 135ba5834a6c2cb9e88a7706d0ff088eebeed061..c4707e7db712cd545915efea603173e21efc709e 100644 (file)
--- 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 7b593f773a3742c73e57125c2916e47960eae690..094fdf6483842e90a9fac200394255d02bb8073d 100644 (file)
--- 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