From 143dd1c761a784f6f12afd4b34f4ed5fd7d14666 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Feb 24 2021 16:02:20 +0000 Subject: Apply patch glibc-rh1659438-20.patch patch_name: glibc-rh1659438-20.patch present_in_specfile: true location_in_specfile: 113 --- diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index b7e1bc8..db060c8 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -40,5 +40,6 @@ sysdep_routines += bzero memset memset-z900 \ strlen strlen-vx strlen-c \ strnlen strnlen-vx strnlen-c \ strcpy strcpy-vx strcpy-z900 \ - stpcpy stpcpy-vx stpcpy-c + stpcpy stpcpy-vx stpcpy-c \ + strncpy strncpy-vx strncpy-z900 endif diff --git a/sysdeps/s390/ifunc-strncpy.h b/sysdeps/s390/ifunc-strncpy.h new file mode 100644 index 0000000..31e87e9 --- /dev/null +++ b/sysdeps/s390/ifunc-strncpy.h @@ -0,0 +1,52 @@ +/* strncpy 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_STRNCPY_IFUNC 1 +#else +# define HAVE_STRNCPY_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_STRNCPY_IFUNC_AND_VX_SUPPORT HAVE_STRNCPY_IFUNC +#else +# define HAVE_STRNCPY_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define STRNCPY_DEFAULT STRNCPY_Z13 +# define HAVE_STRNCPY_Z900_G5 0 +# define HAVE_STRNCPY_Z13 1 +#else +# define STRNCPY_DEFAULT STRNCPY_Z900_G5 +# define HAVE_STRNCPY_Z900_G5 1 +# define HAVE_STRNCPY_Z13 HAVE_STRNCPY_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_STRNCPY_Z900_G5 +# define STRNCPY_Z900_G5 __strncpy_default +#else +# define STRNCPY_Z900_G5 NULL +#endif + +#if HAVE_STRNCPY_Z13 +# define STRNCPY_Z13 __strncpy_vx +#else +# define STRNCPY_Z13 NULL +#endif diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index 9517417..c5189b5 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),string) -sysdep_routines += strncpy strncpy-vx \ - stpncpy stpncpy-vx stpncpy-c \ +sysdep_routines += stpncpy stpncpy-vx stpncpy-c \ strcat strcat-vx strcat-c \ strncat strncat-vx strncat-c \ strcmp strcmp-vx \ diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index 678ed13..d598fc5 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -30,6 +30,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -216,6 +217,19 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_STPCPY_IFUNC */ +#if HAVE_STRNCPY_IFUNC + IFUNC_IMPL (i, name, strncpy, +# if HAVE_STRNCPY_Z13 + IFUNC_IMPL_ADD (array, i, strncpy, + dl_hwcap & HWCAP_S390_VX, STRNCPY_Z13) +# endif +# if HAVE_STRNCPY_Z900_G5 + IFUNC_IMPL_ADD (array, i, strncpy, 1, STRNCPY_Z900_G5) +# endif + ) +#endif /* HAVE_STRNCPY_IFUNC */ + + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -232,7 +246,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (wcpcpy); - IFUNC_VX_IMPL (strncpy); IFUNC_VX_IMPL (wcsncpy); IFUNC_VX_IMPL (stpncpy); diff --git a/sysdeps/s390/multiarch/strncpy-vx.S b/sysdeps/s390/multiarch/strncpy-vx.S deleted file mode 100644 index 2a37b7b..0000000 --- a/sysdeps/s390/multiarch/strncpy-vx.S +++ /dev/null @@ -1,207 +0,0 @@ -/* Vector optimized 32/64 bit S/390 version of strncpy. - 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 - -/* char * strncpy (const char *dest, const char *src, size_t n) - Copy at most n characters of string src to dest. - - Register usage: - -r0=dest pointer for return - -r1=tmp, zero byte index - -r2=dest - -r3=src - -r4=n - -r5=current_len - -r6=tmp, loaded bytes - -r7=tmp, border - -v16=part of src - -v17=index of zero - -v18=part of src - -v31=register save area for r6, r7 -*/ -ENTRY(__strncpy_vx) - .machine "z13" - .machinemode "zarch_nohighgprs" - -# if !defined __s390x__ - llgfr %r4,%r4 -# endif /* !defined __s390x__ */ - - clgfi %r4,0 - ber %r14 /* Nothing to do, if n == 0. */ - lgr %r0,%r2 /* Save destination pointer for return. */ - vlvgp %v31,%r6,%r7 /* Save registers. */ - - vlbb %v16,0(%r3),6 /* Load s until next 4k-byte boundary. */ - lcbb %r6,0(%r3),6 /* Get bytes to 4k-byte boundary or 16. */ - llgfr %r6,%r6 /* Convert 32bit to 64bit. */ - - lghi %r5,0 /* current_len = 0. */ - - clgrjle %r4,%r6,.Lremaining_v16 /* If n <= loaded-bytes - -> process remaining. */ - - /* n > loaded-byte-count. */ - vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */ - vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */ - clrjl %r1,%r6,.Lfound_v16_store /* Found zero within loaded bytes, - copy and return. */ - - /* Align s to 16 byte. */ - risbgn %r7,%r3,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ - lghi %r5,15 /* current_len = 15. */ - slr %r5,%r7 /* Compute highest index to 16byte boundary. */ - - /* Zero not found and n > loaded-byte-count. */ - vstl %v16,%r5,0(%r2) /* Copy loaded characters - no zero. */ - ahi %r5,1 /* Start loop at next character. */ - - /* Now we are 16byte aligned, so we can load - a full vreg without page fault. */ - lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */ - aghi %r1,64 - clgrjl %r1,%r4,.Lloop64 - - vl %v16,0(%r5,%r3) /* Load s. */ - clgijl %r4,17,.Lremaining_v16 /* If n <= 16, process remaining - bytes. */ -.Llt64: - lgr %r7,%r4 - slgfi %r7,16 /* border_len = n - 16. */ - - clgrjhe %r5,%r7,.Lremaining_v16 /* If current_len >= border - then process remaining bytes. */ - vfenezbs %v17,%v16,%v16 /* Find element not equal with zero search. */ - je .Lfound_v16 /* 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. */ - aghi %r5,16 - - clgrjhe %r5,%r7,.Lremaining_v18 - vfenezbs %v17,%v18,%v18 - je .Lfound_v18 - vl %v16,16(%r5,%r3) - vst %v18,0(%r5,%r2) - aghi %r5,16 - - clgrjhe %r5,%r7,.Lremaining_v16 - vfenezbs %v17,%v16,%v16 - je .Lfound_v16 - vl %v18,16(%r5,%r3) - vst %v16,0(%r5,%r2) - aghi %r5,16 - -.Lremaining_v18: - vlr %v16,%v18 -.Lremaining_v16: - /* v16 contains the remaining bytes [1...16]. - Store remaining bytes and append string-termination. */ - vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */ - slgrk %r7,%r4,%r5 /* Remaining bytes = maxlen - current_len. */ - aghi %r7,-1 /* vstl needs highest index. */ - la %r2,0(%r5,%r2) /* vstl has no index register. */ - vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */ - /* Zero in remaining bytes? -> jump away (zero-index < max-index) - Do not jump away if zero-index == max-index, - but simply copy zero with vstl below. */ - clrjl %r1,%r7,.Lfound_v16_store - vstl %v16,%r7,0(%r2) /* Store remaining bytes without null - termination!. */ -.Lend: - /* Restore saved registers. */ - vlgvg %r6,%v31,0 - vlgvg %r7,%v31,1 - lgr %r2,%r0 /* Load saved dest-ptr. */ - br %r14 - - -.Lfound_v16_32: - aghi %r5,32 - j .Lfound_v16 -.Lfound_v18_48: - aghi %r5,32 -.Lfound_v18_16: - aghi %r5,16 -.Lfound_v18: - vlr %v16,%v18 -.Lfound_v16: - /* v16 contains a zero. Store remaining bytes to zero. current_len - has not reached border, thus checking for n is not needed! */ - vlgvb %r1,%v17,7 /* Load byte index of zero. */ - la %r2,0(%r5,%r2) /* vstl has no support for index-register. */ -.Lfound_v16_store: - vstl %v16,%r1,0(%r2) /* Copy characters including zero. */ - /* Fill remaining bytes with zero - remaining count always > 0. */ - algr %r5,%r1 /* Remaining bytes (=%r4) = ... */ - slgr %r4,%r5 /* = n - (current_len + zero_index + 1). */ - la %r2,0(%r1,%r2) /* Pointer to zero. start filling beyond. */ - aghi %r4,-2 /* mvc with exrl needs count - 1. - (additional -1, see remaining bytes above) */ - srlg %r6,%r4,8 /* Split into 256 byte blocks. */ - ltgr %r6,%r6 - je .Lzero_lt256 -.Lzero_loop256: - mvc 1(256,%r2),0(%r2) /* Fill 256 zeros at once. */ - la %r2,256(%r2) - brctg %r6,.Lzero_loop256 /* Loop until all blocks are processed. */ -.Lzero_lt256: - exrl %r4,.Lmvc_lt256 - j .Lend -.Lmvc_lt256: - mvc 1(1,%r2),0(%r2) - -.Lloop64: - vl %v16,0(%r5,%r3) /* Load s. */ - vfenezbs %v17,%v16,%v16 /* Find element not equal with zero search. */ - je .Lfound_v16 /* 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 - lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */ - aghi %r1,64 - clgrjl %r1,%r4,.Lloop64 - - vl %v16,0(%r5,%r3) /* Load s. */ - j .Llt64 -END(__strncpy_vx) - -# define strncpy __strncpy_c -# undef libc_hidden_builtin_def -# define libc_hidden_builtin_def(name) strong_alias(__strncpy_c, __GI_strncpy) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ - -/* Include strncpy-implementation in s390-32/s390-64 subdirectory. */ -#include diff --git a/sysdeps/s390/multiarch/strncpy.c b/sysdeps/s390/multiarch/strncpy.c deleted file mode 100644 index 2d4c456..0000000 --- a/sysdeps/s390/multiarch/strncpy.c +++ /dev/null @@ -1,29 +0,0 @@ -/* Multiple versions of strncpy. - 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 strncpy __redirect_strncpy -/* Omit the strncpy inline definitions because it would redefine strncpy. */ -# define __NO_STRING_INLINES -# include -# undef strncpy -# include - -s390_vx_libc_ifunc2_redirected (__redirect_strncpy, __strncpy, strncpy); - -#endif diff --git a/sysdeps/s390/s390-32/multiarch/strncpy.c b/sysdeps/s390/s390-32/multiarch/strncpy.c deleted file mode 100644 index 57f9df1..0000000 --- a/sysdeps/s390/s390-32/multiarch/strncpy.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Multiple versions of strncpy. - 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 - . */ - -/* This wrapper-file is needed, because otherwise file - sysdeps/s390/s390-[32|64]/strncpy.S will be used. */ -#include diff --git a/sysdeps/s390/s390-32/strncpy-z900.S b/sysdeps/s390/s390-32/strncpy-z900.S new file mode 100644 index 0000000..ebdaba0 --- /dev/null +++ b/sysdeps/s390/s390-32/strncpy-z900.S @@ -0,0 +1,89 @@ +/* strncpy - copy at most n characters from a string from source to + destination. For IBM S390 + This file is part of the GNU C Library. + Copyright (C) 2000-2018 Free Software Foundation, Inc. + Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). + + 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 + . */ + +/* + * R2 = address of destination (dst) + * R3 = address of source (src) + * R4 = max of bytes to copy + */ + +#include +#include "sysdep.h" +#include "asm-syntax.h" + +#if HAVE_STRNCPY_Z900_G5 +ENTRY(STRNCPY_Z900_G5) + .text + st %r2,24(%r15) # save dst pointer + slr %r2,%r3 # %r3 points to src, %r2+%r3 to dst + lhi %r1,3 + nr %r1,%r4 # last 2 bits of # bytes + srl %r4,2 + ltr %r4,%r4 # less than 4 bytes to copy ? + jz .L1 + bras %r5,.L0 # enter loop & load address of a 0 + .long 0 +.L0: icm %r0,8,0(%r3) # first byte + jz .L3 + icm %r0,4,1(%r3) # second byte + jz .L4 + icm %r0,2,2(%r3) # third byte + jz .L5 + icm %r0,1,3(%r3) # fourth byte + jz .L6 + st %r0,0(%r2,%r3) # store all four to dest. + la %r3,4(%r3) + brct %r4,.L0 +.L1: ltr %r1,%r1 + jz .Lexit +.L2: icm %r0,1,0(%r3) + stc %r0,0(%r2,%r3) + la %r3,1(%r3) + jz .L7 + brct %r1,.L2 + j .Lexit +.L3: icm %r0,4,0(%r5) +.L4: icm %r0,2,0(%r5) +.L5: icm %r0,1,0(%r5) +.L6: st %r0,0(%r2,%r3) + la %r3,4(%r3) + ahi %r4,-1 + j .L8 +.L7: ahi %r1,-1 +.L8: sll %r4,2 + alr %r4,%r1 + alr %r2,%r3 # start of dst area to be zeroed + lr %r3,%r4 + slr %r4,%r4 + slr %r5,%r5 +.L9: mvcle %r2,%r4,0 # pad dst with zeroes + jo .L9 +.Lexit: l %r2,24(%r15) # return dst pointer + br %r14 +END(STRNCPY_Z900_G5) + +# if ! HAVE_STRNCPY_IFUNC +strong_alias (STRNCPY_Z900_G5, strncpy) +# endif + +# if defined SHARED && IS_IN (libc) +strong_alias (STRNCPY_Z900_G5, __GI_strncpy) +# endif +#endif diff --git a/sysdeps/s390/s390-32/strncpy.S b/sysdeps/s390/s390-32/strncpy.S deleted file mode 100644 index 9086eb1..0000000 --- a/sysdeps/s390/s390-32/strncpy.S +++ /dev/null @@ -1,79 +0,0 @@ -/* strncpy - copy at most n characters from a string from source to - destination. For IBM S390 - This file is part of the GNU C Library. - Copyright (C) 2000-2018 Free Software Foundation, Inc. - Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). - - 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 - . */ - -/* - * R2 = address of destination (dst) - * R3 = address of source (src) - * R4 = max of bytes to copy - */ - -#include "sysdep.h" -#include "asm-syntax.h" - -ENTRY(strncpy) - .text - st %r2,24(%r15) # save dst pointer - slr %r2,%r3 # %r3 points to src, %r2+%r3 to dst - lhi %r1,3 - nr %r1,%r4 # last 2 bits of # bytes - srl %r4,2 - ltr %r4,%r4 # less than 4 bytes to copy ? - jz .L1 - bras %r5,.L0 # enter loop & load address of a 0 - .long 0 -.L0: icm %r0,8,0(%r3) # first byte - jz .L3 - icm %r0,4,1(%r3) # second byte - jz .L4 - icm %r0,2,2(%r3) # third byte - jz .L5 - icm %r0,1,3(%r3) # fourth byte - jz .L6 - st %r0,0(%r2,%r3) # store all four to dest. - la %r3,4(%r3) - brct %r4,.L0 -.L1: ltr %r1,%r1 - jz .Lexit -.L2: icm %r0,1,0(%r3) - stc %r0,0(%r2,%r3) - la %r3,1(%r3) - jz .L7 - brct %r1,.L2 - j .Lexit -.L3: icm %r0,4,0(%r5) -.L4: icm %r0,2,0(%r5) -.L5: icm %r0,1,0(%r5) -.L6: st %r0,0(%r2,%r3) - la %r3,4(%r3) - ahi %r4,-1 - j .L8 -.L7: ahi %r1,-1 -.L8: sll %r4,2 - alr %r4,%r1 - alr %r2,%r3 # start of dst area to be zeroed - lr %r3,%r4 - slr %r4,%r4 - slr %r5,%r5 -.L9: mvcle %r2,%r4,0 # pad dst with zeroes - jo .L9 -.Lexit: l %r2,24(%r15) # return dst pointer - br %r14 -END(strncpy) -libc_hidden_builtin_def (strncpy) diff --git a/sysdeps/s390/s390-64/multiarch/strncpy.c b/sysdeps/s390/s390-64/multiarch/strncpy.c deleted file mode 100644 index 57f9df1..0000000 --- a/sysdeps/s390/s390-64/multiarch/strncpy.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Multiple versions of strncpy. - 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 - . */ - -/* This wrapper-file is needed, because otherwise file - sysdeps/s390/s390-[32|64]/strncpy.S will be used. */ -#include diff --git a/sysdeps/s390/s390-64/strncpy-z900.S b/sysdeps/s390/s390-64/strncpy-z900.S new file mode 100644 index 0000000..5732e6d --- /dev/null +++ b/sysdeps/s390/s390-64/strncpy-z900.S @@ -0,0 +1,100 @@ +/* strncpy - copy at most n characters from a string from source to + destination. 64 bit S/390 version + Copyright (C) 2001-2018 Free Software Foundation, Inc. + Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). + 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 + . */ + +/* INPUT PARAMETERS + %r2 = address of destination (dst) + %r3 = address of source (src) + %r4 = max of bytes to copy. */ + +#include +#include "sysdep.h" +#include "asm-syntax.h" + +#if HAVE_STRNCPY_Z900_G5 +ENTRY(STRNCPY_Z900_G5) + .text + stg %r2,48(%r15) # save dst pointer + slgr %r2,%r3 # %r3 points to src, %r2+%r3 to dst + lghi %r1,7 + ngr %r1,%r4 # last 3 bits of # bytes + srlg %r4,%r4,3 + ltgr %r4,%r4 # less than 8 bytes to copy ? + jz .L1 + bras %r5,.L0 # enter loop & load address of a 0 + .long 0 +.L0: icmh %r0,8,0(%r3) # first byte + jz .L3 + icmh %r0,4,1(%r3) # second byte + jz .L4 + icmh %r0,2,2(%r3) # third byte + jz .L5 + icmh %r0,1,3(%r3) # fourth byte + jz .L6 + icm %r0,8,4(%r3) # fifth byte + jz .L7 + icm %r0,4,5(%r3) # sixth byte + jz .L8 + icm %r0,2,6(%r3) # seventh byte + jz .L9 + icm %r0,1,7(%r3) # eigth byte + jz .L10 + stg %r0,0(%r2,%r3) # store all eight to dest. + la %r3,8(%r3) + brct %r4,.L0 +.L1: ltgr %r1,%r1 + jz .Lexit +.L2: icm %r0,1,0(%r3) + stc %r0,0(%r2,%r3) + la %r3,1(%r3) + jz .L11 + brct %r1,.L2 + j .Lexit +.L3: icmh %r0,4,0(%r5) +.L4: icmh %r0,2,0(%r5) +.L5: icmh %r0,1,0(%r5) +.L6: icm %r0,8,0(%r5) +.L7: icm %r0,4,0(%r5) +.L8: icm %r0,2,0(%r5) +.L9: icm %r0,1,0(%r5) +.L10: stg %r0,0(%r2,%r3) + la %r3,8(%r3) + aghi %r4,-1 + j .L12 +.L11: aghi %r1,-1 +.L12: sllg %r4,%r4,3 + algr %r4,%r1 + algr %r2,%r3 # start of dst area to be zeroed + lgr %r3,%r4 + slgr %r4,%r4 + slgr %r5,%r5 +.L13: mvcle %r2,%r4,0 # pad dst with zeroes + jo .L13 +.Lexit: lg %r2,48(%r15) # return dst pointer + br %r14 +END(STRNCPY_Z900_G5) + +# if ! HAVE_STRNCPY_IFUNC +strong_alias (STRNCPY_Z900_G5, strncpy) +# endif + +# if defined SHARED && IS_IN (libc) +strong_alias (STRNCPY_Z900_G5, __GI_strncpy) +# endif +#endif diff --git a/sysdeps/s390/s390-64/strncpy.S b/sysdeps/s390/s390-64/strncpy.S deleted file mode 100644 index be40aa3..0000000 --- a/sysdeps/s390/s390-64/strncpy.S +++ /dev/null @@ -1,90 +0,0 @@ -/* strncpy - copy at most n characters from a string from source to - destination. 64 bit S/390 version - Copyright (C) 2001-2018 Free Software Foundation, Inc. - Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). - 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 - . */ - -/* INPUT PARAMETERS - %r2 = address of destination (dst) - %r3 = address of source (src) - %r4 = max of bytes to copy. */ - -#include "sysdep.h" -#include "asm-syntax.h" - -ENTRY(strncpy) - .text - stg %r2,48(%r15) # save dst pointer - slgr %r2,%r3 # %r3 points to src, %r2+%r3 to dst - lghi %r1,7 - ngr %r1,%r4 # last 3 bits of # bytes - srlg %r4,%r4,3 - ltgr %r4,%r4 # less than 8 bytes to copy ? - jz .L1 - bras %r5,.L0 # enter loop & load address of a 0 - .long 0 -.L0: icmh %r0,8,0(%r3) # first byte - jz .L3 - icmh %r0,4,1(%r3) # second byte - jz .L4 - icmh %r0,2,2(%r3) # third byte - jz .L5 - icmh %r0,1,3(%r3) # fourth byte - jz .L6 - icm %r0,8,4(%r3) # fifth byte - jz .L7 - icm %r0,4,5(%r3) # sixth byte - jz .L8 - icm %r0,2,6(%r3) # seventh byte - jz .L9 - icm %r0,1,7(%r3) # eigth byte - jz .L10 - stg %r0,0(%r2,%r3) # store all eight to dest. - la %r3,8(%r3) - brct %r4,.L0 -.L1: ltgr %r1,%r1 - jz .Lexit -.L2: icm %r0,1,0(%r3) - stc %r0,0(%r2,%r3) - la %r3,1(%r3) - jz .L11 - brct %r1,.L2 - j .Lexit -.L3: icmh %r0,4,0(%r5) -.L4: icmh %r0,2,0(%r5) -.L5: icmh %r0,1,0(%r5) -.L6: icm %r0,8,0(%r5) -.L7: icm %r0,4,0(%r5) -.L8: icm %r0,2,0(%r5) -.L9: icm %r0,1,0(%r5) -.L10: stg %r0,0(%r2,%r3) - la %r3,8(%r3) - aghi %r4,-1 - j .L12 -.L11: aghi %r1,-1 -.L12: sllg %r4,%r4,3 - algr %r4,%r1 - algr %r2,%r3 # start of dst area to be zeroed - lgr %r3,%r4 - slgr %r4,%r4 - slgr %r5,%r5 -.L13: mvcle %r2,%r4,0 # pad dst with zeroes - jo .L13 -.Lexit: lg %r2,48(%r15) # return dst pointer - br %r14 -END(strncpy) -libc_hidden_builtin_def (strncpy) diff --git a/sysdeps/s390/strncpy-vx.S b/sysdeps/s390/strncpy-vx.S new file mode 100644 index 0000000..be09ddf --- /dev/null +++ b/sysdeps/s390/strncpy-vx.S @@ -0,0 +1,208 @@ +/* Vector optimized 32/64 bit S/390 version of strncpy. + 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 +#include "sysdep.h" +#include "asm-syntax.h" + + .text + +#if HAVE_STRNCPY_Z13 +/* char * strncpy (const char *dest, const char *src, size_t n) + Copy at most n characters of string src to dest. + + Register usage: + -r0=dest pointer for return + -r1=tmp, zero byte index + -r2=dest + -r3=src + -r4=n + -r5=current_len + -r6=tmp, loaded bytes + -r7=tmp, border + -v16=part of src + -v17=index of zero + -v18=part of src + -v31=register save area for r6, r7 +*/ +ENTRY(STRNCPY_Z13) + .machine "z13" + .machinemode "zarch_nohighgprs" + +# if !defined __s390x__ + llgfr %r4,%r4 +# endif /* !defined __s390x__ */ + + clgfi %r4,0 + ber %r14 /* Nothing to do, if n == 0. */ + lgr %r0,%r2 /* Save destination pointer for return. */ + vlvgp %v31,%r6,%r7 /* Save registers. */ + + vlbb %v16,0(%r3),6 /* Load s until next 4k-byte boundary. */ + lcbb %r6,0(%r3),6 /* Get bytes to 4k-byte boundary or 16. */ + llgfr %r6,%r6 /* Convert 32bit to 64bit. */ + + lghi %r5,0 /* current_len = 0. */ + + clgrjle %r4,%r6,.Lremaining_v16 /* If n <= loaded-bytes + -> process remaining. */ + + /* n > loaded-byte-count. */ + vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */ + vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */ + clrjl %r1,%r6,.Lfound_v16_store /* Found zero within loaded bytes, + copy and return. */ + + /* Align s to 16 byte. */ + risbgn %r7,%r3,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ + lghi %r5,15 /* current_len = 15. */ + slr %r5,%r7 /* Compute highest index to 16byte boundary. */ + + /* Zero not found and n > loaded-byte-count. */ + vstl %v16,%r5,0(%r2) /* Copy loaded characters - no zero. */ + ahi %r5,1 /* Start loop at next character. */ + + /* Now we are 16byte aligned, so we can load + a full vreg without page fault. */ + lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */ + aghi %r1,64 + clgrjl %r1,%r4,.Lloop64 + + vl %v16,0(%r5,%r3) /* Load s. */ + clgijl %r4,17,.Lremaining_v16 /* If n <= 16, process remaining + bytes. */ +.Llt64: + lgr %r7,%r4 + slgfi %r7,16 /* border_len = n - 16. */ + + clgrjhe %r5,%r7,.Lremaining_v16 /* If current_len >= border + then process remaining bytes. */ + vfenezbs %v17,%v16,%v16 /* Find element not equal with zero search. */ + je .Lfound_v16 /* 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. */ + aghi %r5,16 + + clgrjhe %r5,%r7,.Lremaining_v18 + vfenezbs %v17,%v18,%v18 + je .Lfound_v18 + vl %v16,16(%r5,%r3) + vst %v18,0(%r5,%r2) + aghi %r5,16 + + clgrjhe %r5,%r7,.Lremaining_v16 + vfenezbs %v17,%v16,%v16 + je .Lfound_v16 + vl %v18,16(%r5,%r3) + vst %v16,0(%r5,%r2) + aghi %r5,16 + +.Lremaining_v18: + vlr %v16,%v18 +.Lremaining_v16: + /* v16 contains the remaining bytes [1...16]. + Store remaining bytes and append string-termination. */ + vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */ + slgrk %r7,%r4,%r5 /* Remaining bytes = maxlen - current_len. */ + aghi %r7,-1 /* vstl needs highest index. */ + la %r2,0(%r5,%r2) /* vstl has no index register. */ + vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */ + /* Zero in remaining bytes? -> jump away (zero-index < max-index) + Do not jump away if zero-index == max-index, + but simply copy zero with vstl below. */ + clrjl %r1,%r7,.Lfound_v16_store + vstl %v16,%r7,0(%r2) /* Store remaining bytes without null + termination!. */ +.Lend: + /* Restore saved registers. */ + vlgvg %r6,%v31,0 + vlgvg %r7,%v31,1 + lgr %r2,%r0 /* Load saved dest-ptr. */ + br %r14 + + +.Lfound_v16_32: + aghi %r5,32 + j .Lfound_v16 +.Lfound_v18_48: + aghi %r5,32 +.Lfound_v18_16: + aghi %r5,16 +.Lfound_v18: + vlr %v16,%v18 +.Lfound_v16: + /* v16 contains a zero. Store remaining bytes to zero. current_len + has not reached border, thus checking for n is not needed! */ + vlgvb %r1,%v17,7 /* Load byte index of zero. */ + la %r2,0(%r5,%r2) /* vstl has no support for index-register. */ +.Lfound_v16_store: + vstl %v16,%r1,0(%r2) /* Copy characters including zero. */ + /* Fill remaining bytes with zero - remaining count always > 0. */ + algr %r5,%r1 /* Remaining bytes (=%r4) = ... */ + slgr %r4,%r5 /* = n - (current_len + zero_index + 1). */ + la %r2,0(%r1,%r2) /* Pointer to zero. start filling beyond. */ + aghi %r4,-2 /* mvc with exrl needs count - 1. + (additional -1, see remaining bytes above) */ + srlg %r6,%r4,8 /* Split into 256 byte blocks. */ + ltgr %r6,%r6 + je .Lzero_lt256 +.Lzero_loop256: + mvc 1(256,%r2),0(%r2) /* Fill 256 zeros at once. */ + la %r2,256(%r2) + brctg %r6,.Lzero_loop256 /* Loop until all blocks are processed. */ +.Lzero_lt256: + exrl %r4,.Lmvc_lt256 + j .Lend +.Lmvc_lt256: + mvc 1(1,%r2),0(%r2) + +.Lloop64: + vl %v16,0(%r5,%r3) /* Load s. */ + vfenezbs %v17,%v16,%v16 /* Find element not equal with zero search. */ + je .Lfound_v16 /* 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 + lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */ + aghi %r1,64 + clgrjl %r1,%r4,.Lloop64 + + vl %v16,0(%r5,%r3) /* Load s. */ + j .Llt64 +END(STRNCPY_Z13) + +# if ! HAVE_STRNCPY_IFUNC +strong_alias (STRNCPY_Z13, strncpy) +# endif + +# if ! HAVE_STRNCPY_Z900_G5 && defined SHARED && IS_IN (libc) +strong_alias (STRNCPY_Z13, __GI_strncpy) +# endif +#endif diff --git a/sysdeps/s390/strncpy.c b/sysdeps/s390/strncpy.c new file mode 100644 index 0000000..ec8a264 --- /dev/null +++ b/sysdeps/s390/strncpy.c @@ -0,0 +1,42 @@ +/* Multiple versions of strncpy. + 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_STRNCPY_IFUNC +# define strncpy __redirect_strncpy +/* Omit the strncpy inline definitions because it would redefine strncpy. */ +# define __NO_STRING_INLINES +# include +# undef strncpy +# include + +# if HAVE_STRNCPY_Z900_G5 +extern __typeof (__redirect_strncpy) STRNCPY_Z900_G5 attribute_hidden; +# endif + +# if HAVE_STRNCPY_Z13 +extern __typeof (__redirect_strncpy) STRNCPY_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__redirect_strncpy, strncpy, + (HAVE_STRNCPY_Z13 && (hwcap & HWCAP_S390_VX)) + ? STRNCPY_Z13 + : STRNCPY_DEFAULT + ) +#endif