libm: Import nearbyint{,f}() functions from FreeBSD.

nearbyintl() requires rintl() which we currently miss.

Dragonfly-bug: <http://bugs.dragonflybsd.org/issue1546>

diff --git a/include/math.h b/include/math.h
index bb6b4ac..ea30b72 100644 (file)
--- a/include/math.h
+++ b/include/math.h
@@ -289,6 +289,8 @@ float       lgammaf(float);
 
 float  ceilf(float);
 float  floorf(float);
+float  nearbyintf(float);
+double nearbyint(double);
 float  rintf(float);
 double round(double);
 float  roundf(float);

diff --git a/lib/libm/man/Makefile.inc b/lib/libm/man/Makefile.inc
index d458a90..08ecac0 100644 (file)
--- a/lib/libm/man/Makefile.inc
+++ b/lib/libm/man/Makefile.inc
@@ -46,7 +46,7 @@ MLINKS+=j0.3 j0f.3 j0.3 j1.3 j0.3 j1f.3 j0.3 jn.3 j0.3 jnf.3 j0.3 y0.3 \
 MLINKS+=lgamma.3 lgammaf.3 lgamma.3 lgamma_r.3 lgamma.3 lgammaf_r.3 \
        lgamma.3 gamma.3 lgamma.3 gammaf.3 lgamma.3 gamma_r.3 \
        lgamma.3 gammaf_r.3
-MLINKS+=rint.3 rintf.3
+MLINKS+=rint.3 nearbyint.3 rint.3 nearbyintf.3 rint.3 rintf.3
 MLINKS+=round.3 roundf.3
 MLINKS+=sin.3 sinf.3
 MLINKS+=sinh.3 sinhf.3

diff --git a/lib/libm/man/rint.3 b/lib/libm/man/rint.3
index 91c6ba8..ad2e787 100644 (file)
--- a/lib/libm/man/rint.3
+++ b/lib/libm/man/rint.3
@@ -29,10 +29,12 @@
 .\"    $NetBSD: rint.3,v 1.12 2003/08/07 16:44:48 agc Exp $
 .\"    $DragonFly: src/lib/libm/man/rint.3,v 1.1 2005/07/26 21:15:20 joerg Exp $
 .\"
-.Dd March 10, 1994
+.Dd November 28, 2009
 .Dt RINT 3
 .Os
 .Sh NAME
+.Nm nearbyint ,
+.Nm nearbyintf ,
 .Nm rint ,
 .Nm rintf
 .Nd round to integral value in floating-point format
@@ -41,6 +43,10 @@
 .Sh SYNOPSIS
 .In math.h
 .Ft double
+.Fn nearbyint "double x"
+.Ft float
+.Fn nearbyintf "float x"
+.Ft double
 .Fn rint "double x"
 .Ft float
 .Fn rintf "float x"
@@ -51,6 +57,13 @@ function returns the integral value (represented as a double precision number)
 nearest to
 .Fa x
 according to the prevailing rounding mode.
+.Pp
+The
+.Fn nearbyint
+and
+.Fn nearbyintf
+functions perform the same operation, except that they do not raise
+an inexact exception.
 .Sh SEE ALSO
 .Xr abs 3 ,
 .Xr ceil 3 ,

diff --git a/lib/libm/src/Makefile.inc b/lib/libm/src/Makefile.inc
index 2bf342e..b654611 100644 (file)
--- a/lib/libm/src/Makefile.inc
+++ b/lib/libm/src/Makefile.inc
@@ -29,7 +29,7 @@ MI_FUNCS+=    \
        s_finitef.c s_floor.c s_floorf.c s_fmax.c s_fmaxf.c s_fmaxl.c \
        s_fmin.c s_fminf.c s_fminl.c s_frexpf.c s_frexpl.c s_ilogb.c \
        s_ilogbf.c s_ldexpf.c s_log1p.c s_log1pf.c s_logb.c s_logbf.c \
-       s_modff.c s_nextafter.c s_nextafterf.c s_rint.c s_rintf.c \
+       s_modff.c s_nearbyint.c s_nextafter.c s_nextafterf.c s_rint.c s_rintf.c \
        s_round.c s_roundf.c s_scalbn.c s_scalbnf.c \
        s_signgam.c s_significand.c s_significandf.c s_sin.c s_sinf.c \
        s_tan.c s_tanf.c s_tanh.c s_tanhf.c

diff --git a/lib/libm/src/s_nearbyint.c b/lib/libm/src/s_nearbyint.c
new file mode 100644 (file)
index 0000000..58056e5
--- /dev/null
+++ b/lib/libm/src/s_nearbyint.c
@@ -0,0 +1,53 @@
+/*-
+ * Copyright (c) 2004 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 <sys/cdefs.h>
+
+#include <fenv.h>
+#include <math.h>
+
+/*
+ * We save and restore the floating-point environment to avoid raising
+ * an inexact exception.  We can get away with using fesetenv()
+ * instead of feclearexcept()/feupdateenv() to restore the environment
+ * because the only exception defined for rint() is overflow, and
+ * rounding can't overflow as long as emax >= p.
+ */
+#define        DECL(type, fn, rint)    \
+type                           \
+fn(type x)                     \
+{                              \
+       type ret;               \
+       fenv_t env;             \
+                               \
+       fegetenv(&env);         \
+       ret = rint(x);          \
+       fesetenv(&env);         \
+       return (ret);           \
+}
+
+DECL(double, nearbyint, rint)
+DECL(float, nearbyintf, rintf)