mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 12:11:10 +00:00
423c2b9d08
TS 18661-1 defines fromfp functions (fromfp, fromfpx, ufromfp, ufromfpx, and float and long double variants) to convert from floating-point to an integer type with any signedness and any given width up to that of intmax_t, in any of the five IEEE rounding modes (the usual four for binary floating point, plus rounding to nearest with ties rounding away from zero), with control of whether in-range non-integer values should result in the "inexact" exception being raised. This patch implements these functions for glibc. These implementations are (apart from raising exceptions) pure integer implementations; it's entirely possible optimized versions could be devised for some architectures. A common math/fromfp.h header provides various common helper code that can readily be shared between the implementations for different types. For each type, the bulk of the implementation is also shared between the four functions, with wrappers that define UNSIGNED and INEXACT macros appropriately before including the main implementation. As the functions return intmax_t and uintmax_t without math.h being allowed to expose those typedef names, they are declared using __intmax_t and __uintmax_t as obtained from <bits/types.h>. The FP_INT_* rounding direction macros are defined as ascending integers in the order the names are listed in the TS; I see no significant value in allowing architectures to vary the values of them. The libm-test machinery is duly adapted to handle unsigned int arguments, and intmax_t and uintmax_t results. Because each test input is generally tested for four functions, five rounding modes and several different widths, the libm-test.inc additions are very large. Thus, the diffs in the body of this message exclude the libm-test.inc changes, with the full patch being attached gzipped. The bulk of the new tests were generated (expanded from a test input plus rounding results and information about where it lies in the relevant interval between integers, to libm-test tests for all relevant combinations of function, rounding direction and width) by a script that's included in the patch as math/gen-fromfp-tests.py (input data math/gen-fromfp-tests-inputs); as an ad hoc script that's not really expected to be rerun, it's not very polished, but it's at least plausibly useful for adding any further tests for these functions in future. I may split the libm-test tests up by function in future (so both libm-test.inc and auto-libm-test-out are split into separate files, and the tests for each function are also built and run separately), but not for 2.25. For no obvious reason, adding tgmath tests for the new functions resulted in -Wuninitialized errors from test-tgmath.c about the variable i being used uninitialized. Those errors were correct - the variable is read by the frexp version in test-tgmath.c (where real frexp would write through that pointer instead of reading it) - but I don't know why this patch would result in the pre-existing issue being newly detected. The patch initializes the variable to avoid those errors. With these changes, glibc 2.25 should have all the library features from TS 18661-1 other than the functions that round result to narrower type (and constant rounding directions, but I'm considering those mainly a compiler feature not a library one). Tested for x86_64, x86, mips64 and powerpc. * math/bits/mathcalls.h [__GLIBC_USE (IEC_60559_BFP_EXT)] (fromfp): New declaration. [__GLIBC_USE (IEC_60559_BFP_EXT)] (fromfpx): Likewise. [__GLIBC_USE (IEC_60559_BFP_EXT)] (ufromfp): Likewise. [__GLIBC_USE (IEC_60559_BFP_EXT)] (ufromfpx): Likewise. * math/tgmath.h (__TGMATH_TERNARY_FIRST_REAL_RET_ONLY): New macro. [__GLIBC_USE (IEC_60559_BFP_EXT)] (fromfp): Likewise. [__GLIBC_USE (IEC_60559_BFP_EXT)] (ufromfp): Likewise. [__GLIBC_USE (IEC_60559_BFP_EXT)] (fromfpx): Likewise. [__GLIBC_USE (IEC_60559_BFP_EXT)] (ufromfpx): Likewise. * math/math.h: Include <bits/types.h>. [__GLIBC_USE (IEC_60559_BFP_EXT)] (FP_INT_UPWARD): New enum constant and macro. (FP_INT_DOWNWARD): Likewise. (FP_INT_TOWARDZERO): Likewise. (FP_INT_TONEARESTFROMZERO): Likewise. (FP_INT_TONEAREST): Likewise. * math/Versions (fromfp): New libm symbol at version GLIBC_2.25. (fromfpf): Likewise. (fromfpl): Likewise. (ufromfp): Likewise. (ufromfpf): Likewise. (ufromfpl): Likewise. (fromfpx): Likewise. (fromfpxf): Likewise. (fromfpxl): Likewise. (ufromfpx): Likewise. (ufromfpxf): Likewise. (ufromfpxl): Likewise. * math/Makefile (libm-calls): Add s_fromfpF, s_ufromfpF, s_fromfpxF and s_ufromfpxF. * math/gen-fromfp-tests.py: New file. * math/gen-fromfp-tests-inputs: Likewise. * math/libm-test.inc: Include <stdint.h> (check_intmax_t): New function. (check_uintmax_t): Likewise. (struct test_fiu_M_data): New type. (struct test_fiu_U_data): Likewise. (RUN_TEST_fiu_M): New macro. (RUN_TEST_LOOP_fiu_M): Likewise. (RUN_TEST_fiu_U): Likewise. (RUN_TEST_LOOP_fiu_U): Likewise. (fromfp_test_data): New array. (fromfp_test): New function. (fromfpx_test_data): New array. (fromfpx_test): New function. (ufromfp_test_data): New array. (ufromfp_test): New function. (ufromfpx_test_data): New array. (ufromfpx_test): New function. (main): Call fromfp_test, fromfpx_test, ufromfp_test and ufromfpx_test. * math/gen-libm-test.pl (parse_args): Handle u, M and U descriptor characters. * math/test-tgmath-ret.c: Include <stdint.h>. (rm): New variable. (width): Likewise. (CHECK_RET_CONST_TYPE): Take extra arguments and pass them to called function. (CHECK_RET_CONST_FLOAT): Take extra arguments and pass them to CHECK_RET_CONST_TYPE. (CHECK_RET_CONST_DOUBLE): Likewise. (CHECK_RET_CONST_LDOUBLE): Likewise. (CHECK_RET_CONST): Take extra arguments and pass them to calls macros. (fromfp): New CHECK_RET_CONST call. (ufromfp): Likewise. (fromfpx): Likewise. (ufromfpx): Likewise. (do_test): Call check_return_fromfp, check_return_ufromfp, check_return_fromfpx and check_return_ufromfpx. * math/test-tgmath.c: Include <stdint.h> (NCALLS): Increase to 138. (F(compile_test)): Initialize i. Call fromfp functions. (F(fromfp)): New function. (F(fromfpx)): Likewise. (F(ufromfp)): Likewise. (F(ufromfpx)): Likewise. * manual/arith.texi (Rounding Functions): Document FP_INT_UPWARD, FP_INT_DOWNWARD, FP_INT_TOWARDZERO, FP_INT_TONEARESTFROMZERO, FP_INT_TONEAREST, fromfp, fromfpf, fromfpl, ufromfp, ufromfpf, ufromfpl, fromfpx, fromfpxf, fromfpxl, ufromfpx, ufromfpxf and ufromfpxl. * manual/libm-err-tab.pl (@all_functions): Add fromfp, fromfpx, ufromfp and ufromfpx. * math/fromfp.h: New file. * sysdeps/ieee754/dbl-64/s_fromfp.c: Likewise. * sysdeps/ieee754/dbl-64/s_fromfp_main.c: Likewise. * sysdeps/ieee754/dbl-64/s_fromfpx.c: Likewise. * sysdeps/ieee754/dbl-64/s_ufromfp.c: Likewise. * sysdeps/ieee754/dbl-64/s_ufromfpx.c: Likewise. * sysdeps/ieee754/flt-32/s_fromfpf.c: Likewise. * sysdeps/ieee754/flt-32/s_fromfpf_main.c: Likewise. * sysdeps/ieee754/flt-32/s_fromfpxf.c: Likewise. * sysdeps/ieee754/flt-32/s_ufromfpf.c: Likewise. * sysdeps/ieee754/flt-32/s_ufromfpxf.c: Likewise. * sysdeps/ieee754/ldbl-128/s_fromfpl.c: Likewise. * sysdeps/ieee754/ldbl-128/s_fromfpl_main.c: Likewise. * sysdeps/ieee754/ldbl-128/s_fromfpxl.c: Likewise. * sysdeps/ieee754/ldbl-128/s_ufromfpl.c: Likewise. * sysdeps/ieee754/ldbl-128/s_ufromfpxl.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_fromfpl.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_fromfpl_main.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_fromfpxl.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_ufromfpl.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_ufromfpxl.c: Likewise. * sysdeps/ieee754/ldbl-96/s_fromfpl.c: Likewise. * sysdeps/ieee754/ldbl-96/s_fromfpl_main.c: Likewise. * sysdeps/ieee754/ldbl-96/s_fromfpxl.c: Likewise. * sysdeps/ieee754/ldbl-96/s_ufromfpl.c: Likewise. * sysdeps/ieee754/ldbl-96/s_ufromfpxl.c: Likewise. * sysdeps/ieee754/ldbl-opt/Makefile (libnldbl-calls): Add fromfp, ufromfp, fromfpx and ufromfpx. (CFLAGS-nldbl-fromfp.c): New variable. (CFLAGS-nldbl-fromfpx.c): Likewise. (CFLAGS-nldbl-ufromfp.c): Likewise. (CFLAGS-nldbl-ufromfpx.c): Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-compat.h: Include <stdint.h>. * sysdeps/ieee754/ldbl-opt/nldbl-fromfp.c: New file. * sysdeps/ieee754/ldbl-opt/nldbl-fromfpx.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-ufromfp.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-ufromfpx.c: Likewise. * sysdeps/nacl/libm.abilist: Update. * sysdeps/unix/sysv/linux/aarch64/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/alpha/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/arm/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/hppa/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/i386/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/ia64/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/m68k/coldfire/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/m68k/m680x0/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/microblaze/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/nios2/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/libm-le.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/sh/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/tile/tilepro/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/x86_64/64/libm.abilist: Likewise. * sysdeps/unix/sysv/linux/x86_64/x32/libm.abilist: Likewise. |
||
|---|---|---|
| .. | ||
| bits | ||
| configure | ||
| configure.ac | ||
| Makefile | ||
| math_ldbl_opt.c | ||
| math_ldbl_opt.h | ||
| math-type-macros-double.h | ||
| math-type-macros-ldouble.h | ||
| nldbl-acos.c | ||
| nldbl-acosh.c | ||
| nldbl-asin.c | ||
| nldbl-asinh.c | ||
| nldbl-asprintf_chk.c | ||
| nldbl-asprintf.c | ||
| nldbl-atan2.c | ||
| nldbl-atan.c | ||
| nldbl-atanh.c | ||
| nldbl-cabs.c | ||
| nldbl-cacos.c | ||
| nldbl-cacosh.c | ||
| nldbl-canonicalize.c | ||
| nldbl-carg.c | ||
| nldbl-casin.c | ||
| nldbl-casinh.c | ||
| nldbl-catan.c | ||
| nldbl-catanh.c | ||
| nldbl-cbrt.c | ||
| nldbl-ccos.c | ||
| nldbl-ccosh.c | ||
| nldbl-ceil.c | ||
| nldbl-cexp.c | ||
| nldbl-cimag.c | ||
| nldbl-clog10.c | ||
| nldbl-clog.c | ||
| nldbl-compat.c | ||
| nldbl-compat.h | ||
| nldbl-conj.c | ||
| nldbl-copysign.c | ||
| nldbl-cos.c | ||
| nldbl-cosh.c | ||
| nldbl-cpow.c | ||
| nldbl-cproj.c | ||
| nldbl-creal.c | ||
| nldbl-csin.c | ||
| nldbl-csinh.c | ||
| nldbl-csqrt.c | ||
| nldbl-ctan.c | ||
| nldbl-ctanh.c | ||
| nldbl-dprintf_chk.c | ||
| nldbl-dprintf.c | ||
| nldbl-erf.c | ||
| nldbl-erfc.c | ||
| nldbl-exp2.c | ||
| nldbl-exp10.c | ||
| nldbl-exp.c | ||
| nldbl-expm1.c | ||
| nldbl-fabs.c | ||
| nldbl-fdim.c | ||
| nldbl-finite.c | ||
| nldbl-floor.c | ||
| nldbl-fma.c | ||
| nldbl-fmax.c | ||
| nldbl-fmaxmag.c | ||
| nldbl-fmin.c | ||
| nldbl-fminmag.c | ||
| nldbl-fmod.c | ||
| nldbl-fprintf_chk.c | ||
| nldbl-fprintf.c | ||
| nldbl-frexp.c | ||
| nldbl-fromfp.c | ||
| nldbl-fromfpx.c | ||
| nldbl-fscanf.c | ||
| nldbl-fwprintf_chk.c | ||
| nldbl-fwprintf.c | ||
| nldbl-fwscanf.c | ||
| nldbl-gamma.c | ||
| nldbl-getpayload.c | ||
| nldbl-hypot.c | ||
| nldbl-ilogb.c | ||
| nldbl-iovfscanf.c | ||
| nldbl-isinf.c | ||
| nldbl-isnan.c | ||
| nldbl-isoc99_fscanf.c | ||
| nldbl-isoc99_fwscanf.c | ||
| nldbl-isoc99_scanf.c | ||
| nldbl-isoc99_sscanf.c | ||
| nldbl-isoc99_swscanf.c | ||
| nldbl-isoc99_vfscanf.c | ||
| nldbl-isoc99_vfwscanf.c | ||
| nldbl-isoc99_vscanf.c | ||
| nldbl-isoc99_vsscanf.c | ||
| nldbl-isoc99_vswscanf.c | ||
| nldbl-isoc99_vwscanf.c | ||
| nldbl-isoc99_wscanf.c | ||
| nldbl-j0.c | ||
| nldbl-j1.c | ||
| nldbl-jn.c | ||
| nldbl-ldexp.c | ||
| nldbl-lgamma_r.c | ||
| nldbl-lgamma.c | ||
| nldbl-llogb.c | ||
| nldbl-llrint.c | ||
| nldbl-llround.c | ||
| nldbl-log1p.c | ||
| nldbl-log2.c | ||
| nldbl-log10.c | ||
| nldbl-log.c | ||
| nldbl-logb.c | ||
| nldbl-lrint.c | ||
| nldbl-lround.c | ||
| nldbl-modf.c | ||
| nldbl-nan.c | ||
| nldbl-nearbyint.c | ||
| nldbl-nextafter.c | ||
| nldbl-nextdown.c | ||
| nldbl-nexttoward.c | ||
| nldbl-nexttowardf.c | ||
| nldbl-nextup.c | ||
| nldbl-obstack_printf_chk.c | ||
| nldbl-obstack_printf.c | ||
| nldbl-obstack_vprintf_chk.c | ||
| nldbl-obstack_vprintf.c | ||
| nldbl-pow10.c | ||
| nldbl-pow.c | ||
| nldbl-printf_chk.c | ||
| nldbl-printf_fp.c | ||
| nldbl-printf_size.c | ||
| nldbl-printf.c | ||
| nldbl-qecvt_r.c | ||
| nldbl-qecvt.c | ||
| nldbl-qfcvt_r.c | ||
| nldbl-qfcvt.c | ||
| nldbl-qgcvt.c | ||
| nldbl-remainder.c | ||
| nldbl-remquo.c | ||
| nldbl-rint.c | ||
| nldbl-round.c | ||
| nldbl-roundeven.c | ||
| nldbl-scalb.c | ||
| nldbl-scalbln.c | ||
| nldbl-scalbn.c | ||
| nldbl-scanf.c | ||
| nldbl-setpayload.c | ||
| nldbl-setpayloadsig.c | ||
| nldbl-signbit.c | ||
| nldbl-significand.c | ||
| nldbl-sin.c | ||
| nldbl-sincos.c | ||
| nldbl-sinh.c | ||
| nldbl-snprintf_chk.c | ||
| nldbl-snprintf.c | ||
| nldbl-sprintf_chk.c | ||
| nldbl-sprintf.c | ||
| nldbl-sqrt.c | ||
| nldbl-sscanf.c | ||
| nldbl-strfmon_l.c | ||
| nldbl-strfmon.c | ||
| nldbl-strfroml.c | ||
| nldbl-strtold_l.c | ||
| nldbl-strtold.c | ||
| nldbl-strtoldint.c | ||
| nldbl-swprintf_chk.c | ||
| nldbl-swprintf.c | ||
| nldbl-swscanf.c | ||
| nldbl-syslog_chk.c | ||
| nldbl-syslog.c | ||
| nldbl-tan.c | ||
| nldbl-tanh.c | ||
| nldbl-tgamma.c | ||
| nldbl-totalorder.c | ||
| nldbl-totalordermag.c | ||
| nldbl-trunc.c | ||
| nldbl-ufromfp.c | ||
| nldbl-ufromfpx.c | ||
| nldbl-vasprintf_chk.c | ||
| nldbl-vasprintf.c | ||
| nldbl-vdprintf_chk.c | ||
| nldbl-vdprintf.c | ||
| nldbl-vfprintf_chk.c | ||
| nldbl-vfprintf.c | ||
| nldbl-vfscanf.c | ||
| nldbl-vfwprintf_chk.c | ||
| nldbl-vfwprintf.c | ||
| nldbl-vfwscanf.c | ||
| nldbl-vprintf_chk.c | ||
| nldbl-vprintf.c | ||
| nldbl-vscanf.c | ||
| nldbl-vsnprintf_chk.c | ||
| nldbl-vsnprintf.c | ||
| nldbl-vsprintf_chk.c | ||
| nldbl-vsprintf.c | ||
| nldbl-vsscanf.c | ||
| nldbl-vswprintf_chk.c | ||
| nldbl-vswprintf.c | ||
| nldbl-vswscanf.c | ||
| nldbl-vsyslog_chk.c | ||
| nldbl-vsyslog.c | ||
| nldbl-vwprintf_chk.c | ||
| nldbl-vwprintf.c | ||
| nldbl-vwscanf.c | ||
| nldbl-wcstold_l.c | ||
| nldbl-wcstold.c | ||
| nldbl-wcstoldint.c | ||
| nldbl-wprintf_chk.c | ||
| nldbl-wprintf.c | ||
| nldbl-wscanf.c | ||
| nldbl-y0.c | ||
| nldbl-y1.c | ||
| nldbl-yn.c | ||
| s_asinh.c | ||
| s_atan.c | ||
| s_canonicalizel.c | ||
| s_cbrt.c | ||
| s_ceil.c | ||
| s_clog10l.c | ||
| s_copysign.c | ||
| s_erf.c | ||
| s_expm1.c | ||
| s_fabs.c | ||
| s_finite.c | ||
| s_floor.c | ||
| s_fma.c | ||
| s_fmal.c | ||
| s_fmaxmagl.c | ||
| s_fminmagl.c | ||
| s_frexp.c | ||
| s_isinf.c | ||
| s_isnan.c | ||
| s_ldexp.c | ||
| s_ldexpl.c | ||
| s_llrint.c | ||
| s_llround.c | ||
| s_log1p.c | ||
| s_logb.c | ||
| s_lrint.c | ||
| s_lround.c | ||
| s_modf.c | ||
| s_nearbyint.c | ||
| s_nextafter.c | ||
| s_nextdownl.c | ||
| s_nexttowardfd.c | ||
| s_remquo.c | ||
| s_rint.c | ||
| s_round.c | ||
| s_scalbln.c | ||
| s_scalbn.c | ||
| s_significand.c | ||
| s_significandl.c | ||
| s_sin.c | ||
| s_sincos.c | ||
| s_tan.c | ||
| s_tanh.c | ||
| s_trunc.c | ||
| Versions | ||
| w_acos.c | ||
| w_acosh.c | ||
| w_acoshl.c | ||
| w_acosl.c | ||
| w_asin.c | ||
| w_asinl.c | ||
| w_atan2.c | ||
| w_atan2l.c | ||
| w_atanh.c | ||
| w_atanhl.c | ||
| w_cosh.c | ||
| w_coshl.c | ||
| w_exp10.c | ||
| w_exp10l.c | ||
| w_exp.c | ||
| w_fmod.c | ||
| w_fmodl.c | ||
| w_hypot.c | ||
| w_hypotl.c | ||
| w_j0.c | ||
| w_j0l.c | ||
| w_j1.c | ||
| w_j1l.c | ||
| w_jn.c | ||
| w_jnl.c | ||
| w_lgamma_compat.c | ||
| w_lgamma_compatl.c | ||
| w_lgamma_r.c | ||
| w_lgammal_r.c | ||
| w_llogbl.c | ||
| w_log2.c | ||
| w_log2l.c | ||
| w_log10.c | ||
| w_log10l.c | ||
| w_log.c | ||
| w_logl.c | ||
| w_pow.c | ||
| w_powl.c | ||
| w_remainder.c | ||
| w_remainderl.c | ||
| w_scalb.c | ||
| w_scalbl.c | ||
| w_sinh.c | ||
| w_sinhl.c | ||
| w_sqrt.c | ||
| w_sqrtl.c | ||
| w_tgamma.c | ||
| w_tgammal.c | ||