From: Paul E Murphy <murphyp@linux.ibm.com>
To: "Gabriel F. T. Gomes" <gabriel@inconstante.net.br>,
libc-alpha@sourceware.org
Subject: Re: [PATCH v2 03/30] ldbl-128ibm-compat: Add regular character, fortified printing functions
Date: Mon, 04 Nov 2019 15:43:00 -0000 [thread overview]
Message-ID: <ccdbe1e9-7ccd-84f3-5918-8a054e93310f@linux.ibm.com> (raw)
In-Reply-To: <20191025153410.15405-4-gabriel@inconstante.net.br>
On 10/25/19 10:33 AM, Gabriel F. T. Gomes wrote:
> From: "Gabriel F. T. Gomes" <gabrielftg@linux.ibm.com>
>
> No changes since v1.
>
> -- 8< --
> Since the introduction of internal functions with explicit flags for the
> printf family of functions, the 'mode' parameter can be used to select
> which format long double parameters have (with the mode flags:
> PRINTF_LDBL_IS_DBL and PRINTF_LDBL_USES_FLOAT128), as well as to select
> whether to check for overflows (mode flag: PRINTF_FORTIFY).
>
> This patch combines PRINTF_LDBL_USES_FLOAT128 and PRINTF_FORTIFY to
> provide the IEEE binary128 version of printf-like function for platforms
> where long double can take this format, in addition to the double format
> and to some non-ieee format (currently, this means powerpc64le).
>
> There are two flavors of test cases provided with this patch: one that
> explicitly calls the fortified functions, for instance __asprintf_chk,
> and another that reuses the non-fortified test, but defining
> _FORTIFY_SOURCE as 2. The first guarantees that the implementations are
> actually being tested (in bits/stdio2.h, vprintf gets redirected to
> __vfprintf_chk, which would leave __vprintf_chk untested), whereas the
> second guarantees that the redirections calls the correct function in
> the IBM and IEEE long double cases.
>
> Tested for powerpc64le.
> ---
> sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 25 +++
> sysdeps/ieee754/ldbl-128ibm-compat/Versions | 14 ++
> .../ldbl-128ibm-compat/ieee128-asprintf_chk.c | 38 ++++
> .../ldbl-128ibm-compat/ieee128-dprintf_chk.c | 38 ++++
> .../ldbl-128ibm-compat/ieee128-fprintf_chk.c | 38 ++++
> .../ldbl-128ibm-compat/ieee128-printf_chk.c | 38 ++++
> .../ldbl-128ibm-compat/ieee128-snprintf_chk.c | 42 ++++
> .../ldbl-128ibm-compat/ieee128-sprintf_chk.c | 42 ++++
> .../ieee128-vasprintf_chk.c | 31 +++
> .../ldbl-128ibm-compat/ieee128-vdprintf_chk.c | 30 +++
> .../ldbl-128ibm-compat/ieee128-vfprintf_chk.c | 30 +++
> .../ldbl-128ibm-compat/ieee128-vprintf_chk.c | 30 +++
> .../ieee128-vsnprintf_chk.c | 34 ++++
> .../ldbl-128ibm-compat/ieee128-vsprintf_chk.c | 34 ++++
> .../test-printf-chk-ibm128.c | 1 +
> .../test-printf-chk-ieee128.c | 1 +
> .../test-printf-chk-ldbl-compat.c | 179 ++++++++++++++++++
> .../test-printf-chk-redir-ibm128.c | 2 +
> .../test-printf-chk-redir-ieee128.c | 2 +
> 19 files changed, 649 insertions(+)
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ibm128.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ieee128.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-redir-ibm128.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-redir-ieee128.c
>
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Versions b/sysdeps/ieee754/ldbl-128ibm-compat/Versions
These changes look OK.
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c
> new file mode 100644
> index 0000000000..149fc046b6
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c
The 12 wrappers look OK, and suspiciously similar to the ndbl-64 code :).
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ibm128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ibm128.c
> new file mode 100644
> index 0000000000..7d50284d9c
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ibm128.c
> @@ -0,0 +1 @@
> +#include <test-printf-chk-ldbl-compat.c>
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ieee128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ieee128.c
> new file mode 100644
> index 0000000000..7d50284d9c
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ieee128.c
> @@ -0,0 +1 @@
> +#include <test-printf-chk-ldbl-compat.c>
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c
> new file mode 100644
> index 0000000000..f3d18c92ec
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c
> @@ -0,0 +1,179 @@
> +/* Test for the long double variants of *printf_chk functions.
> + 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
> + <http://www.gnu.org/licenses/>. */
> +
> +#define _FORTIFY_SOURCE 2
> +
> +#include <stdarg.h>
> +#include <stdint.h>
> +#include <stdio.h>
> +#include <stdlib.h>
> +
> +#include <support/capture_subprocess.h>
> +#include <support/check.h>
> +
> +static void
> +do_test_call_varg (FILE *stream, const char *format, ...)
> +{
> + char *buffer = NULL;
> + char string[128];
> + int res;
> + va_list args;
> +
> + printf ("%20s", "__vasprintf_chk: ");
> + va_start (args, format);
> + res = __vasprintf_chk (&buffer, 1, format, args);
> + va_end (args);
> + if (res == -1)
> + printf ("Error using vasprintf\n");
> + if (buffer == NULL)
> + printf ("Error using vasprintf\n");
> + else
> + {
> + printf ("%s", buffer);
> + free (buffer);
> + }
> + printf ("\n");
> +
> + printf ("%20s", "__vdprintf_chk: ");
> + va_start (args, format);
> + __vdprintf_chk (fileno (stream), 1, format, args);
> + va_end (args);
> + printf ("\n");
> +
> + printf ("%20s", "__vfprintf_chk: ");
> + va_start (args, format);
> + __vfprintf_chk (stream, 1, format, args);
> + va_end (args);
> + printf ("\n");
> +
> + printf ("%20s", "__vprintf_chk: ");
> + va_start (args, format);
> + __vprintf_chk (1, format, args);
> + va_end (args);
> + printf ("\n");
> +
> + printf ("%20s", "__vsnprintf_chk: ");
> + va_start (args, format);
> + __vsnprintf_chk (string, 79, 1, 127, format, args);
> + va_end (args);
> + printf ("%s", string);
> + printf ("\n");
> +
> + printf ("%20s", "__vsprintf_chk: ");
> + va_start (args, format);
> + __vsprintf_chk (string, 1, 127, format, args);
> + va_end (args);
> + printf ("%s", string);
> + printf ("\n");
> +}
> +
> +static void
> +do_test_call_rarg (FILE *stream, const char *format, long double ld)
> +{
> + char *buffer = NULL;
> + char string[128];
> + int res;
> +
> + printf ("%20s", "__asprintf_chk: ");
> + res = __asprintf_chk (&buffer, 1, format, ld);
> + if (res == -1)
> + printf ("Error using vasprintf\n");
> + if (buffer == NULL)
> + printf ("Error using asprintf\n");
> + else
> + {
> + printf ("%s", buffer);
> + free (buffer);
> + }
> + printf ("\n");
> +
> + printf ("%20s", "__dprintf_chk: ");
> + __dprintf_chk (fileno (stream), 1, format, ld);
> + printf ("\n");
> +
> + printf ("%20s", "__fprintf_chk: ");
> + __fprintf_chk (stdout, 1, format, ld);
> + printf ("\n");
> +
> + printf ("%20s", "__printf_chk: ");
> + __printf_chk (1, format, ld);
> + printf ("\n");
> +
> + printf ("%20s", "__snprintf_chk: ");
> + __snprintf_chk (string, 79, 1, 127, format, ld);
> + printf ("%s", string);
> + printf ("\n");
> +
> + printf ("%20s", "__sprintf_chk: ");
> + __sprintf_chk (string, 1, 127, format, ld);
> + printf ("%s", string);
> + printf ("\n");
> +}
> +
> +static void
> +do_test_call (void)
> +{
> + long double ld = -1;
> +
> + /* Print in decimal notation. */
> + do_test_call_rarg (stdout, "%.10Lf", ld);
> + do_test_call_varg (stdout, "%.10Lf", ld);
> +
> + /* Print in hexadecimal notation. */
> + do_test_call_rarg (stdout, "%.10La", ld);
> + do_test_call_varg (stdout, "%.10La", ld);
> +}
> +
> +static int
> +do_test (void)
> +{
> + struct support_capture_subprocess result;
> + result = support_capture_subprocess ((void *) &do_test_call, NULL);
> +
> + /* Compare against the expected output. */
> + const char *expected =
> + " __asprintf_chk: -1.0000000000\n"
> + " __dprintf_chk: -1.0000000000\n"
> + " __fprintf_chk: -1.0000000000\n"
> + " __printf_chk: -1.0000000000\n"
> + " __snprintf_chk: -1.0000000000\n"
> + " __sprintf_chk: -1.0000000000\n"
> + " __vasprintf_chk: -1.0000000000\n"
> + " __vdprintf_chk: -1.0000000000\n"
> + " __vfprintf_chk: -1.0000000000\n"
> + " __vprintf_chk: -1.0000000000\n"
> + " __vsnprintf_chk: -1.0000000000\n"
> + " __vsprintf_chk: -1.0000000000\n"
> + " __asprintf_chk: -0x1.0000000000p+0\n"
> + " __dprintf_chk: -0x1.0000000000p+0\n"
> + " __fprintf_chk: -0x1.0000000000p+0\n"
> + " __printf_chk: -0x1.0000000000p+0\n"
> + " __snprintf_chk: -0x1.0000000000p+0\n"
> + " __sprintf_chk: -0x1.0000000000p+0\n"
> + " __vasprintf_chk: -0x1.0000000000p+0\n"
> + " __vdprintf_chk: -0x1.0000000000p+0\n"
> + " __vfprintf_chk: -0x1.0000000000p+0\n"
> + " __vprintf_chk: -0x1.0000000000p+0\n"
> + " __vsnprintf_chk: -0x1.0000000000p+0\n"
> + " __vsprintf_chk: -0x1.0000000000p+0\n";
> + TEST_COMPARE_STRING (expected, result.out.buffer);
> +
> + return 0;
> +}
> +
> +#include <support/test-driver.c>
OK
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-redir-ibm128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-redir-ibm128.c
> new file mode 100644
> index 0000000000..aeab22412b
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-redir-ibm128.c
> @@ -0,0 +1,2 @@
> +#define _FORTIFY_SOURCE 2
This is also defined in the unified test case above. Is it necessary
here to?
> +#include <sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c>
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-redir-ieee128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-redir-ieee128.c
> new file mode 100644
> index 0000000000..aeab22412b
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-redir-ieee128.c
> @@ -0,0 +1,2 @@
> +#define _FORTIFY_SOURCE 2
Likewise.
> +#include <sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c>
>
next prev parent reply other threads:[~2019-11-04 15:43 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 15:34 [PATCH v2 00/30] Add IEEE long double <-> string functions for powerpc64le Gabriel F. T. Gomes
2019-10-25 15:34 ` [PATCH v2 02/30] ldbl-128ibm-compat: Add wide character printing functions Gabriel F. T. Gomes
2019-11-04 15:08 ` Paul E Murphy
2019-11-04 18:10 ` Gabriel F. T. Gomes
2019-11-04 20:11 ` Paul E Murphy
2019-10-25 15:34 ` [PATCH v2 03/30] ldbl-128ibm-compat: Add regular character, fortified " Gabriel F. T. Gomes
2019-11-04 15:43 ` Paul E Murphy [this message]
2019-11-05 19:37 ` Gabriel F. T. Gomes
2019-11-08 16:44 ` Paul E Murphy
2019-10-25 15:34 ` [PATCH v2 01/30] ldbl-128ibm-compat: Add regular character " Gabriel F. T. Gomes
2019-10-29 15:42 ` Paul E Murphy
2019-10-30 16:10 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 10/30] ldbl-128ibm-compat: Add err.h functions Gabriel F. T. Gomes
2019-11-08 20:22 ` Paul E Murphy
2019-11-13 14:24 ` Gabriel F. T. Gomes
2019-11-27 19:11 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 07/30] ldbl-128ibm-compat: Add regular character scanning functions Gabriel F. T. Gomes
2019-11-14 21:36 ` Paul E Murphy
2019-10-25 15:35 ` [PATCH v2 05/30] ldbl-128ibm-compat: Test double values Gabriel F. T. Gomes
2019-11-04 16:16 ` Paul E Murphy
2019-10-25 15:35 ` [PATCH v2 08/30] ldbl-128ibm-compat: Add wide character scanning functions Gabriel F. T. Gomes
2019-11-04 17:47 ` Paul E Murphy
2019-11-11 14:33 ` Gabriel F. T. Gomes
2019-11-22 22:34 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 14/30] ldbl-128ibm-compat: Add obstack printing functions Gabriel F. T. Gomes
2019-11-08 23:42 ` Paul E Murphy
2019-11-27 19:11 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 09/30] ldbl-128ibm-compat: Add argp_error and argp_failure Gabriel F. T. Gomes
2019-11-08 19:58 ` Paul E Murphy
2019-10-25 15:35 ` [PATCH v2 06/30] ldbl-128ibm-compat: Test positional arguments Gabriel F. T. Gomes
2019-11-04 16:55 ` Paul E Murphy
2019-11-06 17:28 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 13/30] ldbl-128ibm-compat: Add ISO C99 versions of scanf functions Gabriel F. T. Gomes
2019-11-08 23:26 ` Paul E Murphy
2019-11-21 13:44 ` Gabriel F. T. Gomes
2019-11-22 22:49 ` Gabriel F. T. Gomes
2019-11-27 19:13 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 15/30] ldbl-128ibm-compat: Add syslog functions Gabriel F. T. Gomes
2019-11-14 17:47 ` Paul E Murphy
2019-11-14 18:25 ` Florian Weimer
2019-11-27 19:12 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 11/30] ldbl-128ibm-compat: Add error.h functions Gabriel F. T. Gomes
2019-11-08 22:21 ` Paul E Murphy
2019-10-25 15:36 ` [PATCH v2 04/30] ldbl-128ibm-compat: Add wide character, fortified printing functions Gabriel F. T. Gomes
2019-11-04 16:10 ` Paul E Murphy
2019-10-25 15:36 ` [PATCH v2 23/30] Refactor *cvt functions implementation (5/5) Gabriel F. T. Gomes
2019-11-14 23:12 ` Paul E Murphy
2019-11-27 17:42 ` Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 22/30] Refactor *cvt functions implementation (4/5) Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 16/30] ldbl-128ibm-compat: Add strfmon_l with IEEE long double format Gabriel F. T. Gomes
2019-11-14 18:03 ` Paul E Murphy
2019-11-27 17:43 ` Gabriel F. T. Gomes
2019-12-03 16:57 ` Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 21/30] Refactor *cvt functions implementation (3/5) Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 19/30] Refactor *cvt functions implementation (1/5) Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 12/30] ldbl-128ibm-compat: Reuse tests for err.h and error.h functions Gabriel F. T. Gomes
2019-11-08 22:25 ` Paul E Murphy
2019-10-25 15:36 ` [PATCH v2 18/30] ldbl-128ibm-compat: Add tests for strfroml, strtold, and wcstold Gabriel F. T. Gomes
2019-11-14 18:26 ` Paul E Murphy
2019-11-27 17:47 ` Gabriel F. T. Gomes
2019-12-03 16:58 ` Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 20/30] Refactor *cvt functions implementation (2/5) Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 17/30] ldbl-128ibm-compat: Add tests for strfmon and strfmon_l Gabriel F. T. Gomes
2019-11-14 18:11 ` Paul E Murphy
2019-12-03 16:58 ` Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 25/30] Do not redirect calls to __GI_* symbols, when redirecting to *ieee128 Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 24/30] ldbl-128ibm-compat: Add *cvt functions Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 28/30] ldbl-128ibm-compat: Do not mix -mabi=*longdouble and -mlong-double-128 Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 27/30] Avoid compat symbols for totalorder in powerpc64le IEEE long double Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 26/30] ldbl-128ibm-compat: Compiler flags for stdio functions Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 30/30] RFC: powerpc64le: Enable support for IEEE long double Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 29/30] powerpc64le: Require a compiler with -mno-gnu-attribute Gabriel F. T. Gomes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ccdbe1e9-7ccd-84f3-5918-8a054e93310f@linux.ibm.com \
--to=murphyp@linux.ibm.com \
--cc=gabriel@inconstante.net.br \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).