[2/2] ldbl-128ibm-compat: Add printf_size

Message ID 20180629041819.19721-3-gabriel@inconstante.eti.br
State New
Headers show
Series
  • Fix for printf_size and IEEE binary128 implementation
Related show

Commit Message

Gabriel F. T. Gomes June 29, 2018, 4:18 a.m.
Since the addition of the _Float128 API, strfromf128 and printf_size use
__printf_fp to print _Float128 values.  This is achieved by setting the
'is_binary128' member of the 'printf_info' structure to 1.  Now that the
format of long double on powerpc64le is getting a third option, this
mechanism is reused for long double values that have binary128 format
(i.e.: when -mabi=ieeelongdouble).

This patch adds __printf_sizeieee128 as an exported symbol, but doesn't
provide redirections from printf_size, yet.  All redirections will be
installed in a future commit, once all other functions that print or
read long double values with binary128 format are ready.

Tested for powerpc64le.

	* sysdeps/ieee754/ldbl-128ibm-compat/Makefile:
	[subdir == stdio-common] (routines): Add ieee128-printf_size.
	[subdir == stdio-common] (tests-internal): Add
	test-printf-size-ieee128, and test-printf-size-ibm128.
	[subdir == stdio-common] (CFLAGS-test-printf-size-ieee128.c)
	(CFLAGS-test-printf-size-ibm128.c): New variables.
	[subdir == stdio-common] (tests-special): Add
	$(objpfx)test-printf-size-ieee128.out and
	$(objpfx)test-printf-size-ibm128.out.
	[subdir == stdio-common] ($(objpfx)test-printf-size-ieee128.out)
	($(objpfx)test-printf-size-ibm128.out): New build and run rules.
	* sysdeps/ieee754/ldbl-128ibm-compat/Versions (libc): Add
	__printf_sizeieee128.
	* sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_size.c:
	New file.
	* sysdeps/ieee754/ldbl-128ibm-compat/test-printf-size-ibm128.c:
	Likewise.
	* sysdeps/ieee754/ldbl-128ibm-compat/test-printf-size-ieee128.c:
	Likewise.
---
 sysdeps/ieee754/ldbl-128ibm-compat/Makefile        | 22 +++++++++++++++
 sysdeps/ieee754/ldbl-128ibm-compat/Versions        |  2 ++
 .../ldbl-128ibm-compat/ieee128-printf_size.c       | 32 ++++++++++++++++++++++
 .../ldbl-128ibm-compat/test-printf-size-ibm128.c   |  1 +
 .../ldbl-128ibm-compat/test-printf-size-ieee128.c  |  1 +
 5 files changed, 58 insertions(+)
 create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/Makefile
 create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_size.c
 create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-printf-size-ibm128.c
 create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-printf-size-ieee128.c

Patch

diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
new file mode 100644
index 0000000000..bead846ea4
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
@@ -0,0 +1,22 @@ 
+ifeq ($(subdir),stdio-common)
+routines += ieee128-printf_size
+
+tests-internal += test-printf-size-ieee128 test-printf-size-ibm128
+CFLAGS-test-printf-size-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
+CFLAGS-test-printf-size-ibm128.c += -mabi=ibmlongdouble -Wno-psabi
+
+ifeq ($(run-built-tests),yes)
+tests-special += $(objpfx)test-printf-size-ieee128.out
+tests-special += $(objpfx)test-printf-size-ibm128.out
+endif
+
+$(objpfx)test-printf-size-ieee128.out: \
+  tst-isbinary128.sh $(objpfx)test-printf-size-ieee128
+	$(SHELL) $^ '$(test-program-prefix)' $@; \
+	$(evaluate-test)
+
+$(objpfx)test-printf-size-ibm128.out: \
+  tst-isbinary128.sh $(objpfx)test-printf-size-ibm128
+	$(SHELL) $^ '$(test-program-prefix)' $@; \
+	$(evaluate-test)
+endif
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Versions b/sysdeps/ieee754/ldbl-128ibm-compat/Versions
index f4047f06a6..4aa34dbe59 100644
--- a/sysdeps/ieee754/ldbl-128ibm-compat/Versions
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/Versions
@@ -118,4 +118,6 @@  libc {
     __strtoieee128_l;
     __wcstoieee128;
     __wcstoieee128_l;
+
+    __printf_sizeieee128;
   }
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_size.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_size.c
new file mode 100644
index 0000000000..d0ef0593ac
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_size.c
@@ -0,0 +1,32 @@ 
+/* Wrapper for printf_size.  IEEE128 version.
+   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/>.  */
+
+#include <printf.h>
+
+extern __typeof (printf_size) __printf_size;
+
+int
+___ieee128_printf_size (FILE *fp, const struct printf_info *info,
+			const void *const *args)
+{
+  struct printf_info info_ieee128 = *info;
+
+  info_ieee128.is_binary128 = 1;
+  return __printf_size (fp, &info_ieee128, args);
+}
+strong_alias (___ieee128_printf_size, __printf_sizeieee128)
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-size-ibm128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-size-ibm128.c
new file mode 100644
index 0000000000..77f2f0d388
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-size-ibm128.c
@@ -0,0 +1 @@ 
+#include <tst-isbinary128.c>
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-size-ieee128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-size-ieee128.c
new file mode 100644
index 0000000000..77f2f0d388
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-size-ieee128.c
@@ -0,0 +1 @@ 
+#include <tst-isbinary128.c>