about summary refs log tree commit diff
path: root/sysdeps/s390/multiarch
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/s390/multiarch')
-rw-r--r--sysdeps/s390/multiarch/Makefile3
-rw-r--r--sysdeps/s390/multiarch/ifunc-impl-list.c15
-rw-r--r--sysdeps/s390/multiarch/wcscmp-c.c32
-rw-r--r--sysdeps/s390/multiarch/wcscmp-vx.S131
-rw-r--r--sysdeps/s390/multiarch/wcscmp.c30
5 files changed, 14 insertions, 197 deletions
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
index 6cb75950c2..70162d0eaa 100644
--- a/sysdeps/s390/multiarch/Makefile
+++ b/sysdeps/s390/multiarch/Makefile
@@ -1,6 +1,5 @@
 ifeq ($(subdir),wcsmbs)
-sysdep_routines += wcscmp wcscmp-vx wcscmp-c \
-		   wcsncmp wcsncmp-vx wcsncmp-c \
+sysdep_routines += wcsncmp wcsncmp-vx wcsncmp-c \
 		   wcschr wcschr-vx wcschr-c \
 		   wcschrnul wcschrnul-vx wcschrnul-c \
 		   wcsrchr wcsrchr-vx wcsrchr-c \
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
index 7b7b1e7497..f461063c80 100644
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
@@ -54,6 +54,7 @@
 #include <ifunc-wcpncpy.h>
 #include <ifunc-wcscat.h>
 #include <ifunc-wcsncat.h>
+#include <ifunc-wcscmp.h>
 
 /* Maximum number of IFUNC implementations.  */
 #define MAX_IFUNC	3
@@ -528,6 +529,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 		)
 #endif /* HAVE_WCSNCAT_IFUNC  */
 
+#if HAVE_WCSCMP_IFUNC
+    IFUNC_IMPL (i, name, wcscmp,
+# if HAVE_WCSCMP_Z13
+		IFUNC_IMPL_ADD (array, i, wcscmp,
+				dl_hwcap & HWCAP_S390_VX, WCSCMP_Z13)
+# endif
+# if HAVE_WCSCMP_C
+		IFUNC_IMPL_ADD (array, i, wcscmp, 1, WCSCMP_C)
+# endif
+		)
+#endif /* HAVE_WCSCMP_IFUNC  */
+
 #ifdef HAVE_S390_VX_ASM_SUPPORT
 
 # define IFUNC_VX_IMPL(FUNC)						\
@@ -536,8 +549,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __##FUNC##_vx)				\
 	      IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c))
 
-  IFUNC_VX_IMPL (wcscmp);
-
   IFUNC_VX_IMPL (wcsncmp);
 
   IFUNC_VX_IMPL (wcschr);
