|
 |
d8307d |
commit c7e7cd266ed123b6dfb722f599934ca5dcfd3e93
|
|
|
d8307d |
Author: Stefan Liebler <stli@linux.ibm.com>
|
|
|
d8307d |
Date: Tue Dec 18 13:57:18 2018 +0100
|
|
|
d8307d |
|
|
|
d8307d |
S390: Refactor wcsnlen ifunc handling.
|
|
|
d8307d |
|
|
|
d8307d |
The ifunc handling for wcsnlen is adjusted in order to omit ifunc
|
|
|
d8307d |
if the minimum architecture level already supports newer CPUs by default.
|
|
|
d8307d |
Unfortunately the c ifunc variant can't be omitted at all as it is used
|
|
|
d8307d |
by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned.
|
|
|
d8307d |
Glibc internal calls will use the "newer" ifunc variant.
|
|
|
d8307d |
|
|
|
d8307d |
ChangeLog:
|
|
|
d8307d |
|
|
|
d8307d |
* sysdeps/s390/multiarch/Makefile
|
|
|
d8307d |
(sysdep_routines): Remove wcsnlen variants.
|
|
|
d8307d |
* sysdeps/s390/Makefile (sysdep_routines): Add wcsnlen variants.
|
|
|
d8307d |
* sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
d8307d |
(__libc_ifunc_impl_list): Refactor ifunc handling for wcsnlen.
|
|
|
d8307d |
* sysdeps/s390/multiarch/wcsnlen-c.c: Move to ...
|
|
|
d8307d |
* sysdeps/s390/wcsnlen-c.c: ... here and adjust ifunc handling.
|
|
|
d8307d |
* sysdeps/s390/multiarch/wcsnlen-vx.S: Move to ...
|
|
|
d8307d |
* sysdeps/s390/wcsnlen-vx.S: ... here and adjust ifunc handling.
|
|
|
d8307d |
* sysdeps/s390/multiarch/wcsnlen.c: Move to ...
|
|
|
d8307d |
* sysdeps/s390/wcsnlen.c: ... here and adjust ifunc handling.
|
|
|
d8307d |
* sysdeps/s390/ifunc-wcsnlen.h: New file.
|
|
|
d8307d |
|
|
|
d8307d |
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
|
|
|
d8307d |
index 65e89118936bb668..f5983815479a76da 100644
|
|
|
d8307d |
--- a/sysdeps/s390/Makefile
|
|
|
d8307d |
+++ b/sysdeps/s390/Makefile
|
|
|
d8307d |
@@ -60,5 +60,6 @@ sysdep_routines += bzero memset memset-z900 \
|
|
|
d8307d |
endif
|
|
|
d8307d |
|
|
|
d8307d |
ifeq ($(subdir),wcsmbs)
|
|
|
d8307d |
-sysdep_routines += wcslen wcslen-vx wcslen-c
|
|
|
d8307d |
+sysdep_routines += wcslen wcslen-vx wcslen-c \
|
|
|
d8307d |
+ wcsnlen wcsnlen-vx wcsnlen-c
|
|
|
d8307d |
endif
|
|
|
d8307d |
diff --git a/sysdeps/s390/ifunc-wcsnlen.h b/sysdeps/s390/ifunc-wcsnlen.h
|
|
|
d8307d |
new file mode 100644
|
|
|
d8307d |
index 0000000000000000..b5b21da2f17d9cd9
|
|
|
d8307d |
--- /dev/null
|
|
|
d8307d |
+++ b/sysdeps/s390/ifunc-wcsnlen.h
|
|
|
d8307d |
@@ -0,0 +1,53 @@
|
|
|
d8307d |
+/* wcsnlen variant information on S/390 version.
|
|
|
d8307d |
+ Copyright (C) 2018 Free Software Foundation, Inc.
|
|
|
d8307d |
+ This file is part of the GNU C Library.
|
|
|
d8307d |
+
|
|
|
d8307d |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
d8307d |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
d8307d |
+ License as published by the Free Software Foundation; either
|
|
|
d8307d |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
d8307d |
+
|
|
|
d8307d |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
d8307d |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
d8307d |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
d8307d |
+ Lesser General Public License for more details.
|
|
|
d8307d |
+
|
|
|
d8307d |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
d8307d |
+ License along with the GNU C Library; if not, see
|
|
|
d8307d |
+ <http://www.gnu.org/licenses/>. */
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if defined USE_MULTIARCH && IS_IN (libc) \
|
|
|
d8307d |
+ && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
|
|
|
d8307d |
+# define HAVE_WCSNLEN_IFUNC 1
|
|
|
d8307d |
+#else
|
|
|
d8307d |
+# define HAVE_WCSNLEN_IFUNC 0
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
+
|
|
|
d8307d |
+#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
d8307d |
+# define HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT HAVE_WCSNLEN_IFUNC
|
|
|
d8307d |
+#else
|
|
|
d8307d |
+# define HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT 0
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
|
|
|
d8307d |
+# define WCSNLEN_DEFAULT WCSNLEN_Z13
|
|
|
d8307d |
+/* The z13 ifunc variant is using the common code variant as fallback! */
|
|
|
d8307d |
+# define HAVE_WCSNLEN_C 1
|
|
|
d8307d |
+# define HAVE_WCSNLEN_Z13 1
|
|
|
d8307d |
+#else
|
|
|
d8307d |
+# define WCSNLEN_DEFAULT WCSNLEN_C
|
|
|
d8307d |
+# define HAVE_WCSNLEN_C 1
|
|
|
d8307d |
+# define HAVE_WCSNLEN_Z13 HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if HAVE_WCSNLEN_C
|
|
|
d8307d |
+# define WCSNLEN_C __wcsnlen_c
|
|
|
d8307d |
+#else
|
|
|
d8307d |
+# define WCSNLEN_C NULL
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if HAVE_WCSNLEN_Z13
|
|
|
d8307d |
+# define WCSNLEN_Z13 __wcsnlen_vx
|
|
|
d8307d |
+#else
|
|
|
d8307d |
+# define WCSNLEN_Z13 NULL
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
|
|
|
d8307d |
index 421d40d020b81560..ce2e7ce5f4eef0fa 100644
|
|
|
d8307d |
--- a/sysdeps/s390/multiarch/Makefile
|
|
|
d8307d |
+++ b/sysdeps/s390/multiarch/Makefile
|
|
|
d8307d |
@@ -1,6 +1,5 @@
|
|
|
d8307d |
ifeq ($(subdir),wcsmbs)
|
|
|
d8307d |
-sysdep_routines += wcsnlen wcsnlen-vx wcsnlen-c \
|
|
|
d8307d |
- wcscpy wcscpy-vx wcscpy-c \
|
|
|
d8307d |
+sysdep_routines += wcscpy wcscpy-vx wcscpy-c \
|
|
|
d8307d |
wcpcpy wcpcpy-vx wcpcpy-c \
|
|
|
d8307d |
wcsncpy wcsncpy-vx wcsncpy-c \
|
|
|
d8307d |
wcpncpy wcpncpy-vx wcpncpy-c \
|
|
|
d8307d |
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
d8307d |
index 7bf5f14c015b54fe..c199fd0e0b43e4b4 100644
|
|
|
d8307d |
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
d8307d |
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
d8307d |
@@ -47,6 +47,7 @@
|
|
|
d8307d |
#include <ifunc-memccpy.h>
|
|
|
d8307d |
#include <ifunc-memrchr.h>
|
|
|
d8307d |
#include <ifunc-wcslen.h>
|
|
|
d8307d |
+#include <ifunc-wcsnlen.h>
|
|
|
d8307d |
|
|
|
d8307d |
/* Maximum number of IFUNC implementations. */
|
|
|
d8307d |
#define MAX_IFUNC 3
|
|
|
d8307d |
@@ -437,6 +438,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
d8307d |
)
|
|
|
d8307d |
#endif /* HAVE_WCSLEN_IFUNC */
|
|
|
d8307d |
|
|
|
d8307d |
+#if HAVE_WCSNLEN_IFUNC
|
|
|
d8307d |
+ IFUNC_IMPL (i, name, wcsnlen,
|
|
|
d8307d |
+# if HAVE_WCSNLEN_Z13
|
|
|
d8307d |
+ IFUNC_IMPL_ADD (array, i, wcsnlen,
|
|
|
d8307d |
+ dl_hwcap & HWCAP_S390_VX, WCSNLEN_Z13)
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
+# if HAVE_WCSNLEN_C
|
|
|
d8307d |
+ IFUNC_IMPL_ADD (array, i, wcsnlen, 1, WCSNLEN_C)
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
+ )
|
|
|
d8307d |
+#endif /* HAVE_WCSNLEN_IFUNC */
|
|
|
d8307d |
+
|
|
|
d8307d |
#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
d8307d |
|
|
|
d8307d |
# define IFUNC_VX_IMPL(FUNC) \
|
|
|
d8307d |
@@ -445,8 +458,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
d8307d |
__##FUNC##_vx) \
|
|
|
d8307d |
IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c))
|
|
|
d8307d |
|
|
|
d8307d |
- IFUNC_VX_IMPL (wcsnlen);
|
|
|
d8307d |
-
|
|
|
d8307d |
IFUNC_VX_IMPL (wcscpy);
|
|
|
d8307d |
|
|
|
d8307d |
IFUNC_VX_IMPL (wcpcpy);
|
|
|
d8307d |
diff --git a/sysdeps/s390/multiarch/wcsnlen-c.c b/sysdeps/s390/wcsnlen-c.c
|
|
|
d8307d |
similarity index 85%
|
|
|
d8307d |
rename from sysdeps/s390/multiarch/wcsnlen-c.c
|
|
|
d8307d |
rename to sysdeps/s390/wcsnlen-c.c
|
|
|
d8307d |
index 8f43f5104f2eab3f..7495a6f97cfeca62 100644
|
|
|
d8307d |
--- a/sysdeps/s390/multiarch/wcsnlen-c.c
|
|
|
d8307d |
+++ b/sysdeps/s390/wcsnlen-c.c
|
|
|
d8307d |
@@ -16,10 +16,12 @@
|
|
|
d8307d |
License along with the GNU C Library; if not, see
|
|
|
d8307d |
<http://www.gnu.org/licenses/>. */
|
|
|
d8307d |
|
|
|
d8307d |
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
|
|
d8307d |
-# define WCSNLEN __wcsnlen_c
|
|
|
d8307d |
+#include <ifunc-wcsnlen.h>
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if HAVE_WCSNLEN_C
|
|
|
d8307d |
+# if HAVE_WCSNLEN_IFUNC || HAVE_WCSNLEN_Z13
|
|
|
d8307d |
+# define WCSNLEN WCSNLEN_C
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
|
|
|
d8307d |
-# include <wchar.h>
|
|
|
d8307d |
-extern __typeof (__wcsnlen) __wcsnlen_c;
|
|
|
d8307d |
# include <wcsmbs/wcsnlen.c>
|
|
|
d8307d |
#endif
|
|
|
d8307d |
diff --git a/sysdeps/s390/multiarch/wcsnlen-vx.S b/sysdeps/s390/wcsnlen-vx.S
|
|
|
d8307d |
similarity index 95%
|
|
|
d8307d |
rename from sysdeps/s390/multiarch/wcsnlen-vx.S
|
|
|
d8307d |
rename to sysdeps/s390/wcsnlen-vx.S
|
|
|
d8307d |
index 420f29fbc0d2965a..47f4ca82840538d9 100644
|
|
|
d8307d |
--- a/sysdeps/s390/multiarch/wcsnlen-vx.S
|
|
|
d8307d |
+++ b/sysdeps/s390/wcsnlen-vx.S
|
|
|
d8307d |
@@ -16,7 +16,8 @@
|
|
|
d8307d |
License along with the GNU C Library; if not, see
|
|
|
d8307d |
<http://www.gnu.org/licenses/>. */
|
|
|
d8307d |
|
|
|
d8307d |
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
|
|
d8307d |
+#include <ifunc-wcsnlen.h>
|
|
|
d8307d |
+#if HAVE_WCSNLEN_Z13
|
|
|
d8307d |
|
|
|
d8307d |
# include "sysdep.h"
|
|
|
d8307d |
# include "asm-syntax.h"
|
|
|
d8307d |
@@ -34,7 +35,7 @@
|
|
|
d8307d |
-r5=current_len and return_value
|
|
|
d8307d |
-v16=part of s
|
|
|
d8307d |
*/
|
|
|
d8307d |
-ENTRY(__wcsnlen_vx)
|
|
|
d8307d |
+ENTRY(WCSNLEN_Z13)
|
|
|
d8307d |
|
|
|
d8307d |
.machine "z13"
|
|
|
d8307d |
.machinemode "zarch_nohighgprs"
|
|
|
d8307d |
@@ -146,6 +147,11 @@ ENTRY(__wcsnlen_vx)
|
|
|
d8307d |
j .Llt64
|
|
|
d8307d |
|
|
|
d8307d |
.Lfallback:
|
|
|
d8307d |
- jg __wcsnlen_c
|
|
|
d8307d |
-END(__wcsnlen_vx)
|
|
|
d8307d |
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
|
|
|
d8307d |
+ jg WCSNLEN_C
|
|
|
d8307d |
+END(WCSNLEN_Z13)
|
|
|
d8307d |
+
|
|
|
d8307d |
+# if ! HAVE_WCSNLEN_IFUNC
|
|
|
d8307d |
+strong_alias (WCSNLEN_Z13, __wcsnlen)
|
|
|
d8307d |
+weak_alias (__wcsnlen, wcsnlen)
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
diff --git a/sysdeps/s390/multiarch/wcsnlen.c b/sysdeps/s390/wcsnlen.c
|
|
|
d8307d |
similarity index 70%
|
|
|
d8307d |
rename from sysdeps/s390/multiarch/wcsnlen.c
|
|
|
d8307d |
rename to sysdeps/s390/wcsnlen.c
|
|
|
d8307d |
index 5234074b1fce8ca1..b5c8ad9fde5a9752 100644
|
|
|
d8307d |
--- a/sysdeps/s390/multiarch/wcsnlen.c
|
|
|
d8307d |
+++ b/sysdeps/s390/wcsnlen.c
|
|
|
d8307d |
@@ -16,13 +16,24 @@
|
|
|
d8307d |
License along with the GNU C Library; if not, see
|
|
|
d8307d |
<http://www.gnu.org/licenses/>. */
|
|
|
d8307d |
|
|
|
d8307d |
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
|
|
d8307d |
+#include <ifunc-wcsnlen.h>
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if HAVE_WCSNLEN_IFUNC
|
|
|
d8307d |
# include <wchar.h>
|
|
|
d8307d |
# include <ifunc-resolve.h>
|
|
|
d8307d |
|
|
|
d8307d |
-s390_vx_libc_ifunc (__wcsnlen)
|
|
|
d8307d |
-weak_alias (__wcsnlen, wcsnlen)
|
|
|
d8307d |
+# if HAVE_WCSNLEN_C
|
|
|
d8307d |
+extern __typeof (__wcsnlen) WCSNLEN_C attribute_hidden;
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
|
|
|
d8307d |
-#else
|
|
|
d8307d |
-# include <wcsmbs/wcsnlen.c>
|
|
|
d8307d |
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
|
|
|
d8307d |
+# if HAVE_WCSNLEN_Z13
|
|
|
d8307d |
+extern __typeof (__wcsnlen) WCSNLEN_Z13 attribute_hidden;
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
+
|
|
|
d8307d |
+s390_libc_ifunc_expr (__wcsnlen, __wcsnlen,
|
|
|
d8307d |
+ (HAVE_WCSNLEN_Z13 && (hwcap & HWCAP_S390_VX))
|
|
|
d8307d |
+ ? WCSNLEN_Z13
|
|
|
d8307d |
+ : WCSNLEN_DEFAULT
|
|
|
d8307d |
+ )
|
|
|
d8307d |
+weak_alias (__wcsnlen, wcsnlen)
|
|
|
d8307d |
+#endif
|