From dce425341171ec5784c87165e23883630971bd97 Mon Sep 17 00:00:00 2001 From: "Gabriel F. T. Gomes" Date: Tue, 26 Nov 2019 14:48:49 -0300 Subject: Refactor *cvt functions implementation (2/2) This patch refactors the *cvt functions implementation in a way that makes it easier to re-use them for implementing the IEEE long double on powerpc64le. By removing the macros that generate the function names (APPEND combined with FUNC_PREFIX), the new code makes it easier to define new function names, such as __qecvtieee128. Tested that installed stripped binaries for all build-many-glibcs targets remain identical before and after this patch. Also tested for powerpc64le and x86_64. Reviewed-by: Paul E. Murphy --- misc/efgcvt-template.c | 19 ++++++------------- misc/efgcvt.c | 25 ++++++++++++++++--------- misc/efgcvt_r-template.c | 14 ++++++-------- misc/efgcvt_r.c | 19 ++++++++++--------- misc/qefgcvt.c | 25 +++++++++++++++---------- misc/qefgcvt_r.c | 19 +++++++++---------- 6 files changed, 62 insertions(+), 59 deletions(-) (limited to 'misc') diff --git a/misc/efgcvt-template.c b/misc/efgcvt-template.c index aeb4e1e..7fabdf2 100644 --- a/misc/efgcvt-template.c +++ b/misc/efgcvt-template.c @@ -25,8 +25,6 @@ #define APPEND(a, b) APPEND2 (a, b) #define APPEND2(a, b) a##b -#define __APPEND(a, b) __APPEND2 (a, b) -#define __APPEND2(a, b) __##a##b #define FCVT_BUFFER APPEND (FUNC_PREFIX, fcvt_buffer) @@ -39,13 +37,11 @@ static char ECVT_BUFFER[MAXDIG]; libc_freeres_ptr (static char *FCVT_BUFPTR); char * -__APPEND (FUNC_PREFIX, fcvt) (FLOAT_TYPE value, int ndigit, int *decpt, - int *sign) +__FCVT (FLOAT_TYPE value, int ndigit, int *decpt, int *sign) { if (FCVT_BUFPTR == NULL) { - if (__APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, - FCVT_BUFFER, MAXDIG) != -1) + if (__FCVT_R (value, ndigit, decpt, sign, FCVT_BUFFER, MAXDIG) != -1) return FCVT_BUFFER; FCVT_BUFPTR = (char *) malloc (FCVT_MAXDIG); @@ -53,25 +49,22 @@ __APPEND (FUNC_PREFIX, fcvt) (FLOAT_TYPE value, int ndigit, int *decpt, return FCVT_BUFFER; } - (void) __APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, - FCVT_BUFPTR, FCVT_MAXDIG); + (void) __FCVT_R (value, ndigit, decpt, sign, FCVT_BUFPTR, FCVT_MAXDIG); return FCVT_BUFPTR; } char * -__APPEND (FUNC_PREFIX, ecvt) (FLOAT_TYPE value, int ndigit, int *decpt, - int *sign) +__ECVT (FLOAT_TYPE value, int ndigit, int *decpt, int *sign) { - (void) __APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign, - ECVT_BUFFER, MAXDIG); + (void) __ECVT_R (value, ndigit, decpt, sign, ECVT_BUFFER, MAXDIG); return ECVT_BUFFER; } char * -__APPEND (FUNC_PREFIX, gcvt) (FLOAT_TYPE value, int ndigit, char *buf) +__GCVT (FLOAT_TYPE value, int ndigit, char *buf) { sprintf (buf, "%.*" FLOAT_FMT_FLAG "g", MIN (ndigit, NDIGIT_MAX), value); return buf; diff --git a/misc/efgcvt.c b/misc/efgcvt.c index 9021b03..ddf3069 100644 --- a/misc/efgcvt.c +++ b/misc/efgcvt.c @@ -16,20 +16,27 @@ License along with the GNU C Library; if not, see . */ +#define ECVT ecvt +#define FCVT fcvt +#define GCVT gcvt +#define __ECVT __ecvt +#define __FCVT __fcvt +#define __GCVT __gcvt +#define __ECVT_R __ecvt_r +#define __FCVT_R __fcvt_r #include #include #if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0) -# define cvt_symbol(symbol) \ - cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \ - APPEND (q, symbol), GLIBC_2_0); \ - strong_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol)) +# define cvt_symbol(local, symbol) \ + cvt_symbol_1 (libc, local, APPEND (q, symbol), GLIBC_2_0); \ + strong_alias (local, symbol) # define cvt_symbol_1(lib, local, symbol, version) \ compat_symbol (lib, local, symbol, version) #else -# define cvt_symbol(symbol) \ - strong_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol)) +# define cvt_symbol(local, symbol) \ + strong_alias (local, symbol) #endif -cvt_symbol(fcvt); -cvt_symbol(ecvt); -cvt_symbol(gcvt); +cvt_symbol (__fcvt, fcvt); +cvt_symbol (__ecvt, ecvt); +cvt_symbol (__gcvt, gcvt); diff --git a/misc/efgcvt_r-template.c b/misc/efgcvt_r-template.c index 1cd335af..9777501 100644 --- a/misc/efgcvt_r-template.c +++ b/misc/efgcvt_r-template.c @@ -28,12 +28,10 @@ #define APPEND(a, b) APPEND2 (a, b) #define APPEND2(a, b) a##b -#define __APPEND(a, b) __APPEND2 (a, b) -#define __APPEND2(a, b) __##a##b int -__APPEND (FUNC_PREFIX, fcvt_r) (FLOAT_TYPE value, int ndigit, int *decpt, - int *sign, char *buf, size_t len) +__FCVT_R (FLOAT_TYPE value, int ndigit, int *decpt, int *sign, + char *buf, size_t len) { ssize_t n; ssize_t i; @@ -127,8 +125,8 @@ __APPEND (FUNC_PREFIX, fcvt_r) (FLOAT_TYPE value, int ndigit, int *decpt, } int -__APPEND (FUNC_PREFIX, ecvt_r) (FLOAT_TYPE value, int ndigit, int *decpt, - int *sign, char *buf, size_t len) +__ECVT_R (FLOAT_TYPE value, int ndigit, int *decpt, int *sign, + char *buf, size_t len) { int exponent = 0; @@ -187,8 +185,8 @@ __APPEND (FUNC_PREFIX, ecvt_r) (FLOAT_TYPE value, int ndigit, int *decpt, *sign = isfinite (value) ? signbit (value) != 0 : 0; } else - if (__APPEND (FUNC_PREFIX, fcvt_r) (value, MIN (ndigit, NDIGIT_MAX) - 1, - decpt, sign, buf, len)) + if (__FCVT_R (value, MIN (ndigit, NDIGIT_MAX) - 1, + decpt, sign, buf, len)) return -1; *decpt += exponent; diff --git a/misc/efgcvt_r.c b/misc/efgcvt_r.c index ad78f15..5dabcad 100644 --- a/misc/efgcvt_r.c +++ b/misc/efgcvt_r.c @@ -16,23 +16,24 @@ License along with the GNU C Library; if not, see . */ +#define ECVT_R ecvt_r +#define FCVT_R fcvt_r +#define __ECVT_R __ecvt_r +#define __FCVT_R __fcvt_r #include #include #if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0) -# define cvt_symbol(symbol) \ - cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \ - APPEND (q, symbol), GLIBC_2_0); \ - weak_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol)) +# define cvt_symbol(local, symbol) \ + cvt_symbol_1 (libc, local, APPEND (q, symbol), GLIBC_2_0); \ + weak_alias (local, symbol) # define cvt_symbol_1(lib, local, symbol, version) \ libc_hidden_def (local) \ compat_symbol (lib, local, symbol, version) #else -# define cvt_symbol(symbol) \ - cvt_symbol_1 (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol)) -# define cvt_symbol_1(local, symbol) \ +# define cvt_symbol(local, symbol) \ libc_hidden_def (local) \ weak_alias (local, symbol) #endif -cvt_symbol(fcvt_r); -cvt_symbol(ecvt_r); +cvt_symbol (__fcvt_r, fcvt_r); +cvt_symbol (__ecvt_r, ecvt_r); diff --git a/misc/qefgcvt.c b/misc/qefgcvt.c index 8f1582a..903bf93 100644 --- a/misc/qefgcvt.c +++ b/misc/qefgcvt.c @@ -16,19 +16,24 @@ License along with the GNU C Library; if not, see . */ +#define ECVT qecvt +#define FCVT qfcvt +#define GCVT qgcvt +#define __ECVT __qecvt +#define __FCVT __qfcvt +#define __GCVT __qgcvt +#define __ECVT_R __qecvt_r +#define __FCVT_R __qfcvt_r #include #include #if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0) -# define cvt_symbol(symbol) \ - cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \ - APPEND (FUNC_PREFIX, symbol), GLIBC_2_4) -# define cvt_symbol_1(lib, local, symbol, version) \ - versioned_symbol (lib, local, symbol, version) +# define cvt_symbol(local, symbol) \ + versioned_symbol (libc, local, symbol, GLIBC_2_4) #else -# define cvt_symbol(symbol) \ - strong_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol)) +# define cvt_symbol(local, symbol) \ + strong_alias (local, symbol) #endif -cvt_symbol(fcvt); -cvt_symbol(ecvt); -cvt_symbol(gcvt); +cvt_symbol (__qfcvt, qfcvt); +cvt_symbol (__qecvt, qecvt); +cvt_symbol (__qgcvt, qgcvt); diff --git a/misc/qefgcvt_r.c b/misc/qefgcvt_r.c index 4240f1d..b790bf7 100644 --- a/misc/qefgcvt_r.c +++ b/misc/qefgcvt_r.c @@ -17,22 +17,21 @@ License along with the GNU C Library; if not, see . */ +#define ECVT_R qecvt_r +#define FCVT_R qfcvt_r +#define __ECVT_R __qecvt_r +#define __FCVT_R __qfcvt_r #include #include #if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0) -# define cvt_symbol(symbol) \ - cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \ - APPEND (FUNC_PREFIX, symbol), GLIBC_2_4) -# define cvt_symbol_1(lib, local, symbol, version) \ +# define cvt_symbol(local, symbol) \ libc_hidden_def (local) \ - versioned_symbol (lib, local, symbol, version) + versioned_symbol (libc, local, symbol, GLIBC_2_4) #else -# define cvt_symbol(symbol) \ - cvt_symbol_1 (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol)) -# define cvt_symbol_1(local, symbol) \ +# define cvt_symbol(local, symbol) \ libc_hidden_def (local) \ weak_alias (local, symbol) #endif -cvt_symbol(fcvt_r); -cvt_symbol(ecvt_r); +cvt_symbol (__qfcvt_r, qfcvt_r); +cvt_symbol (__qecvt_r, qecvt_r); -- cgit v1.1