From 309548bec3b89022bbc81a372ec3e9240211d799 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 10 Nov 2021 15:52:21 +0000 Subject: Support C2X printf %b, %B C2X adds a printf %b format (see , accepted for C2X), for outputting integers in binary. It also has recommended practice for a corresponding %B format (like %b, but %#B starts the output with 0B instead of 0b). Add support for these formats to glibc. One existing test uses %b as an example of an unknown format, to test how glibc printf handles unknown formats; change that to %v. Use of %b and %B as user-registered format specifiers continues to work (and we already have a test that covers that, tst-printfsz.c). Note that C2X also has scanf %b support, plus support for binary constants starting 0b in strtol (base 0 and 2) and scanf %i (strtol base 0 and scanf %i coming from a previous paper that added binary integer literals). I intend to implement those features in a separate patch or patches; as discussed in the thread starting at , they will be more complicated because they involve adding extra public symbols to ensure compatibility with existing code that might not expect 0b constants to be handled by strtol base 0 and 2 and scanf %i, whereas simply adding a new format specifier poses no such compatibility concerns. Note that the actual conversion from integer to string uses existing code in _itoa.c. That code has special cases for bases 8, 10 and 16, probably so that the compiler can optimize division by an integer constant in the code for those bases. If desired such special cases could easily be added for base 2 as well, but that would be an optimization, not actually needed for these printf formats to work. Tested for x86_64 and x86. Also tested with build-many-glibcs.py for aarch64-linux-gnu with GCC mainline to make sure that the test does indeed build with GCC 12 (where format checking warnings are enabled for most of the test). --- wcsmbs/Makefile | 3 ++- wcsmbs/tst-wprintf-binary.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 wcsmbs/tst-wprintf-binary.c (limited to 'wcsmbs') diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index f38eb5cfe1..3a3be9cd95 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -52,7 +52,8 @@ tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \ tst-c16c32-1 wcsatcliff tst-wcstol-locale tst-wcstod-nan-locale \ tst-wcstod-round test-char-types tst-fgetwc-after-eof \ tst-wcstod-nan-sign tst-c16-surrogate tst-c32-state \ - $(addprefix test-,$(strop-tests)) tst-mbstowcs + $(addprefix test-,$(strop-tests)) tst-mbstowcs \ + tst-wprintf-binary include ../Rules diff --git a/wcsmbs/tst-wprintf-binary.c b/wcsmbs/tst-wprintf-binary.c new file mode 100644 index 0000000000..c92a73d7f6 --- /dev/null +++ b/wcsmbs/tst-wprintf-binary.c @@ -0,0 +1,25 @@ +/* Test binary printf formats. Wide string version. + Copyright (C) 2021 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 + . */ + +#define SNPRINTF swprintf +#define TEST_COMPARE_STRING_MACRO TEST_COMPARE_STRING_WIDE +#define STRLEN wcslen +#define CHAR wchar_t +#define L_(C) L ## C + +#include "../stdio-common/tst-printf-binary-main.c" -- cgit 1.4.1