[PATCH v2 04/30] ldbl-128ibm-compat: Add wide character, fortified printing functions
Paul E Murphy
murphyp@linux.ibm.com
Mon Nov 4 16:10:00 GMT 2019
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< --
> Similarly to what was done for the regular character, fortified printing
> functions, this patch combines the mode masks PRINTF_LDBL_USES_FLOAT128
> and PRINTF_FORTIFY to provide wide character versions of fortified
> printf functions. It also adds two flavors of test cases: one that
> explicitly calls the fortified functions, and another that reuses the
> non-fortified test, but defining _FORTIFY_SOURCE as 2. The first
> guarantees that the implementations are actually being tested
> (independently of what's in bits/wchar2.h), 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 | 18 ++-
> sysdeps/ieee754/ldbl-128ibm-compat/Versions | 8 ++
> .../ldbl-128ibm-compat/ieee128-fwprintf_chk.c | 38 ++++++
> .../ldbl-128ibm-compat/ieee128-swprintf_chk.c | 42 +++++++
> .../ieee128-vfwprintf_chk.c | 31 +++++
> .../ieee128-vswprintf_chk.c | 34 ++++++
> .../ldbl-128ibm-compat/ieee128-vwprintf_chk.c | 30 +++++
> .../ldbl-128ibm-compat/ieee128-wprintf_chk.c | 38 ++++++
> .../test-wprintf-chk-ibm128.c | 1 +
> .../test-wprintf-chk-ieee128.c | 1 +
> .../test-wprintf-chk-ldbl-compat.c | 113 ++++++++++++++++++
> .../test-wprintf-chk-redir-ibm128.c | 2 +
> .../test-wprintf-chk-redir-ieee128.c | 2 +
> 13 files changed, 357 insertions(+), 1 deletion(-)
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-swprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfwprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vswprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vwprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-wprintf_chk.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ibm128.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ieee128.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ldbl-compat.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-redir-ibm128.c
> create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-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
OK
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c
The 6 wrappers look OK too.
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vwprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vwprintf_chk.c
> new file mode 100644
> index 0000000000..5e47dccc0d
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vwprintf_chk.c
> @@ -0,0 +1,30 @@
> +/* Wrapper for __vwprintf_chk. IEEE128 version.
> + Copyright (C) 2019 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/>. */
> +
> +#include <libio/libioP.h>
> +
> +extern int
> +___ieee128_vwprintf_chk (int flag, const wchar_t *format, va_list ap)
> +{
> + unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
> + if (flag > 0)
> + mode |= PRINTF_FORTIFY;
> +
> + return __vfwprintf_internal (stdout, format, ap, mode);
> +}
> +strong_alias (___ieee128_vwprintf_chk, __vwprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-wprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-wprintf_chk.c
> new file mode 100644
> index 0000000000..ba00b7be54
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-wprintf_chk.c
> @@ -0,0 +1,38 @@
> +/* Wrapper for __wprintf_chk. IEEE128 version.
> + Copyright (C) 2019 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/>. */
> +
> +#include <stdarg.h>
> +#include <libio/libioP.h>
> +
> +extern int
> +___ieee128_wprintf_chk (int flag, const wchar_t *format, ...)
> +{
> + va_list ap;
> + int done;
> +
> + unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
> + if (flag > 0)
> + mode |= PRINTF_FORTIFY;
> +
> + va_start (ap, format);
> + done = __vfwprintf_internal (stdout, format, ap, mode);
> + va_end (ap);
> +
> + return done;
> +}
> +strong_alias (___ieee128_wprintf_chk, __wprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ibm128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ibm128.c
> new file mode 100644
> index 0000000000..5323df71e2
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ibm128.c
> @@ -0,0 +1 @@
> +#include <test-wprintf-chk-ldbl-compat.c>
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ieee128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ieee128.c
> new file mode 100644
> index 0000000000..5323df71e2
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ieee128.c
> @@ -0,0 +1 @@
> +#include <test-wprintf-chk-ldbl-compat.c>
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ldbl-compat.c
> new file mode 100644
> index 0000000000..f614004f27
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ldbl-compat.c
> @@ -0,0 +1,113 @@
> +/* Test for the long double variants of *w*printf_chk functions.
> + Copyright (C) 2019 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 <wchar.h>
> +
> +#include <support/capture_subprocess.h>
> +#include <support/check.h>
> +
> +static void
> +do_test_call_varg (FILE *stream, const wchar_t *format, ...)
> +{
> + wchar_t string[128];
> + va_list args;
> +
> + wprintf (L"%20Ls", L"__vfwprintf_chk: ");
> + va_start (args, format);
> + __vfwprintf_chk (stream, 1, format, args);
> + va_end (args);
> + wprintf (L"\n");
> +
> + wprintf (L"%20Ls", L"__vswprintf_chk: ");
> + va_start (args, format);
> + __vswprintf_chk (string, 79, 1, 127, format, args);
> + va_end (args);
> + wprintf (L"%Ls", string);
> + wprintf (L"\n");
> +
> + wprintf (L"%20Ls", L"__vwprintf_chk: ");
> + va_start (args, format);
> + __vwprintf_chk (1, format, args);
> + va_end (args);
> + wprintf (L"\n");
> +}
> +
> +static void
> +do_test_call_rarg (FILE *stream, const wchar_t *format, long double ld)
> +{
> + wchar_t string[128];
> +
> + wprintf (L"%20Ls", L"__fwprintf_chk: ");
> + __fwprintf_chk (stream, 1, format, ld);
> + wprintf (L"\n");
> +
> + wprintf (L"%20Ls", L"__swprintf_chk: ");
> + __swprintf_chk (string, 79, 1, 127, format, ld);
> + wprintf (L"%Ls", string);
> + wprintf (L"\n");
> +
> + wprintf (L"%20Ls", L"__wprintf_chk: ");
> + __wprintf_chk (1, format, ld);
> + wprintf (L"\n");
> +}
> +
> +static void
> +do_test_call (void)
> +{
> + long double ld = -1;
> +
> + /* Print in decimal notation. */
> + do_test_call_rarg (stdout, L"%.10Lf", ld);
> + do_test_call_varg (stdout, L"%.10Lf", ld);
> +
> + /* Print in hexadecimal notation. */
> + do_test_call_rarg (stdout, L"%.10La", ld);
> + do_test_call_varg (stdout, L"%.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 =
> + " __fwprintf_chk: -1.0000000000\n"
> + " __swprintf_chk: -1.0000000000\n"
> + " __wprintf_chk: -1.0000000000\n"
> + " __vfwprintf_chk: -1.0000000000\n"
> + " __vswprintf_chk: -1.0000000000\n"
> + " __vwprintf_chk: -1.0000000000\n"
> + " __fwprintf_chk: -0x1.0000000000p+0\n"
> + " __swprintf_chk: -0x1.0000000000p+0\n"
> + " __wprintf_chk: -0x1.0000000000p+0\n"
> + " __vfwprintf_chk: -0x1.0000000000p+0\n"
> + " __vswprintf_chk: -0x1.0000000000p+0\n"
> + " __vwprintf_chk: -0x1.0000000000p+0\n";
> + TEST_COMPARE_STRING (expected, result.out.buffer);
> +
> + return 0;
> +}
> +
OK
> +#include <support/test-driver.c>
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-redir-ibm128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-redir-ibm128.c
> new file mode 100644
> index 0000000000..a12186a945
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-redir-ibm128.c
> @@ -0,0 +1,2 @@
> +#define _FORTIFY_SOURCE 2
Similar comment to the narrow printing version of the patch. Is this
needed here as well as the shared test code?
> +#include <sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-ldbl-compat.c>
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-redir-ieee128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-redir-ieee128.c
> new file mode 100644
> index 0000000000..a12186a945
> --- /dev/null
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-redir-ieee128.c
> @@ -0,0 +1,2 @@
> +#define _FORTIFY_SOURCE 2
Likewise.
> +#include <sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-ldbl-compat.c>
>
More information about the Libc-alpha
mailing list