From patchwork Tue Oct 15 19:05:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gabriel F. T. Gomes" X-Patchwork-Id: 35011 Received: (qmail 112150 invoked by alias); 15 Oct 2019 19:07:53 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 112041 invoked by uid 89); 15 Oct 2019 19:07:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=generous X-HELO: smtpout1.mo528.mail-out.ovh.net From: "Gabriel F. T. Gomes" To: Subject: [PATCH 22/31] Refactor *cvt functions implementation (3/5) Date: Tue, 15 Oct 2019 16:05:20 -0300 Message-ID: <20191015190529.11559-23-gabriel@inconstante.net.br> In-Reply-To: <20191015190529.11559-1-gabriel@inconstante.net.br> References: <20191015190529.11559-1-gabriel@inconstante.net.br> MIME-Version: 1.0 X-Ovh-Tracer-Id: 1802284278625914563 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrjeefgddufeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenuc From: "Gabriel F. T. Gomes" This patch is to be squashed with the other n/5 refactoring patches. This patch only moves and merges the contents of misc/qefgcvt.c and misc/qefgcvt_r.c into misc/efgcvt-ldbl-macros.h. --- misc/efgcvt-ldbl-macros.h | 59 +++++++++++++++++++++++++++++++++++++++ misc/qefgcvt.c | 27 ------------------ misc/qefgcvt_r.c | 37 ------------------------ 3 files changed, 59 insertions(+), 64 deletions(-) create mode 100644 misc/efgcvt-ldbl-macros.h diff --git a/misc/efgcvt-ldbl-macros.h b/misc/efgcvt-ldbl-macros.h new file mode 100644 index 0000000000..ff97b13d7f --- /dev/null +++ b/misc/efgcvt-ldbl-macros.h @@ -0,0 +1,59 @@ +/* Macros for the implementation of *cvt functions, long double version. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library 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.1 of the License, or (at your option) any later version. + + The GNU C Library 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 the GNU C Library; if not, see + . */ + +#include + +#define FLOAT_TYPE long double +#define FUNC_PREFIX q +#define FLOAT_FMT_FLAG "L" +#define FLOAT_NAME_EXT l +#define FLOAT_MIN_10_EXP LDBL_MIN_10_EXP +/* Actually we have to write (LDBL_DIG + log10 (LDBL_MAX_10_EXP)) but + we don't have log10 available in the preprocessor. Since we cannot + assume anything on the used `long double' format be generous. */ +#define MAXDIG (NDIGIT_MAX + 12) +#define FCVT_MAXDIG (LDBL_MAX_10_EXP + MAXDIG) +#if LDBL_MANT_DIG == 64 +# define NDIGIT_MAX 21 +#elif LDBL_MANT_DIG == 53 +# define NDIGIT_MAX 17 +#elif LDBL_MANT_DIG == 113 +# define NDIGIT_MAX 36 +#elif LDBL_MANT_DIG == 106 +# define NDIGIT_MAX 34 +#elif LDBL_MANT_DIG == 56 +# define NDIGIT_MAX 18 +#else +/* See IEEE 854 5.6, table 2 for this formula. Unfortunately we need a + compile time constant here, so we cannot use it. */ +# error "NDIGIT_MAX must be precomputed" +# define NDIGIT_MAX (lrint (ceil (M_LN2 / M_LN10 * LDBL_MANT_DIG + 1.0))) +#endif +#if LDBL_MIN_10_EXP == -37 +# define FLOAT_MIN_10_NORM 1.0e-37L +#elif LDBL_MIN_10_EXP == -291 +# define FLOAT_MIN_10_NORM 1.0e-291L +#elif LDBL_MIN_10_EXP == -307 +# define FLOAT_MIN_10_NORM 1.0e-307L +#elif LDBL_MIN_10_EXP == -4931 +# define FLOAT_MIN_10_NORM 1.0e-4931L +#else +/* libc can't depend on libm. */ +# error "FLOAT_MIN_10_NORM must be precomputed" +# define FLOAT_MIN_10_NORM exp10l (LDBL_MIN_10_EXP) +#endif diff --git a/misc/qefgcvt.c b/misc/qefgcvt.c index 4fcadfcdc2..6987fb0db1 100644 --- a/misc/qefgcvt.c +++ b/misc/qefgcvt.c @@ -16,31 +16,4 @@ License along with the GNU C Library; if not, see . */ -#include - -#define FLOAT_TYPE long double -#define FUNC_PREFIX q -#define FLOAT_FMT_FLAG "L" -/* Actually we have to write (LDBL_DIG + log10 (LDBL_MAX_10_EXP)) but - we don't have log10 available in the preprocessor. Since we cannot - assume anything on the used `long double' format be generous. */ -#define MAXDIG (NDIGIT_MAX + 12) -#define FCVT_MAXDIG (LDBL_MAX_10_EXP + MAXDIG) -#if LDBL_MANT_DIG == 64 -# define NDIGIT_MAX 21 -#elif LDBL_MANT_DIG == 53 -# define NDIGIT_MAX 17 -#elif LDBL_MANT_DIG == 113 -# define NDIGIT_MAX 36 -#elif LDBL_MANT_DIG == 106 -# define NDIGIT_MAX 34 -#elif LDBL_MANT_DIG == 56 -# define NDIGIT_MAX 18 -#else -/* See IEEE 854 5.6, table 2 for this formula. Unfortunately we need a - compile time constant here, so we cannot use it. */ -# error "NDIGIT_MAX must be precomputed" -# define NDIGIT_MAX (lrint (ceil (M_LN2 / M_LN10 * LDBL_MANT_DIG + 1.0))) -#endif - #include "efgcvt.c" diff --git a/misc/qefgcvt_r.c b/misc/qefgcvt_r.c index 8f4d8b9f7a..e1f074b49c 100644 --- a/misc/qefgcvt_r.c +++ b/misc/qefgcvt_r.c @@ -17,41 +17,4 @@ License along with the GNU C Library; if not, see . */ -#include - -#define FLOAT_TYPE long double -#define FUNC_PREFIX q -#define FLOAT_FMT_FLAG "L" -#define FLOAT_NAME_EXT l -#define FLOAT_MIN_10_EXP LDBL_MIN_10_EXP -#if LDBL_MANT_DIG == 64 -# define NDIGIT_MAX 21 -#elif LDBL_MANT_DIG == 53 -# define NDIGIT_MAX 17 -#elif LDBL_MANT_DIG == 113 -# define NDIGIT_MAX 36 -#elif LDBL_MANT_DIG == 106 -# define NDIGIT_MAX 34 -#elif LDBL_MANT_DIG == 56 -# define NDIGIT_MAX 18 -#else -/* See IEEE 854 5.6, table 2 for this formula. Unfortunately we need a - compile time constant here, so we cannot use it. */ -# error "NDIGIT_MAX must be precomputed" -# define NDIGIT_MAX (lrint (ceil (M_LN2 / M_LN10 * LDBL_MANT_DIG + 1.0))) -#endif -#if LDBL_MIN_10_EXP == -37 -# define FLOAT_MIN_10_NORM 1.0e-37L -#elif LDBL_MIN_10_EXP == -291 -# define FLOAT_MIN_10_NORM 1.0e-291L -#elif LDBL_MIN_10_EXP == -307 -# define FLOAT_MIN_10_NORM 1.0e-307L -#elif LDBL_MIN_10_EXP == -4931 -# define FLOAT_MIN_10_NORM 1.0e-4931L -#else -/* libc can't depend on libm. */ -# error "FLOAT_MIN_10_NORM must be precomputed" -# define FLOAT_MIN_10_NORM exp10l (LDBL_MIN_10_EXP) -#endif - #include "efgcvt_r.c"