diff --git a/sysdeps/s390/multiarch/wcscmp-c.c b/sysdeps/s390/multiarch/wcscmp-c.c
deleted file mode 100644
index ce0817ae97..0000000000
--- a/sysdeps/s390/multiarch/wcscmp-c.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Default wcscmp implementation for S/390.
-   Copyright (C) 2015-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/>.  */
-
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-# define WCSCMP  __wcscmp_c
-
-# include <wchar.h>
-extern __typeof (wcscmp) __wcscmp_c;
-# undef weak_alias
-# define weak_alias(name, alias)
-# ifdef SHARED
-#  undef libc_hidden_def
-#  define libc_hidden_def(name)				\
-  __hidden_ver1 (__wcscmp_c, __GI___wcscmp, __wcscmp_c);
-# endif /* SHARED */
-# include <wcsmbs/wcscmp.c>
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
diff --git a/sysdeps/s390/multiarch/wcscmp-vx.S b/sysdeps/s390/multiarch/wcscmp-vx.S
deleted file mode 100644
index 14267dbfc7..0000000000
--- a/sysdeps/s390/multiarch/wcscmp-vx.S
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Vector optimized 32/64 bit S/390 version of wcscmp.
-   Copyright (C) 2015-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/>.  */
-
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-
-# include "sysdep.h"
-# include "asm-syntax.h"
-
-	.text
-
-/* int wcscmp (const wchar_t *s1, const wchar_t *s2)
-   Compare two strings
-
-   Register usage:
-   -r1=loaded byte count s1
-   -r2=s1
-   -r3=s2
-   -r4=loaded byte coutn s2, tmp
-   -r5=current_len
-   -v16=part of s1
-   -v17=part of s2
-   -v18=index of unequal
-*/
-ENTRY(__wcscmp_vx)
-	.machine "z13"
-	.machinemode "zarch_nohighgprs"
-
-	lghi	%r5,0		/* current_len = 0.  */
-
-.Lloop:
-	vlbb	%v16,0(%r5,%r2),6 /* Load s1 to block boundary.  */
-	vlbb	%v17,0(%r5,%r3),6 /* Load s2 to block boundary.  */
-	lcbb	%r1,0(%r5,%r2),6 /* Get loaded byte count of s1.  */
-	jo	.Llt16_1	/* Jump away if vr is not fully loaded.  */
-	lcbb	%r4,0(%r5,%r3),6
-	jo	.Llt16_2	/* Jump away if vr is not fully loaded.  */
-	/* Both vrs are fully loaded.  */
-	aghi	%r5,16
-	vfenezfs %v18,%v16,%v17	/* Compare not equal with zero search.  */
-	jno	.Lfound
-
-	vlbb	%v16,0(%r5,%r2),6
-	vlbb	%v17,0(%r5,%r3),6
-	lcbb	%r1,0(%r5,%r2),6
-	jo	.Llt16_1
-	lcbb	%r4,0(%r5,%r3),6
-	jo	.Llt16_2
-	aghi	%r5,16
-	vfenezfs %v18,%v16,%v17
-	jno	.Lfound
-
-	vlbb	%v16,0(%r5,%r2),6
-	vlbb	%v17,0(%r5,%r3),6
-	lcbb	%r1,0(%r5,%r2),6
-	jo	.Llt16_1
-	lcbb	%r4,0(%r5,%r3),6
-	jo	.Llt16_2
-	aghi	%r5,16
-	vfenezfs %v18,%v16,%v17
-	jno	.Lfound
-
-	vlbb	%v16,0(%r5,%r2),6
-	vlbb	%v17,0(%r5,%r3),6
-	lcbb	%r1,0(%r5,%r2),6
-	jo	.Llt16_1
-	lcbb	%r4,0(%r5,%r3),6
-	jo	.Llt16_2
-	aghi	%r5,16
-	vfenezfs %v18,%v16,%v17
-	jno	.Lfound
-	j	.Lloop
-
-.Lcmp_one_char:
-	/* At least one of both strings is not 4-byte aligned
-	   and there is no full character before next block-boundary.
-	   Compare one character to get over the boundary and
-	   proceed with normal loop!  */
-	vlef	%v16,0(%r5,%r2),0 /* Load one character.  */
-	vlef	%v17,0(%r5,%r3),0
-	lghi	%r1,4		/* Loaded byte count is 4.  */
-	j	.Llt_cmp	/* Proceed with comparision.  */
-
-.Llt16_1:
-	lcbb	%r4,0(%r5,%r3),6 /* Get loaded byte count of s2.  */
-.Llt16_2:
-	clr	%r1,%r4
-	locrh	%r1,%r4		/* Get minimum of bytes loaded in s1/2.  */
-	nill	%r1,65532	/* Align bytes loaded to full characters.  */
-	jz	.Lcmp_one_char	/* Jump away if no full char is available.  */
-.Llt_cmp:
-	algfr	%r5,%r1		/* Add smallest loaded bytes to current_len.  */
-	vfenezfs %v18,%v16,%v17	/* Compare not equal with zero search.  */
-	vlgvb	%r4,%v18,7	/* Get not equal index or 16 if all equal.  */
-	clrjl	%r4,%r1,.Lfound /* Jump away if miscompare is within loaded
-				    bytes.  */
-	j	.Lloop
-
-.Lfound:
-	/* vfenezf found an unequal element or zero.
-	   This instruction compares unsigned words, but wchar_t is signed.
-	   Thus we have to compare the found element again.  */
-	vlgvb	%r4,%v18,7	/* Extract not equal byte-index,  */
-	srl	%r4,2		/* Convert it to character-index.  */
-	vlgvf	%r3,%v16,0(%r4)	/* Load character-values.  */
-	vlgvf	%r4,%v17,0(%r4)
-	cr	%r3,%r4
-	je	.Lend_equal
-	lghi	%r2,1
-	lghi	%r1,-1
-	locgrl	%r2,%r1
-	br	%r14
-.Lend_equal:
-	lghi	%r2,0
-	br	%r14
-END(__wcscmp_vx)
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
diff --git a/sysdeps/s390/multiarch/wcscmp.c b/sysdeps/s390/multiarch/wcscmp.c
deleted file mode 100644
index 5ee0fd4d88..0000000000
--- a/sysdeps/s390/multiarch/wcscmp.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Multiple versions of wcscmp.
-   Copyright (C) 2015-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/>.  */
-
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-# define __wcscmp __redirect___wcscmp
-# include <wchar.h>
-# undef __wcscmp
-# include <ifunc-resolve.h>
-
-s390_vx_libc_ifunc_redirected (__redirect___wcscmp, __wcscmp)
-weak_alias (__wcscmp, wcscmp)
-
-#else
-# include <wcsmbs/wcscmp.c>
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-22 12:24:38 +0000