Import Gnulib's log1p' and round' modules.
From Gnulib v0.0-4889-ge375fe3. * m4/gnulib-cache.m4: Add `log1p' and `round', requested by Mark H Weaver <mhw@netris.org>. Use `malloc-gnu' instead of `malloc', the latter being obsolete.
This commit is contained in:
Ludovic Courtès
parent
d9f464726d
commit
b81eb64633
10 changed files with 718 additions and 3 deletions
|
|
@ -9,7 +9,7 @@
|
|||
# the same distribution terms as the rest of that program.
|
||||
#
|
||||
# Generated by gnulib-tool.
|
||||
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3 --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap canonicalize-lgpl close connect duplocale environ extensions flock fpieee full-read full-write func gendocs getaddrinfo getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isinf isnan lib-symbol-versions lib-symbol-visibility libunistring listen locale maintainer-makefile malloc malloca nproc putenv recv recvfrom send sendto setsockopt shutdown socket sockets stat-time stdlib strcase strftime striconveh string sys_stat trunc verify version-etc-fsf vsnprintf warnings
|
||||
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3 --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap canonicalize-lgpl close connect duplocale environ extensions flock fpieee full-read full-write func gendocs getaddrinfo getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isinf isnan lib-symbol-versions lib-symbol-visibility libunistring listen locale log1p maintainer-makefile malloc malloca nproc putenv recv recvfrom round send sendto setsockopt shutdown socket sockets stat-time stdlib strcase strftime striconveh string sys_stat trunc verify version-etc-fsf vsnprintf warnings
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
|
||||
|
||||
|
|
@ -37,6 +37,7 @@ libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
|
|||
EXTRA_libgnu_la_SOURCES =
|
||||
libgnu_la_LDFLAGS = $(AM_LDFLAGS)
|
||||
libgnu_la_LDFLAGS += -no-undefined
|
||||
libgnu_la_LDFLAGS += $(FLOOR_LIBM)
|
||||
libgnu_la_LDFLAGS += $(GETADDRINFO_LIB)
|
||||
libgnu_la_LDFLAGS += $(HOSTENT_LIB)
|
||||
libgnu_la_LDFLAGS += $(INET_NTOP_LIB)
|
||||
|
|
@ -45,9 +46,11 @@ libgnu_la_LDFLAGS += $(ISNAND_LIBM)
|
|||
libgnu_la_LDFLAGS += $(ISNANF_LIBM)
|
||||
libgnu_la_LDFLAGS += $(ISNANL_LIBM)
|
||||
libgnu_la_LDFLAGS += $(LIBSOCKET)
|
||||
libgnu_la_LDFLAGS += $(LOG1P_LIBM)
|
||||
libgnu_la_LDFLAGS += $(LTLIBICONV)
|
||||
libgnu_la_LDFLAGS += $(LTLIBINTL)
|
||||
libgnu_la_LDFLAGS += $(LTLIBUNISTRING)
|
||||
libgnu_la_LDFLAGS += $(ROUND_LIBM)
|
||||
libgnu_la_LDFLAGS += $(SERVENT_LIB)
|
||||
libgnu_la_LDFLAGS += $(TRUNC_LIBM)
|
||||
|
||||
|
|
@ -331,6 +334,15 @@ EXTRA_libgnu_la_SOURCES += flock.c
|
|||
|
||||
## end gnulib module flock
|
||||
|
||||
## begin gnulib module floor
|
||||
|
||||
|
||||
EXTRA_DIST += floor.c
|
||||
|
||||
EXTRA_libgnu_la_SOURCES += floor.c
|
||||
|
||||
## end gnulib module floor
|
||||
|
||||
## begin gnulib module full-read
|
||||
|
||||
libgnu_la_SOURCES += full-read.h full-read.c
|
||||
|
|
@ -892,6 +904,15 @@ EXTRA_libgnu_la_SOURCES += recvfrom.c
|
|||
|
||||
## end gnulib module recvfrom
|
||||
|
||||
## begin gnulib module round
|
||||
|
||||
|
||||
EXTRA_DIST += round.c
|
||||
|
||||
EXTRA_libgnu_la_SOURCES += round.c
|
||||
|
||||
## end gnulib module round
|
||||
|
||||
## begin gnulib module safe-read
|
||||
|
||||
|
||||
|
|
|
|||
97
lib/floor.c
Normal file
97
lib/floor.c
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
/* Round towards negative infinity.
|
||||
Copyright (C) 2007, 2010-2011 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
/* Specification. */
|
||||
#include <math.h>
|
||||
|
||||
#include <float.h>
|
||||
|
||||
#ifdef USE_LONG_DOUBLE
|
||||
# define FUNC floorl
|
||||
# define DOUBLE long double
|
||||
# define MANT_DIG LDBL_MANT_DIG
|
||||
# define L_(literal) literal##L
|
||||
#elif ! defined USE_FLOAT
|
||||
# define FUNC floor
|
||||
# define DOUBLE double
|
||||
# define MANT_DIG DBL_MANT_DIG
|
||||
# define L_(literal) literal
|
||||
#else /* defined USE_FLOAT */
|
||||
# define FUNC floorf
|
||||
# define DOUBLE float
|
||||
# define MANT_DIG FLT_MANT_DIG
|
||||
# define L_(literal) literal##f
|
||||
#endif
|
||||
|
||||
/* 2^(MANT_DIG-1). */
|
||||
static const DOUBLE TWO_MANT_DIG =
|
||||
/* Assume MANT_DIG <= 5 * 31.
|
||||
Use the identity
|
||||
n = floor(n/5) + floor((n+1)/5) + ... + floor((n+4)/5). */
|
||||
(DOUBLE) (1U << ((MANT_DIG - 1) / 5))
|
||||
* (DOUBLE) (1U << ((MANT_DIG - 1 + 1) / 5))
|
||||
* (DOUBLE) (1U << ((MANT_DIG - 1 + 2) / 5))
|
||||
* (DOUBLE) (1U << ((MANT_DIG - 1 + 3) / 5))
|
||||
* (DOUBLE) (1U << ((MANT_DIG - 1 + 4) / 5));
|
||||
|
||||
DOUBLE
|
||||
FUNC (DOUBLE x)
|
||||
{
|
||||
/* The use of 'volatile' guarantees that excess precision bits are dropped
|
||||
at each addition step and before the following comparison at the caller's
|
||||
site. It is necessary on x86 systems where double-floats are not IEEE
|
||||
compliant by default, to avoid that the results become platform and compiler
|
||||
option dependent. 'volatile' is a portable alternative to gcc's
|
||||
-ffloat-store option. */
|
||||
volatile DOUBLE y = x;
|
||||
volatile DOUBLE z = y;
|
||||
|
||||
if (z > L_(0.0))
|
||||
{
|
||||
/* For 0 < x < 1, return +0.0 even if the current rounding mode is
|
||||
FE_DOWNWARD. */
|
||||
if (z < L_(1.0))
|
||||
z = L_(0.0);
|
||||
/* Avoid rounding errors for values near 2^k, where k >= MANT_DIG-1. */
|
||||
else if (z < TWO_MANT_DIG)
|
||||
{
|
||||
/* Round to the next integer (nearest or up or down, doesn't matter). */
|
||||
z += TWO_MANT_DIG;
|
||||
z -= TWO_MANT_DIG;
|
||||
/* Enforce rounding down. */
|
||||
if (z > y)
|
||||
z -= L_(1.0);
|
||||
}
|
||||
}
|
||||
else if (z < L_(0.0))
|
||||
{
|
||||
/* Avoid rounding errors for values near -2^k, where k >= MANT_DIG-1. */
|
||||
if (z > - TWO_MANT_DIG)
|
||||
{
|
||||
/* Round to the next integer (nearest or up or down, doesn't matter). */
|
||||
z -= TWO_MANT_DIG;
|
||||
z += TWO_MANT_DIG;
|
||||
/* Enforce rounding down. */
|
||||
if (z > y)
|
||||
z -= L_(1.0);
|
||||
}
|
||||
}
|
||||
return z;
|
||||
}
|
||||
168
lib/round.c
Normal file
168
lib/round.c
Normal file
|
|
@ -0,0 +1,168 @@
|
|||
/* Round toward nearest, breaking ties away from zero.
|
||||
Copyright (C) 2007, 2010-2011 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2, or (at your option)
|
||||
any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License along
|
||||
with this program; if not, write to the Free Software Foundation,
|
||||
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
|
||||
|
||||
/* Written by Ben Pfaff <blp@gnu.org>, 2007.
|
||||
Based heavily on code by Bruno Haible. */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
/* Specification. */
|
||||
#include <math.h>
|
||||
|
||||
#include <float.h>
|
||||
|
||||
#undef MIN
|
||||
|
||||
#ifdef USE_LONG_DOUBLE
|
||||
# define ROUND roundl
|
||||
# define FLOOR floorl
|
||||
# define CEIL ceill
|
||||
# define DOUBLE long double
|
||||
# define MANT_DIG LDBL_MANT_DIG
|
||||
# define MIN LDBL_MIN
|
||||
# define L_(literal) literal##L
|
||||
# define HAVE_FLOOR_AND_CEIL HAVE_FLOORL_AND_CEILL
|
||||
#elif ! defined USE_FLOAT
|
||||
# define ROUND round
|
||||
# define FLOOR floor
|
||||
# define CEIL ceil
|
||||
# define DOUBLE double
|
||||
# define MANT_DIG DBL_MANT_DIG
|
||||
# define MIN DBL_MIN
|
||||
# define L_(literal) literal
|
||||
# define HAVE_FLOOR_AND_CEIL 1
|
||||
#else /* defined USE_FLOAT */
|
||||
# define ROUND roundf
|
||||
# define FLOOR floorf
|
||||
# define CEIL ceilf
|
||||
# define DOUBLE float
|
||||
# define MANT_DIG FLT_MANT_DIG
|
||||
# define MIN FLT_MIN
|
||||
# define L_(literal) literal##f
|
||||
# define HAVE_FLOOR_AND_CEIL HAVE_FLOORF_AND_CEILF
|
||||
#endif
|
||||
|
||||
/* -0.0. See minus-zero.h. */
|
||||
#if defined __hpux || defined __sgi || defined __ICC
|
||||
# define MINUS_ZERO (-MIN * MIN)
|
||||
#else
|
||||
# define MINUS_ZERO L_(-0.0)
|
||||
#endif
|
||||
|
||||
/* If we're being included from test-round2[f].c, it already defined names for
|
||||
our round implementations. Otherwise, pick the preferred implementation for
|
||||
this machine. */
|
||||
#if !defined FLOOR_BASED_ROUND && !defined FLOOR_FREE_ROUND
|
||||
# if HAVE_FLOOR_AND_CEIL
|
||||
# define FLOOR_BASED_ROUND ROUND
|
||||
# else
|
||||
# define FLOOR_FREE_ROUND ROUND
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef FLOOR_BASED_ROUND
|
||||
/* An implementation of the C99 round function based on floor and ceil. We use
|
||||
this when floor and ceil are available, on the assumption that they are
|
||||
faster than the open-coded versions below. */
|
||||
DOUBLE
|
||||
FLOOR_BASED_ROUND (DOUBLE x)
|
||||
{
|
||||
if (x >= L_(0.0))
|
||||
{
|
||||
DOUBLE y = FLOOR (x);
|
||||
if (x - y >= L_(0.5))
|
||||
y += L_(1.0);
|
||||
return y;
|
||||
}
|
||||
else
|
||||
{
|
||||
DOUBLE y = CEIL (x);
|
||||
if (y - x >= L_(0.5))
|
||||
y -= L_(1.0);
|
||||
return y;
|
||||
}
|
||||
}
|
||||
#endif /* FLOOR_BASED_ROUND */
|
||||
|
||||
#ifdef FLOOR_FREE_ROUND
|
||||
/* An implementation of the C99 round function without floor or ceil.
|
||||
We use this when floor or ceil is missing. */
|
||||
DOUBLE
|
||||
FLOOR_FREE_ROUND (DOUBLE x)
|
||||
{
|
||||
/* 2^(MANT_DIG-1). */
|
||||
static const DOUBLE TWO_MANT_DIG =
|
||||
/* Assume MANT_DIG <= 5 * 31.
|
||||
Use the identity
|
||||
n = floor(n/5) + floor((n+1)/5) + ... + floor((n+4)/5). */
|
||||
(DOUBLE) (1U << ((MANT_DIG - 1) / 5))
|
||||
* (DOUBLE) (1U << ((MANT_DIG - 1 + 1) / 5))
|
||||
* (DOUBLE) (1U << ((MANT_DIG - 1 + 2) / 5))
|
||||
* (DOUBLE) (1U << ((MANT_DIG - 1 + 3) / 5))
|
||||
* (DOUBLE) (1U << ((MANT_DIG - 1 + 4) / 5));
|
||||
|
||||
/* The use of 'volatile' guarantees that excess precision bits are dropped at
|
||||
each addition step and before the following comparison at the caller's
|
||||
site. It is necessary on x86 systems where double-floats are not IEEE
|
||||
compliant by default, to avoid that the results become platform and
|
||||
compiler option dependent. 'volatile' is a portable alternative to gcc's
|
||||
-ffloat-store option. */
|
||||
volatile DOUBLE y = x;
|
||||
volatile DOUBLE z = y;
|
||||
|
||||
if (z > L_(0.0))
|
||||
{
|
||||
/* Avoid rounding error for x = 0.5 - 2^(-MANT_DIG-1). */
|
||||
if (z < L_(0.5))
|
||||
z = L_(0.0);
|
||||
/* Avoid rounding errors for values near 2^k, where k >= MANT_DIG-1. */
|
||||
else if (z < TWO_MANT_DIG)
|
||||
{
|
||||
/* Add 0.5 to the absolute value. */
|
||||
y = z += L_(0.5);
|
||||
/* Round to the next integer (nearest or up or down, doesn't
|
||||
matter). */
|
||||
z += TWO_MANT_DIG;
|
||||
z -= TWO_MANT_DIG;
|
||||
/* Enforce rounding down. */
|
||||
if (z > y)
|
||||
z -= L_(1.0);
|
||||
}
|
||||
}
|
||||
else if (z < L_(0.0))
|
||||
{
|
||||
/* Avoid rounding error for x = -(0.5 - 2^(-MANT_DIG-1)). */
|
||||
if (z > - L_(0.5))
|
||||
z = MINUS_ZERO;
|
||||
/* Avoid rounding errors for values near -2^k, where k >= MANT_DIG-1. */
|
||||
else if (z > -TWO_MANT_DIG)
|
||||
{
|
||||
/* Add 0.5 to the absolute value. */
|
||||
y = z -= L_(0.5);
|
||||
/* Round to the next integer (nearest or up or down, doesn't
|
||||
matter). */
|
||||
z -= TWO_MANT_DIG;
|
||||
z += TWO_MANT_DIG;
|
||||
/* Enforce rounding up. */
|
||||
if (z < y)
|
||||
z += L_(1.0);
|
||||
}
|
||||
}
|
||||
return z;
|
||||
}
|
||||
#endif /* FLOOR_FREE_ROUND */
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue