diff options
Diffstat (limited to 'sysdeps/s390/multiarch')
| -rw-r--r-- | sysdeps/s390/multiarch/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/s390/multiarch/ifunc-impl-list.c | 14 | ||||
| -rw-r--r-- | sysdeps/s390/multiarch/stpcpy-c.c | 35 | ||||
| -rw-r--r-- | sysdeps/s390/multiarch/stpcpy-vx.S | 104 | ||||
| -rw-r--r-- | sysdeps/s390/multiarch/stpcpy.c | 35 |
5 files changed, 14 insertions, 177 deletions
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index 50f7f0b78d..9517417dcb 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),string) -sysdep_routines += stpcpy stpcpy-vx stpcpy-c \ - strncpy strncpy-vx \ +sysdep_routines += strncpy strncpy-vx \ stpncpy stpncpy-vx stpncpy-c \ strcat strcat-vx strcat-c \ strncat strncat-vx strncat-c \ diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index 1784372db9..678ed13833 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -29,6 +29,7 @@ #include <ifunc-strlen.h> #include <ifunc-strnlen.h> #include <ifunc-strcpy.h> +#include <ifunc-stpcpy.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -203,6 +204,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_STRCPY_IFUNC */ +#if HAVE_STPCPY_IFUNC + IFUNC_IMPL (i, name, stpcpy, +# if HAVE_STPCPY_Z13 + IFUNC_IMPL_ADD (array, i, stpcpy, + dl_hwcap & HWCAP_S390_VX, STPCPY_Z13) +# endif +# if HAVE_STPCPY_C + IFUNC_IMPL_ADD (array, i, stpcpy, 1, STPCPY_C) +# endif + ) +#endif /* HAVE_STPCPY_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -217,7 +230,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (wcscpy); - IFUNC_VX_IMPL (stpcpy); IFUNC_VX_IMPL (wcpcpy); IFUNC_VX_IMPL (strncpy); diff --git a/sysdeps/s390/multiarch/stpcpy-c.c b/sysdeps/s390/multiarch/stpcpy-c.c deleted file mode 100644 index 4a1c3e5832..0000000000 --- a/sysdeps/s390/multiarch/stpcpy-c.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Default stpcpy 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 STPCPY __stpcpy_c -# undef weak_alias -# define weak_alias(a, b) -# ifdef SHARED -# undef libc_hidden_def -# define libc_hidden_def(name) \ - __hidden_ver1 (__stpcpy_c, __GI___stpcpy, __stpcpy_c); -# undef libc_hidden_builtin_def -# define libc_hidden_builtin_def(name) \ - strong_alias (__stpcpy_c, __stpcpy_c_1); \ - __hidden_ver1 (__stpcpy_c_1, __GI_stpcpy, __stpcpy_c_1); -# endif /* SHARED */ - - -# include <string/stpcpy.c> -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/stpcpy-vx.S b/sysdeps/s390/multiarch/stpcpy-vx.S deleted file mode 100644 index 6c17def0fc..0000000000 --- a/sysdeps/s390/multiarch/stpcpy-vx.S +++ /dev/null @@ -1,104 +0,0 @@ -/* Vector optimized 32/64 bit S/390 version of stpcpy. - 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 - -/* char * stpcpy (const char *dest, const char *src) - Copy string src to dest returning a pointer to its end. - - Register usage: - -r1=tmp - -r2=dest and return value - -r3=src - -r4=tmp - -r5=current_len - -v16=part of src - -v17=index of zero - -v18=part of src -*/ -ENTRY(__stpcpy_vx) - .machine "z13" - .machinemode "zarch_nohighgprs" - - vlbb %v16,0(%r3),6 /* Load s until next 4k-byte boundary. */ - lcbb %r1,0(%r3),6 /* Get bytes to 4k-byte boundary or 16. */ - - vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */ - vlgvb %r5,%v17,7 /* Load zero index or 16 if not found. */ - clrjl %r5,%r1,.Lfound_align /* If found zero within loaded bytes, - copy bytes before and return. */ - - /* Align s to 16 byte. */ - risbgn %r4,%r3,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ - lghi %r5,15 /* current_len = 15. */ - slr %r5,%r4 /* Compute highest index to 16byte boundary. */ - - vstl %v16,%r5,0(%r2) /* Copy loaded characters - no zero. */ - ahi %r5,1 /* Start loop at next character. */ - - /* Find zero in 16byte aligned loop. */ -.Lloop: - vl %v16,0(%r5,%r3) /* Load s. */ - vfenezbs %v17,%v16,%v16 /* Find element not equal with zero search. */ - je .Lfound_v16_0 /* Jump away if zero was found. */ - vl %v18,16(%r5,%r3) /* Load next part of s. */ - vst %v16,0(%r5,%r2) /* Store previous part without zero to dst. */ - vfenezbs %v17,%v18,%v18 - je .Lfound_v18_16 - vl %v16,32(%r5,%r3) - vst %v18,16(%r5,%r2) - vfenezbs %v17,%v16,%v16 - je .Lfound_v16_32 - vl %v18,48(%r5,%r3) - vst %v16,32(%r5,%r2) - vfenezbs %v17,%v18,%v18 - je .Lfound_v18_48 - vst %v18,48(%r5,%r2) - - aghi %r5,64 - j .Lloop /* No zero found -> loop. */ - -.Lfound_v16_32: - aghi %r5,32 -.Lfound_v16_0: - la %r3,0(%r5,%r2) - vlgvb %r1,%v17,7 /* Load byte index of zero. */ - vstl %v16,%r1,0(%r3) /* Copy characters including zero. */ - la %r2,0(%r1,%r3) /* Return pointer to zero. */ - br %r14 - -.Lfound_v18_48: - aghi %r5,32 -.Lfound_v18_16: - la %r3,16(%r5,%r2) - vlgvb %r1,%v17,7 /* Load byte index of zero. */ - vstl %v18,%r1,0(%r3) /* Copy characters including zero. */ - la %r2,0(%r1,%r3) /* Return pointer to zero. */ - br %r14 - -.Lfound_align: - vstl %v16,%r5,0(%r2) /* Copy characters including zero. */ - la %r2,0(%r5,%r2) /* Return pointer to zero. */ - br %r14 -END(__stpcpy_vx) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/stpcpy.c b/sysdeps/s390/multiarch/stpcpy.c deleted file mode 100644 index 654f9dfbef..0000000000 --- a/sysdeps/s390/multiarch/stpcpy.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Multiple versions of stpcpy. - 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 stpcpy __redirect_stpcpy -# define __stpcpy __redirect___stpcpy -/* Omit the stpcpy inline definitions because it would redefine stpcpy. */ -# define __NO_STRING_INLINES -# define NO_MEMPCPY_STPCPY_REDIRECT -# include <string.h> -# undef stpcpy -# undef __stpcpy -# include <ifunc-resolve.h> - -s390_vx_libc_ifunc_redirected (__redirect___stpcpy, __stpcpy); -weak_alias (__stpcpy, stpcpy) - -#else -# include <string/stpcpy.c> -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ |