diff options
Diffstat (limited to 'sysdeps/s390/s390-64')
| -rw-r--r-- | sysdeps/s390/s390-64/memcmp.S | 64 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/multiarch/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/multiarch/memcmp-s390x.S | 104 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/multiarch/memcmp.c | 27 |
4 files changed, 1 insertions, 196 deletions
diff --git a/sysdeps/s390/s390-64/memcmp.S b/sysdeps/s390/s390-64/memcmp.S deleted file mode 100644 index 005b19de45..0000000000 --- a/sysdeps/s390/s390-64/memcmp.S +++ /dev/null @@ -1,64 +0,0 @@ -/* memcmp - compare two memory blocks. 64 bit S/390 version. - Copyright (C) 2012-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/>. */ - - -#include <sysdep.h> -#include "asm-syntax.h" - -/* INPUT PARAMETERS - %r2 = address of first memory area - %r3 = address of second memory area - %r4 = number of bytes to compare. */ - - .text -#ifdef USE_MULTIARCH -ENTRY(__memcmp_default) -#else -ENTRY(memcmp) -#endif - .machine "z900" - ltgr %r4,%r4 - je .L_Z900_4 - aghi %r4,-1 - srlg %r1,%r4,8 - ltgr %r1,%r1 - jne .L_Z900_12 -.L_Z900_3: - larl %r1,.L_Z900_15 - ex %r4,0(%r1) -.L_Z900_4: - ipm %r2 - sllg %r2,%r2,34 - srag %r2,%r2,62 - br %r14 -.L_Z900_12: - clc 0(256,%r3),0(%r2) - jne .L_Z900_4 - la %r3,256(%r3) - la %r2,256(%r2) - brctg %r1,.L_Z900_12 - j .L_Z900_3 -.L_Z900_15: - clc 0(1,%r3),0(%r2) -#ifdef USE_MULTIARCH -END(__memcmp_default) -#else -END(memcmp) -libc_hidden_builtin_def (memcmp) -weak_alias (memcmp, bcmp) -#endif diff --git a/sysdeps/s390/s390-64/multiarch/Makefile b/sysdeps/s390/s390-64/multiarch/Makefile index e4870c7ee1..8a043e3327 100644 --- a/sysdeps/s390/s390-64/multiarch/Makefile +++ b/sysdeps/s390/s390-64/multiarch/Makefile @@ -1,3 +1,3 @@ ifeq ($(subdir),string) -sysdep_routines += memcpy memcpy-s390x memcmp memcmp-s390x +sysdep_routines += memcpy memcpy-s390x endif diff --git a/sysdeps/s390/s390-64/multiarch/memcmp-s390x.S b/sysdeps/s390/s390-64/multiarch/memcmp-s390x.S deleted file mode 100644 index 35f9bf9cf7..0000000000 --- a/sysdeps/s390/s390-64/multiarch/memcmp-s390x.S +++ /dev/null @@ -1,104 +0,0 @@ -/* CPU specific memcmp implementations. 64 bit S/390 version. - Copyright (C) 2012-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/>. */ - - -#include "sysdep.h" -#include "asm-syntax.h" - -/* INPUT PARAMETERS - %r2 = address of first memory area - %r3 = address of second memory area - %r4 = number of bytes to compare. */ - - .text - -#if IS_IN (libc) - -ENTRY(__memcmp_z196) - .machine "z196" - ltgr %r4,%r4 - je .L_Z196_4 - aghi %r4,-1 - srlg %r1,%r4,8 - ltgr %r1,%r1 - jne .L_Z196_2 -.L_Z196_3: - exrl %r4,.L_Z196_14 -.L_Z196_4: - ipm %r2 - sllg %r2,%r2,34 - srag %r2,%r2,62 - br %r14 -.L_Z196_17: - la %r3,256(%r3) - la %r2,256(%r2) - aghi %r1,-1 - je .L_Z196_3 -.L_Z196_2: - pfd 1,512(%r3) - pfd 1,512(%r2) - clc 0(256,%r3),0(%r2) - je .L_Z196_17 - ipm %r2 - sllg %r2,%r2,34 - srag %r2,%r2,62 - br %r14 -.L_Z196_14: - clc 0(1,%r3),0(%r2) -END(__memcmp_z196) - -ENTRY(__memcmp_z10) - .machine "z10" - ltgr %r4,%r4 - je .L_Z10_4 - aghi %r4,-1 - srlg %r1,%r4,8 - cgijlh %r1,0,.L_Z10_12 -.L_Z10_3: - exrl %r4,.L_Z10_15 -.L_Z10_4: - ipm %r2 - sllg %r2,%r2,34 - srag %r2,%r2,62 - br %r14 -.L_Z10_12: - pfd 1,512(%r3) - pfd 1,512(%r2) - clc 0(256,%r3),0(%r2) - jne .L_Z10_4 - la %r3,256(%r3) - la %r2,256(%r2) - brctg %r1,.L_Z10_12 - j .L_Z10_3 -.L_Z10_15: - clc 0(1,%r3),0(%r2) -END(__memcmp_z10) - -#endif /* IS_IN (libc) */ - -#include "../memcmp.S" - -#if !IS_IN (libc) -.globl memcmp -.set memcmp,__memcmp_default -.weak bcmp -.set bcmp,__memcmp_default -#elif defined SHARED && IS_IN (libc) -.globl __GI_memcmp -.set __GI_memcmp,__memcmp_default -#endif diff --git a/sysdeps/s390/s390-64/multiarch/memcmp.c b/sysdeps/s390/s390-64/multiarch/memcmp.c deleted file mode 100644 index 1e6f31806e..0000000000 --- a/sysdeps/s390/s390-64/multiarch/memcmp.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Multiple versions of memcmp. - 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 IS_IN (libc) -# define memcmp __redirect_memcmp -# include <string.h> -# undef memcmp -# include <ifunc-resolve.h> - -s390_libc_ifunc (__redirect_memcmp, __memcmp, memcmp) -weak_alias (memcmp, bcmp); -#endif |