From patchwork Tue May 17 22:52:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. Murphy" X-Patchwork-Id: 12328 X-Patchwork-Delegate: joseph@codesourcery.com Received: (qmail 57675 invoked by alias); 17 May 2016 22:53:13 -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 57602 invoked by uid 89); 17 May 2016 22:53:12 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Hx-languages-length:4836 X-HELO: e19.ny.us.ibm.com X-IBM-Helo: d01dlp03.pok.ibm.com X-IBM-MailFrom: murphyp@linux.vnet.ibm.com X-IBM-RcptTo: libc-alpha@sourceware.org From: "Paul E. Murphy" To: libc-alpha@sourceware.org Subject: [PATCHv2 1/6] Refactor bug-strtod.c to better test new types. Date: Tue, 17 May 2016 17:52:47 -0500 Message-Id: <480c234f4799a798d2b5e05f2d35a68ed746dbb0.1463524479.git.murphyp@linux.vnet.ibm.com> In-Reply-To: References: In-Reply-To: References: X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16051722-0057-0000-0000-000004583520 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused This introduces tst-strtod.h to contain some macros to assist with updating strto{f,d,ld} test code to support additional variants of this function. * stdlib/bug-strtod.c (main): refactor into ... [TEST_STRTOD]: New macro function. * stdlib/tst-strtod.h: New file. --- stdlib/bug-strtod.c | 103 +++++++++++++++++++--------------------------------- stdlib/tst-strtod.h | 50 +++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 65 deletions(-) create mode 100644 stdlib/tst-strtod.h diff --git a/stdlib/bug-strtod.c b/stdlib/bug-strtod.c index 82e7d30..d36a885 100644 --- a/stdlib/bug-strtod.c +++ b/stdlib/bug-strtod.c @@ -21,73 +21,46 @@ #include #include +#include "tst-strtod.h" + +#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF) \ +static int test_strto ## FSUF (void) \ +{ \ + char buf[300]; \ + int cnt; \ + int result = 0; \ + \ + for (cnt = 0; cnt < 200; ++cnt) \ + { \ + ssize_t n; \ + FTYPE f; \ + \ + n = sprintf (buf, "%d", cnt); \ + memset (buf + n, '0', cnt); \ + sprintf (buf + n + cnt, ".000e-%d", cnt); \ + f = strto ## FSUF (buf, NULL); \ + \ + if (f != (FTYPE) cnt) \ + { \ + char fstr[FSTRLENMAX]; \ + char fcntstr[FSTRLENMAX]; \ + FTOSTR (fstr, sizeof(fstr), "%" FTOSTRM "g", f); \ + FTOSTR (fcntstr, sizeof(fstr), "%" FTOSTRM "g", (FTYPE) cnt); \ + printf ("strto" #FSUF "(\"%s\") " \ + "failed for cnt == %d (%s instead of %s)\n", \ + buf, cnt, fstr, fcntstr); \ + result = 1; \ + } \ + else \ + printf ( "strto" #FSUF "() fine for cnt == %d\n", cnt); \ + } \ + return result; \ +} + +GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) int main (void) { - char buf[300]; - int cnt; - int result = 0; - - for (cnt = 0; cnt < 200; ++cnt) - { - ssize_t n; - float f; - - n = sprintf (buf, "%d", cnt); - memset (buf + n, '0', cnt); - sprintf (buf + n + cnt, ".000e-%d", cnt); - f = strtof (buf, NULL); - - if (f != (float) cnt) - { - printf ("strtof(\"%s\") failed for cnt == %d (%g instead of %g)\n", - buf, cnt, f, (float) cnt); - result = 1; - } - else - printf ("strtof() fine for cnt == %d\n", cnt); - } - - for (cnt = 0; cnt < 200; ++cnt) - { - ssize_t n; - double f; - - n = sprintf (buf, "%d", cnt); - memset (buf + n, '0', cnt); - sprintf (buf + n + cnt, ".000e-%d", cnt); - f = strtod (buf, NULL); - - if (f != (double) cnt) - { - printf ("strtod(\"%s\") failed for cnt == %d (%g instead of %g)\n", - buf, cnt, f, (double) cnt); - result = 1; - } - else - printf ("strtod() fine for cnt == %d\n", cnt); - } - - for (cnt = 0; cnt < 200; ++cnt) - { - ssize_t n; - long double f; - - n = sprintf (buf, "%d", cnt); - memset (buf + n, '0', cnt); - sprintf (buf + n + cnt, ".000e-%d", cnt); - f = strtold (buf, NULL); - - if (f != (long double) cnt) - { - printf ("strtold(\"%s\") failed for cnt == %d (%Lg instead of %Lg)\n", - buf, cnt, f, (long double) cnt); - result = 1; - } - else - printf ("strtold() fine for cnt == %d\n", cnt); - } - - return result; + return STRTOD_TEST_FOREACH (test_strto); } diff --git a/stdlib/tst-strtod.h b/stdlib/tst-strtod.h new file mode 100644 index 0000000..d53c1de --- /dev/null +++ b/stdlib/tst-strtod.h @@ -0,0 +1,50 @@ +/* Common utilities for testing strtod and its derivatives. + This file is part of the GNU C Library. + Copyright (C) 2016 Free Software Foundation, Inc. + + 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 + . */ + +#ifndef _TST_STRTOD_H +#define _TST_STRTOD_H + +#define FSTRLENMAX 128 + +/* Splat n variants of the same test for the various strtod functions. */ +#define GEN_TEST_STRTOD_FOREACH(mfunc) \ + mfunc ( f, float, snprintf, "", f, f) \ + mfunc ( d, double, snprintf, "", , ) \ + mfunc ( ld, long double, snprintf, "L", L, l) +/* The arguments to the generated macros are: + FSUF - Function suffix + FTYPE - float type + FTOSTR - float to string func + FTOSTRM - Optional modifier for FTOSTR format + LSUF - Literal suffix + CSUF - C standardish suffix for many of the math functions +*/ + + + +#define STRTOD_TEST_FOREACH(mfunc, ...) \ +({ \ + int result = 0; \ + result |= mfunc ## f (__VA_ARGS__); \ + result |= mfunc ## d (__VA_ARGS__); \ + result |= mfunc ## ld (__VA_ARGS__); \ + result; \ +}) + + +#endif