From 7a4a7fd18d3bfdc997ec8ac4d17b4064e04bde61 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 16 Apr 2024 21:28:42 +0200 Subject: [PATCH] setpayloadsigl: New module. * lib/math.in.h (setpayloadsigl): New declaration. * lib/setpayloadsigl.c: New file, based on lib/setpayloadl.c. * m4/math_h.m4 (gl_MATH_H): Test whether setpayloadsigl is declared. (gl_MATH_H_REQUIRE_DEFAULTS): Initialize GNULIB_SETPAYLOADSIGL. (gl_MATH_H_DEFAULTS): Initialize HAVE_SETPAYLOADSIGL. * modules/math (Makefile.am): Substitute GNULIB_SETPAYLOADSIGL, HAVE_SETPAYLOADSIGL. * modules/setpayloadsigl: New file. * doc/posix-functions/setpayloadsigl.texi: Mention the new module. --- ChangeLog | 13 +++ doc/posix-functions/setpayloadsigl.texi | 8 +- lib/math.in.h | 14 +++ lib/setpayloadsigl.c | 129 ++++++++++++++++++++++++ m4/math_h.m4 | 6 +- modules/math | 2 + modules/setpayloadsigl | 38 +++++++ 7 files changed, 204 insertions(+), 6 deletions(-) create mode 100644 lib/setpayloadsigl.c create mode 100644 modules/setpayloadsigl diff --git a/ChangeLog b/ChangeLog index ff58ee26b3..e862623d6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2024-04-16 Bruno Haible + + setpayloadsigl: New module. + * lib/math.in.h (setpayloadsigl): New declaration. + * lib/setpayloadsigl.c: New file, based on lib/setpayloadl.c. + * m4/math_h.m4 (gl_MATH_H): Test whether setpayloadsigl is declared. + (gl_MATH_H_REQUIRE_DEFAULTS): Initialize GNULIB_SETPAYLOADSIGL. + (gl_MATH_H_DEFAULTS): Initialize HAVE_SETPAYLOADSIGL. + * modules/math (Makefile.am): Substitute GNULIB_SETPAYLOADSIGL, + HAVE_SETPAYLOADSIGL. + * modules/setpayloadsigl: New file. + * doc/posix-functions/setpayloadsigl.texi: Mention the new module. + 2024-04-16 Bruno Haible setpayloadsigf: Add tests. diff --git a/doc/posix-functions/setpayloadsigl.texi b/doc/posix-functions/setpayloadsigl.texi index f170f7090f..9d8dee189b 100644 --- a/doc/posix-functions/setpayloadsigl.texi +++ b/doc/posix-functions/setpayloadsigl.texi @@ -10,15 +10,15 @@ Documentation:@* @url{https://www.gnu.org/software/libc/manual/html_node/FP-Bit-Twiddling.html}. @end ifnotinfo -Gnulib module: --- +Gnulib module: setpayloadsigl Portability problems fixed by Gnulib: @itemize +@item +This function is missing on all non-glibc platforms: +glibc 2.24, macOS 11.1, FreeBSD 14.0, NetBSD 10.0, OpenBSD 6.7, Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. @end itemize Portability problems not fixed by Gnulib: @itemize -@item -This function is missing on all non-glibc platforms: -glibc 2.24, macOS 11.1, FreeBSD 14.0, NetBSD 10.0, OpenBSD 6.7, Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. @end itemize diff --git a/lib/math.in.h b/lib/math.in.h index 416530e050..7bb7976b61 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -2845,6 +2845,20 @@ _GL_WARN_ON_USE (setpayloadsig, "setpayloadsig is unportable - " # endif #endif +#if @GNULIB_SETPAYLOADSIGL@ +# if !@HAVE_SETPAYLOADSIGL@ +_GL_FUNCDECL_SYS (setpayloadsigl, int, (long double *, long double)); +# endif +_GL_CXXALIAS_SYS (setpayloadsigl, int, (long double *, long double)); +_GL_CXXALIASWARN (setpayloadsigl); +#elif defined GNULIB_POSIXCHECK +# undef setpayloadsigl +# if HAVE_RAW_DECL_SETPAYLOADSIGL +_GL_WARN_ON_USE (setpayloadsigl, "setpayloadsigl is unportable - " + "use gnulib module setpayloadsigl for portability"); +# endif +#endif + #if @GNULIB_TOTALORDERF@ # if @REPLACE_TOTALORDERF@ diff --git a/lib/setpayloadsigl.c b/lib/setpayloadsigl.c new file mode 100644 index 0000000000..5cfe3cb783 --- /dev/null +++ b/lib/setpayloadsigl.c @@ -0,0 +1,129 @@ +/* Construct a signalling NaN 'long double' with a given payload. + Copyright 2024 Free Software Foundation, Inc. + + This file 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 file 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 . */ + +/* Written by Bruno Haible. */ + +#include + +/* Specification. */ +#include + +#if HAVE_SAME_LONG_DOUBLE_AS_DOUBLE + +int +setpayloadsigl (long double *result, long double payload) +{ + return setpayloadsig ((double *) result, payload); +} + +#else + +# include +# include + +# include "signed-snan.h" + +/* 2^(LDBL_MANT_DIG-1). */ +# define TWO_LDBL_MANT_DIG \ + ((long double) (1U << ((LDBL_MANT_DIG - 1) / 4)) \ + * (long double) (1U << ((LDBL_MANT_DIG - 1 + 1) / 4)) \ + * (long double) (1U << ((LDBL_MANT_DIG - 1 + 2) / 4)) \ + * (long double) (1U << ((LDBL_MANT_DIG - 1 + 3) / 4))) + +int +setpayloadsigl (long double *result, long double payload) +{ +# if (LDBL_MANT_DIG == 64 || LDBL_MANT_DIG == 106 || LDBL_MANT_DIG == 113) \ + && defined LDBL_EXPBIT0_WORD && defined LDBL_EXPBIT0_BIT + if ( +# if defined __hppa || defined __mips__ || defined __sh__ + payload >= 0.0L +# else + /* A zero payload is not allowed, because that would denote Infinity. + Cf. snan.h. */ + payload > 0.0L +# endif +# if LDBL_MANT_DIG == 64 /* on i386, x86_64, ia64, m68k */ + && payload < 4611686018427387904.0L /* exp2l (LDBL_MANT_DIG - 2) */ + && payload == (long double) (int64_t) payload +# endif +# if LDBL_MANT_DIG == 106 /* on powerpc, powerpc64, powerpc64le */ + && payload < 2251799813685248.0L /* exp2l (DBL_MANT_DIG - 2) */ + && payload == (long double) (int64_t) payload +# endif +# if LDBL_MANT_DIG == 113 /* on alpha, arm64, loongarch64, mips64, riscv64, s390x, sparc64 */ + && payload < 2596148429267413814265248164610048.0L /* exp2l (LDBL_MANT_DIG - 2) */ + && payload == +(+(payload + TWO_LDBL_MANT_DIG) - TWO_LDBL_MANT_DIG) +# endif + ) + { + memory_long_double x = memory_positive_SNaNl (); + +# if LDBL_MANT_DIG == 64 /* on i386, x86_64, ia64, m68k */ + uint64_t pl = (int64_t) payload; +# if LDBL_EXPBIT0_WORD == 2 && LDBL_EXPBIT0_BIT == 0 /* on i386, x86_64, ia64 */ + x.word[1] = (x.word[1] & 0xC0000000U) | (uint32_t) (pl >> 32); + x.word[0] = (uint32_t) pl; +# elif LDBL_EXPBIT0_WORD == 0 && LDBL_EXPBIT0_BIT == 16 /* on m68k */ + x.word[1] = (x.word[1] & 0xC0000000U) | (uint32_t) (pl >> 32); + x.word[2] = (uint32_t) pl; +# else +# error "Please port gnulib setpayloadsigl.c to your platform!" +# endif +# endif +# if LDBL_MANT_DIG == 106 /* on powerpc, powerpc64, powerpc64le */ + uint64_t pl = (int64_t) payload; +# if LDBL_EXPBIT0_BIT == 20 + uint32_t pl_hi = (uint32_t) (pl >> 32); + uint32_t pl_lo = (uint32_t) pl; + x.word[LDBL_EXPBIT0_WORD] = (x.word[LDBL_EXPBIT0_WORD] & 0xFFF80000U) + | pl_hi; + x.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD == 0 ? 1 : -1)] = pl_lo; +# else +# error "Please port gnulib setpayloadsigl.c to your platform!" +# endif +# endif +# if LDBL_MANT_DIG == 113 /* on alpha, arm64, loongarch64, mips64, riscv64, s390x, sparc64 */ +# if LDBL_EXPBIT0_BIT == 16 + memory_long_double pl; + pl.value = payload + TWO_LDBL_MANT_DIG; + x.word[LDBL_EXPBIT0_WORD] = (x.word[LDBL_EXPBIT0_WORD] & 0xFFFF8000U) + | (pl.word[LDBL_EXPBIT0_WORD] & 0x00007FFFU); + x.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD == 0 ? 1 : -1)] = + pl.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD == 0 ? 1 : -1)]; + x.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD == 0 ? 2 : -2)] = + pl.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD == 0 ? 2 : -2)]; + x.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD == 0 ? 3 : -3)] = + pl.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD == 0 ? 3 : -3)]; +# else +# error "Please port gnulib setpayloadsigl.c to your platform!" +# endif +# endif + + *result = x.value; + return 0; + } + else + { + *result = 0.0L; + return -1; + } +# else +# error "Please port gnulib setpayloadsigl.c to your platform!" +# endif +} + +#endif diff --git a/m4/math_h.m4 b/m4/math_h.m4 index f458464a2e..7bcacf6959 100644 --- a/m4/math_h.m4 +++ b/m4/math_h.m4 @@ -1,5 +1,5 @@ # math_h.m4 -# serial 131 +# serial 132 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -52,7 +52,7 @@ AC_DEFUN_ONCE([gl_MATH_H], remainder remainderf remainderl rint rintf rintl round roundf roundl setpayload setpayloadf setpayloadl - setpayloadsig setpayloadsigf + setpayloadsig setpayloadsigf setpayloadsigl sinf sinl sinhf sqrtf sqrtl tanf tanl tanhf totalorder totalorderf totalorderl trunc truncf truncl]) ]) @@ -165,6 +165,7 @@ AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOADL]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOADSIG]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOADSIGF]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOADSIGL]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNBIT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINF]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINL]) @@ -252,6 +253,7 @@ AC_DEFUN([gl_MATH_H_DEFAULTS], HAVE_SETPAYLOADL=1; AC_SUBST([HAVE_SETPAYLOADL]) HAVE_SETPAYLOADSIG=1; AC_SUBST([HAVE_SETPAYLOADSIG]) HAVE_SETPAYLOADSIGF=1; AC_SUBST([HAVE_SETPAYLOADSIGF]) + HAVE_SETPAYLOADSIGL=1; AC_SUBST([HAVE_SETPAYLOADSIGL]) HAVE_SINF=1; AC_SUBST([HAVE_SINF]) HAVE_SINL=1; AC_SUBST([HAVE_SINL]) HAVE_SINHF=1; AC_SUBST([HAVE_SINHF]) diff --git a/modules/math b/modules/math index b1a2a94e4c..70baab7586 100644 --- a/modules/math +++ b/modules/math @@ -125,6 +125,7 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's/@''GNULIB_SETPAYLOADL''@/$(GNULIB_SETPAYLOADL)/g' \ -e 's/@''GNULIB_SETPAYLOADSIG''@/$(GNULIB_SETPAYLOADSIG)/g' \ -e 's/@''GNULIB_SETPAYLOADSIGF''@/$(GNULIB_SETPAYLOADSIGF)/g' \ + -e 's/@''GNULIB_SETPAYLOADSIGL''@/$(GNULIB_SETPAYLOADSIGL)/g' \ -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \ -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \ -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \ @@ -205,6 +206,7 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''HAVE_SETPAYLOADL''@|$(HAVE_SETPAYLOADL)|g' \ -e 's|@''HAVE_SETPAYLOADSIG''@|$(HAVE_SETPAYLOADSIG)|g' \ -e 's|@''HAVE_SETPAYLOADSIGF''@|$(HAVE_SETPAYLOADSIGF)|g' \ + -e 's|@''HAVE_SETPAYLOADSIGL''@|$(HAVE_SETPAYLOADSIGL)|g' \ -e 's|@''HAVE_SINF''@|$(HAVE_SINF)|g' \ -e 's|@''HAVE_SINL''@|$(HAVE_SINL)|g' \ -e 's|@''HAVE_SINHF''@|$(HAVE_SINHF)|g' \ diff --git a/modules/setpayloadsigl b/modules/setpayloadsigl new file mode 100644 index 0000000000..deadba06af --- /dev/null +++ b/modules/setpayloadsigl @@ -0,0 +1,38 @@ +Description: +setpayloadsigl function: construct a signalling NaN with a given payload + +Files: +lib/setpayloadsigl.c +m4/mathfunc.m4 +m4/setpayloadsig.m4 +m4/exponentl.m4 + +Depends-on: +math +extensions +setpayloadsig [test $HAVE_SETPAYLOADSIGL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1] +float [test $HAVE_SETPAYLOADSIGL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] +stdint [test $HAVE_SETPAYLOADSIGL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] +signed-snan [test $HAVE_SETPAYLOADSIGL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] + +configure.ac: +gl_FUNC_SETPAYLOADSIGL +gl_CONDITIONAL([GL_COND_OBJ_SETPAYLOADSIGL], [test $HAVE_SETPAYLOADSIGL = 0]) +gl_MATH_MODULE_INDICATOR([setpayloadsigl]) + +Makefile.am: +if GL_COND_OBJ_SETPAYLOADSIGL +lib_SOURCES += setpayloadsigl.c +endif + +Include: + + +Link: +$(SETPAYLOADSIGL_LIBM) + +License: +LGPL + +Maintainer: +all -- 2.39.5