From 50d105a26a648acd7fe09cc74df80b436c3a2d8c Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 15 2020 07:38:44 +0000 Subject: Apply patch glibc-rh1659438-37.patch patch_name: glibc-rh1659438-37.patch present_in_specfile: true location_in_specfile: 130 --- diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index 65e8911..f598381 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -60,5 +60,6 @@ sysdep_routines += bzero memset memset-z900 \ endif ifeq ($(subdir),wcsmbs) -sysdep_routines += wcslen wcslen-vx wcslen-c +sysdep_routines += wcslen wcslen-vx wcslen-c \ + wcsnlen wcsnlen-vx wcsnlen-c endif diff --git a/sysdeps/s390/ifunc-wcsnlen.h b/sysdeps/s390/ifunc-wcsnlen.h new file mode 100644 index 0000000..b5b21da --- /dev/null +++ b/sysdeps/s390/ifunc-wcsnlen.h @@ -0,0 +1,53 @@ +/* wcsnlen variant information on S/390 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 + . */ + +#if defined USE_MULTIARCH && IS_IN (libc) \ + && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define HAVE_WCSNLEN_IFUNC 1 +#else +# define HAVE_WCSNLEN_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT HAVE_WCSNLEN_IFUNC +#else +# define HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define WCSNLEN_DEFAULT WCSNLEN_Z13 +/* The z13 ifunc variant is using the common code variant as fallback! */ +# define HAVE_WCSNLEN_C 1 +# define HAVE_WCSNLEN_Z13 1 +#else +# define WCSNLEN_DEFAULT WCSNLEN_C +# define HAVE_WCSNLEN_C 1 +# define HAVE_WCSNLEN_Z13 HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_WCSNLEN_C +# define WCSNLEN_C __wcsnlen_c +#else +# define WCSNLEN_C NULL +#endif + +#if HAVE_WCSNLEN_Z13 +# define WCSNLEN_Z13 __wcsnlen_vx +#else +# define WCSNLEN_Z13 NULL +#endif diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index 421d40d..ce2e7ce 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),wcsmbs) -sysdep_routines += wcsnlen wcsnlen-vx wcsnlen-c \ - wcscpy wcscpy-vx wcscpy-c \ +sysdep_routines += wcscpy wcscpy-vx wcscpy-c \ wcpcpy wcpcpy-vx wcpcpy-c \ wcsncpy wcsncpy-vx wcsncpy-c \ wcpncpy wcpncpy-vx wcpncpy-c \ diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index 7bf5f14..c199fd0 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -47,6 +47,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -437,6 +438,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSLEN_IFUNC */ +#if HAVE_WCSNLEN_IFUNC + IFUNC_IMPL (i, name, wcsnlen, +# if HAVE_WCSNLEN_Z13 + IFUNC_IMPL_ADD (array, i, wcsnlen, + dl_hwcap & HWCAP_S390_VX, WCSNLEN_Z13) +# endif +# if HAVE_WCSNLEN_C + IFUNC_IMPL_ADD (array, i, wcsnlen, 1, WCSNLEN_C) +# endif + ) +#endif /* HAVE_WCSNLEN_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -445,8 +458,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 (wcsnlen); - IFUNC_VX_IMPL (wcscpy); IFUNC_VX_IMPL (wcpcpy); diff --git a/sysdeps/s390/multiarch/wcsnlen-c.c b/sysdeps/s390/multiarch/wcsnlen-c.c deleted file mode 100644 index 8f43f51..0000000 --- a/sysdeps/s390/multiarch/wcsnlen-c.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Default wcsnlen 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 - . */ - -#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) -# define WCSNLEN __wcsnlen_c - -# include -extern __typeof (__wcsnlen) __wcsnlen_c; -# include -#endif diff --git a/sysdeps/s390/multiarch/wcsnlen-vx.S b/sysdeps/s390/multiarch/wcsnlen-vx.S deleted file mode 100644 index 420f29f..0000000 --- a/sysdeps/s390/multiarch/wcsnlen-vx.S +++ /dev/null @@ -1,151 +0,0 @@ -/* Vector optimized 32/64 bit S/390 version of wcsnlen. - 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 - . */ - -#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) - -# include "sysdep.h" -# include "asm-syntax.h" - - .text - -/* size_t wcsnlen (const wchar_t *s, size_t maxlen) - Returns the number of characters in s or at most maxlen. - - Register usage: - -r1=tmp - -r2=address of string - -r3=maxlen (number of characters to be read) - -r4=tmp - -r5=current_len and return_value - -v16=part of s -*/ -ENTRY(__wcsnlen_vx) - - .machine "z13" - .machinemode "zarch_nohighgprs" - -# if !defined __s390x__ - llgfr %r3,%r3 -# endif /* !defined __s390x__ */ - - clgfi %r3,0 /* if maxlen == 0, return 0. */ - locgre %r2,%r3 - ber %r14 - - vlbb %v16,0(%r2),6 /* Load s until next 4k-byte boundary. */ - lcbb %r1,0(%r2),6 /* Get bytes to 4k-byte boundary or 16. */ - llgfr %r1,%r1 /* Convert 32bit to 64bit. */ - - tmll %r2,3 /* Test if s is 4-byte aligned? */ - jne .Lfallback /* And use common-code variant if not. */ - - /* Check range of maxlen and convert to byte-count. */ -# ifdef __s390x__ - tmhh %r3,49152 /* Test bit 0 or 1 of maxlen. */ - lghi %r4,-4 /* Max byte-count is 18446744073709551612. */ -# else - tmlh %r3,49152 /* Test bit 0 or 1 of maxlen. */ - llilf %r4,4294967292 /* Max byte-count is 4294967292. */ -# endif /* !__s390x__ */ - sllg %r3,%r3,2 /* Convert character-count to byte-count. */ - locgrne %r3,%r4 /* Use max byte-count, if bit 0/1 was one. */ - - vfenezf %v16,%v16,%v16 /* Find element not equal with zero search. */ - clgr %r1,%r3 - locgrh %r1,%r3 /* loaded_byte_count - = min (loaded_byte_count, maxlen) */ - - vlgvb %r5,%v16,7 /* Load zero index or 16 if not found. */ - clrjl %r5,%r1,.Lend /* Found zero within loaded bytes -> return. */ - - clgr %r1,%r3 /* If loaded_byte_count == maxlen -> end. */ - locgre %r5,%r3 - je .Lend - - /* Align s to 16 byte. */ - risbgn %r4,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ - lghi %r5,16 /* current_len = 16. */ - slr %r5,%r4 /* Compute bytes to 16bytes boundary. */ - - lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */ - aghi %r1,64 - clgrjl %r1,%r3,.Lloop64 - - /* Find zero in max 64byte with aligned s. */ -.Llt64: - vl %v16,0(%r5,%r2) /* Load s. */ - vfenezfs %v16,%v16,%v16 /* Find element not equal with zero search. */ - je .Lfound /* Jump away if zero was found. */ - aghi %r5,16 - clgrjhe %r5,%r3,.Lfound /* If current_len >= maxlen -> end. */ - vl %v16,0(%r5,%r2) - vfenezfs %v16,%v16,%v16 - je .Lfound - aghi %r5,16 - clgrjhe %r5,%r3,.Lfound - vl %v16,0(%r5,%r2) - vfenezfs %v16,%v16,%v16 - je .Lfound - aghi %r5,16 - clgrjhe %r5,%r3,.Lfound - vl %v16,0(%r5,%r2) - vfenezfs %v16,%v16,%v16 - j .Lfound - -.Lfound48: - aghi %r5,16 -.Lfound32: - aghi %r5,16 -.Lfound16: - aghi %r5,16 -.Lfound: - vlgvb %r4,%v16,7 /* Load byte index of zero or 16 if no zero. */ - algr %r5,%r4 - - clgr %r5,%r3 - locgrh %r5,%r3 /* Return min (current_len, maxlen). */ -.Lend: - srlg %r2,%r5,2 /* Convert byte-count to character-count. */ - br %r14 - - /* Find zero in 16byte aligned loop. */ -.Lloop64: - vl %v16,0(%r5,%r2) /* Load s. */ - vfenezfs %v16,%v16,%v16 /* Find element not equal with zero search. */ - je .Lfound /* Jump away if zero was found. */ - vl %v16,16(%r5,%r2) - vfenezfs %v16,%v16,%v16 - je .Lfound16 - vl %v16,32(%r5,%r2) - vfenezfs %v16,%v16,%v16 - je .Lfound32 - vl %v16,48(%r5,%r2) - vfenezfs %v16,%v16,%v16 - je .Lfound48 - - aghi %r5,64 - lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */ - aghi %r1,64 - clgrjl %r1,%r3,.Lloop64 - - j .Llt64 - -.Lfallback: - jg __wcsnlen_c -END(__wcsnlen_vx) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/wcsnlen.c b/sysdeps/s390/multiarch/wcsnlen.c deleted file mode 100644 index 5234074..0000000 --- a/sysdeps/s390/multiarch/wcsnlen.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Multiple versions of wcsnlen. - 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 - . */ - -#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) -# include -# include - -s390_vx_libc_ifunc (__wcsnlen) -weak_alias (__wcsnlen, wcsnlen) - -#else -# include -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ diff --git a/sysdeps/s390/wcsnlen-c.c b/sysdeps/s390/wcsnlen-c.c new file mode 100644 index 0000000..7495a6f --- /dev/null +++ b/sysdeps/s390/wcsnlen-c.c @@ -0,0 +1,27 @@ +/* Default wcsnlen 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 + . */ + +#include + +#if HAVE_WCSNLEN_C +# if HAVE_WCSNLEN_IFUNC || HAVE_WCSNLEN_Z13 +# define WCSNLEN WCSNLEN_C +# endif + +# include +#endif diff --git a/sysdeps/s390/wcsnlen-vx.S b/sysdeps/s390/wcsnlen-vx.S new file mode 100644 index 0000000..47f4ca8 --- /dev/null +++ b/sysdeps/s390/wcsnlen-vx.S @@ -0,0 +1,157 @@ +/* Vector optimized 32/64 bit S/390 version of wcsnlen. + 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 + . */ + +#include +#if HAVE_WCSNLEN_Z13 + +# include "sysdep.h" +# include "asm-syntax.h" + + .text + +/* size_t wcsnlen (const wchar_t *s, size_t maxlen) + Returns the number of characters in s or at most maxlen. + + Register usage: + -r1=tmp + -r2=address of string + -r3=maxlen (number of characters to be read) + -r4=tmp + -r5=current_len and return_value + -v16=part of s +*/ +ENTRY(WCSNLEN_Z13) + + .machine "z13" + .machinemode "zarch_nohighgprs" + +# if !defined __s390x__ + llgfr %r3,%r3 +# endif /* !defined __s390x__ */ + + clgfi %r3,0 /* if maxlen == 0, return 0. */ + locgre %r2,%r3 + ber %r14 + + vlbb %v16,0(%r2),6 /* Load s until next 4k-byte boundary. */ + lcbb %r1,0(%r2),6 /* Get bytes to 4k-byte boundary or 16. */ + llgfr %r1,%r1 /* Convert 32bit to 64bit. */ + + tmll %r2,3 /* Test if s is 4-byte aligned? */ + jne .Lfallback /* And use common-code variant if not. */ + + /* Check range of maxlen and convert to byte-count. */ +# ifdef __s390x__ + tmhh %r3,49152 /* Test bit 0 or 1 of maxlen. */ + lghi %r4,-4 /* Max byte-count is 18446744073709551612. */ +# else + tmlh %r3,49152 /* Test bit 0 or 1 of maxlen. */ + llilf %r4,4294967292 /* Max byte-count is 4294967292. */ +# endif /* !__s390x__ */ + sllg %r3,%r3,2 /* Convert character-count to byte-count. */ + locgrne %r3,%r4 /* Use max byte-count, if bit 0/1 was one. */ + + vfenezf %v16,%v16,%v16 /* Find element not equal with zero search. */ + clgr %r1,%r3 + locgrh %r1,%r3 /* loaded_byte_count + = min (loaded_byte_count, maxlen) */ + + vlgvb %r5,%v16,7 /* Load zero index or 16 if not found. */ + clrjl %r5,%r1,.Lend /* Found zero within loaded bytes -> return. */ + + clgr %r1,%r3 /* If loaded_byte_count == maxlen -> end. */ + locgre %r5,%r3 + je .Lend + + /* Align s to 16 byte. */ + risbgn %r4,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ + lghi %r5,16 /* current_len = 16. */ + slr %r5,%r4 /* Compute bytes to 16bytes boundary. */ + + lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */ + aghi %r1,64 + clgrjl %r1,%r3,.Lloop64 + + /* Find zero in max 64byte with aligned s. */ +.Llt64: + vl %v16,0(%r5,%r2) /* Load s. */ + vfenezfs %v16,%v16,%v16 /* Find element not equal with zero search. */ + je .Lfound /* Jump away if zero was found. */ + aghi %r5,16 + clgrjhe %r5,%r3,.Lfound /* If current_len >= maxlen -> end. */ + vl %v16,0(%r5,%r2) + vfenezfs %v16,%v16,%v16 + je .Lfound + aghi %r5,16 + clgrjhe %r5,%r3,.Lfound + vl %v16,0(%r5,%r2) + vfenezfs %v16,%v16,%v16 + je .Lfound + aghi %r5,16 + clgrjhe %r5,%r3,.Lfound + vl %v16,0(%r5,%r2) + vfenezfs %v16,%v16,%v16 + j .Lfound + +.Lfound48: + aghi %r5,16 +.Lfound32: + aghi %r5,16 +.Lfound16: + aghi %r5,16 +.Lfound: + vlgvb %r4,%v16,7 /* Load byte index of zero or 16 if no zero. */ + algr %r5,%r4 + + clgr %r5,%r3 + locgrh %r5,%r3 /* Return min (current_len, maxlen). */ +.Lend: + srlg %r2,%r5,2 /* Convert byte-count to character-count. */ + br %r14 + + /* Find zero in 16byte aligned loop. */ +.Lloop64: + vl %v16,0(%r5,%r2) /* Load s. */ + vfenezfs %v16,%v16,%v16 /* Find element not equal with zero search. */ + je .Lfound /* Jump away if zero was found. */ + vl %v16,16(%r5,%r2) + vfenezfs %v16,%v16,%v16 + je .Lfound16 + vl %v16,32(%r5,%r2) + vfenezfs %v16,%v16,%v16 + je .Lfound32 + vl %v16,48(%r5,%r2) + vfenezfs %v16,%v16,%v16 + je .Lfound48 + + aghi %r5,64 + lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */ + aghi %r1,64 + clgrjl %r1,%r3,.Lloop64 + + j .Llt64 + +.Lfallback: + jg WCSNLEN_C +END(WCSNLEN_Z13) + +# if ! HAVE_WCSNLEN_IFUNC +strong_alias (WCSNLEN_Z13, __wcsnlen) +weak_alias (__wcsnlen, wcsnlen) +# endif +#endif diff --git a/sysdeps/s390/wcsnlen.c b/sysdeps/s390/wcsnlen.c new file mode 100644 index 0000000..b5c8ad9 --- /dev/null +++ b/sysdeps/s390/wcsnlen.c @@ -0,0 +1,39 @@ +/* Multiple versions of wcsnlen. + 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 + . */ + +#include + +#if HAVE_WCSNLEN_IFUNC +# include +# include + +# if HAVE_WCSNLEN_C +extern __typeof (__wcsnlen) WCSNLEN_C attribute_hidden; +# endif + +# if HAVE_WCSNLEN_Z13 +extern __typeof (__wcsnlen) WCSNLEN_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__wcsnlen, __wcsnlen, + (HAVE_WCSNLEN_Z13 && (hwcap & HWCAP_S390_VX)) + ? WCSNLEN_Z13 + : WCSNLEN_DEFAULT + ) +weak_alias (__wcsnlen, wcsnlen) +#endif