import glibc-2.17-292.el7.src.rpm
Signed-off-by: zhangbinchen <zhangbinchen@openanolis.org>
This commit is contained in:
zhangbinchen
commit
ff0128648f
929 changed files with 436800 additions and 0 deletions
500
glibc-rh1268008-20.patch
Normal file
500
glibc-rh1268008-20.patch
Normal file
|
|
@ -0,0 +1,500 @@
|
|||
From 0b3ff29b298c488ab995d4224da2cc36fb56ddce Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Liebler <stli@linux.vnet.ibm.com>
|
||||
Date: Thu, 8 Oct 2015 11:25:00 +0200
|
||||
Subject: [PATCH 20/30] S390: Optimize strchr and wcschr.
|
||||
|
||||
upstream-commit-id: cf150d45a97c6bb8410d6d3acf6e1560e8fe96cc
|
||||
https://www.sourceware.org/ml/libc-alpha/2015-07/msg00094.html
|
||||
|
||||
This patch provides optimized versions of strchr and wcschr with the z13
|
||||
vector instructions.
|
||||
|
||||
ChangeLog:
|
||||
|
||||
* sysdeps/s390/multiarch/strchr-c.c: New File.
|
||||
* sysdeps/s390/multiarch/strchr-vx.S: Likewise.
|
||||
* sysdeps/s390/multiarch/strchr.c: Likewise.
|
||||
* sysdeps/s390/multiarch/wcschr-c.c: Likewise.
|
||||
* sysdeps/s390/multiarch/wcschr-vx.S: Likewise.
|
||||
* sysdeps/s390/multiarch/wcschr.c: Likewise.
|
||||
* sysdeps/s390/multiarch/Makefile (sysdep_routines): Add strchr and
|
||||
wcschr functions.
|
||||
* sysdeps/s390/multiarch/ifunc-impl-list.c
|
||||
(__libc_ifunc_impl_list): Add ifunc test for strchr, wcschr.
|
||||
* string/strchr.c (STRCHR): Define and use macro.
|
||||
* benchtests/bench-wcschr.c: New File.
|
||||
* benchtests/Makefile (wcsmbs-bench): Add wcschr.
|
||||
---
|
||||
benchtests/Makefile | 2 +-
|
||||
benchtests/bench-wcschr.c | 20 ++++++
|
||||
string/strchr.c | 8 ++-
|
||||
sysdeps/s390/multiarch/Makefile | 6 +-
|
||||
sysdeps/s390/multiarch/ifunc-impl-list.c | 3 +
|
||||
sysdeps/s390/multiarch/strchr-c.c | 29 +++++++++
|
||||
sysdeps/s390/multiarch/strchr-vx.S | 100 ++++++++++++++++++++++++++++++
|
||||
sysdeps/s390/multiarch/strchr.c | 28 +++++++++
|
||||
sysdeps/s390/multiarch/wcschr-c.c | 31 ++++++++++
|
||||
sysdeps/s390/multiarch/wcschr-vx.S | 103 +++++++++++++++++++++++++++++++
|
||||
sysdeps/s390/multiarch/wcschr.c | 27 ++++++++
|
||||
11 files changed, 351 insertions(+), 6 deletions(-)
|
||||
create mode 100644 benchtests/bench-wcschr.c
|
||||
create mode 100644 sysdeps/s390/multiarch/strchr-c.c
|
||||
create mode 100644 sysdeps/s390/multiarch/strchr-vx.S
|
||||
create mode 100644 sysdeps/s390/multiarch/strchr.c
|
||||
create mode 100644 sysdeps/s390/multiarch/wcschr-c.c
|
||||
create mode 100644 sysdeps/s390/multiarch/wcschr-vx.S
|
||||
create mode 100644 sysdeps/s390/multiarch/wcschr.c
|
||||
|
||||
diff --git a/benchtests/Makefile b/benchtests/Makefile
|
||||
index f6342da..bcb0288 100644
|
||||
--- a/benchtests/Makefile
|
||||
+++ b/benchtests/Makefile
|
||||
@@ -39,7 +39,7 @@ string-bench := bcopy bzero memccpy memchr memcmp memcpy memmem memmove \
|
||||
strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \
|
||||
strspn strstr strcpy_chk stpcpy_chk memrchr strsep strtok
|
||||
wcsmbs-bench := wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat \
|
||||
- wcsncmp wcsncmp
|
||||
+ wcsncmp wcsncmp wcschr
|
||||
string-bench-all := $(string-bench) ${wcsmbs-bench}
|
||||
|
||||
stdlib-bench := strtod
|
||||
diff --git a/benchtests/bench-wcschr.c b/benchtests/bench-wcschr.c
|
||||
new file mode 100644
|
||||
index 0000000..4287724
|
||||
--- /dev/null
|
||||
+++ b/benchtests/bench-wcschr.c
|
||||
@@ -0,0 +1,20 @@
|
||||
+/* Measure wcschr functions.
|
||||
+ Copyright (C) 2015 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/>. */
|
||||
+
|
||||
+#define WIDE 1
|
||||
+#include "bench-strchr.c"
|
||||
diff --git a/string/strchr.c b/string/strchr.c
|
||||
index 9d18b7e..69a9cd9 100644
|
||||
--- a/string/strchr.c
|
||||
+++ b/string/strchr.c
|
||||
@@ -27,11 +27,13 @@
|
||||
|
||||
#undef strchr
|
||||
|
||||
+#ifndef STRCHR
|
||||
+# define STRCHR strchr
|
||||
+#endif
|
||||
+
|
||||
/* Find the first occurrence of C in S. */
|
||||
char *
|
||||
-strchr (s, c_in)
|
||||
- const char *s;
|
||||
- int c_in;
|
||||
+STRCHR (const char *s, int c_in)
|
||||
{
|
||||
const unsigned char *char_ptr;
|
||||
const unsigned long int *longword_ptr;
|
||||
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
|
||||
index d77bee5..1a3673b 100644
|
||||
--- a/sysdeps/s390/multiarch/Makefile
|
||||
+++ b/sysdeps/s390/multiarch/Makefile
|
||||
@@ -8,7 +8,8 @@ sysdep_routines += strlen strlen-vx strlen-c \
|
||||
strcat strcat-vx strcat-c \
|
||||
strncat strncat-vx strncat-c \
|
||||
strcmp strcmp-vx \
|
||||
- strncmp strncmp-vx strncmp-c
|
||||
+ strncmp strncmp-vx strncmp-c \
|
||||
+ strchr strchr-vx strchr-c
|
||||
endif
|
||||
|
||||
ifeq ($(subdir),wcsmbs)
|
||||
@@ -21,5 +22,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \
|
||||
wcscat wcscat-vx wcscat-c \
|
||||
wcsncat wcsncat-vx wcsncat-c \
|
||||
wcscmp wcscmp-vx wcscmp-c \
|
||||
- wcsncmp wcsncmp-vx wcsncmp-c
|
||||
+ wcsncmp wcsncmp-vx wcsncmp-c \
|
||||
+ wcschr wcschr-vx wcschr-c
|
||||
endif
|
||||
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
||||
index 5bfc493..b0782ff 100644
|
||||
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
|
||||
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
||||
@@ -109,6 +109,9 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
||||
IFUNC_VX_IMPL (strncmp);
|
||||
IFUNC_VX_IMPL (wcsncmp);
|
||||
|
||||
+ IFUNC_VX_IMPL (strchr);
|
||||
+ IFUNC_VX_IMPL (wcschr);
|
||||
+
|
||||
#endif /* HAVE_S390_VX_ASM_SUPPORT */
|
||||
|
||||
return i;
|
||||
diff --git a/sysdeps/s390/multiarch/strchr-c.c b/sysdeps/s390/multiarch/strchr-c.c
|
||||
new file mode 100644
|
||||
index 0000000..4384e6b
|
||||
--- /dev/null
|
||||
+++ b/sysdeps/s390/multiarch/strchr-c.c
|
||||
@@ -0,0 +1,29 @@
|
||||
+/* Default strchr implementation for S/390.
|
||||
+ Copyright (C) 2015 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 && !defined NOT_IN_libc
|
||||
+# define STRCHR __strchr_c
|
||||
+# undef weak_alias
|
||||
+# ifdef SHARED
|
||||
+# undef libc_hidden_builtin_def
|
||||
+# define libc_hidden_builtin_def(name) \
|
||||
+ __hidden_ver1 (__strchr_c, __GI_strchr, __strchr_c);
|
||||
+# endif /* SHARED */
|
||||
+
|
||||
+# include <string/strchr.c>
|
||||
+#endif /* HAVE_S390_VX_ASM_SUPPORT && !defined NOT_IN_libc */
|
||||
diff --git a/sysdeps/s390/multiarch/strchr-vx.S b/sysdeps/s390/multiarch/strchr-vx.S
|
||||
new file mode 100644
|
||||
index 0000000..26180df
|
||||
--- /dev/null
|
||||
+++ b/sysdeps/s390/multiarch/strchr-vx.S
|
||||
@@ -0,0 +1,100 @@
|
||||
+/* Vector optimized 32/64 bit S/390 version of strchr.
|
||||
+ Copyright (C) 2015 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 && !defined NOT_IN_libc
|
||||
+
|
||||
+# include "sysdep.h"
|
||||
+# include "asm-syntax.h"
|
||||
+
|
||||
+ .text
|
||||
+
|
||||
+/* char *strchr (const char *s, int c)
|
||||
+ Locate character in string.
|
||||
+
|
||||
+ Register usage:
|
||||
+ -r1=tmp
|
||||
+ -r2=s
|
||||
+ -r3=c
|
||||
+ -r4=tmp
|
||||
+ -r5=current_len
|
||||
+ -v16=part of s
|
||||
+ -v17=index of unequal
|
||||
+ -v18=replicated c
|
||||
+*/
|
||||
+ENTRY(__strchr_vx)
|
||||
+ .machine "z13"
|
||||
+ .machinemode "zarch_nohighgprs"
|
||||
+
|
||||
+ 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. */
|
||||
+
|
||||
+ lghi %r5,0 /* current_len = 0. */
|
||||
+
|
||||
+ vlvgb %v18,%r3,0 /* Generate vector which elements are all c.
|
||||
+ If c > 255, c will be truncated. */
|
||||
+ vrepb %v18,%v18,0
|
||||
+
|
||||
+ vfeezbs %v16,%v16,%v18 /* Find element equal with zero search. */
|
||||
+ vlgvb %r4,%v16,7 /* Load byte index of character or zero. */
|
||||
+ clrjl %r4,%r1,.Lfound /* Return if c/zero is in loaded bytes. */
|
||||
+
|
||||
+ /* 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. */
|
||||
+
|
||||
+ /* Find c/zero in 16 byte aligned loop */
|
||||
+.Lloop:
|
||||
+ vl %v16,0(%r5,%r2) /* Load s. */
|
||||
+ vfeezbs %v16,%v16,%v18 /* Find element equal with zero search. */
|
||||
+ jno .Lfound /* Found c/zero (cc=0|1|2). */
|
||||
+ vl %v16,16(%r5,%r2)
|
||||
+ vfeezbs %v16,%v16,%v18
|
||||
+ jno .Lfound16
|
||||
+ vl %v16,32(%r5,%r2)
|
||||
+ vfeezbs %v16,%v16,%v18
|
||||
+ jno .Lfound32
|
||||
+ vl %v16,48(%r5,%r2)
|
||||
+ vfeezbs %v16,%v16,%v18
|
||||
+ jno .Lfound48
|
||||
+
|
||||
+ aghi %r5,64
|
||||
+ j .Lloop /* No character and no zero -> loop. */
|
||||
+
|
||||
+.Lfound48:
|
||||
+ la %r5,16(%r5) /* Use la since aghi would clobber cc. */
|
||||
+.Lfound32:
|
||||
+ la %r5,16(%r5)
|
||||
+.Lfound16:
|
||||
+ la %r5,16(%r5)
|
||||
+.Lfound:
|
||||
+ je .Lzero /* Found zero, but no c before that zero. */
|
||||
+
|
||||
+.Lcharacter:
|
||||
+ vlgvb %r4,%v16,7 /* Load byte index of character. */
|
||||
+ algr %r5,%r4
|
||||
+ la %r2,0(%r5,%r2) /* Return pointer to character. */
|
||||
+ br %r14
|
||||
+
|
||||
+.Lzero:
|
||||
+ llgcr %r3,%r3 /* char c_char = (char) c. */
|
||||
+ clije %r3,0,.Lcharacter /* Found zero and c is zero. */
|
||||
+ lghi %r2,0 /* Return null if character not found. */
|
||||
+ br %r14
|
||||
+END(__strchr_vx)
|
||||
+#endif /* HAVE_S390_VX_ASM_SUPPORT && !defined NOT_IN_libc */
|
||||
diff --git a/sysdeps/s390/multiarch/strchr.c b/sysdeps/s390/multiarch/strchr.c
|
||||
new file mode 100644
|
||||
index 0000000..e2a310f
|
||||
--- /dev/null
|
||||
+++ b/sysdeps/s390/multiarch/strchr.c
|
||||
@@ -0,0 +1,28 @@
|
||||
+/* Multiple versions of strchr.
|
||||
+ Copyright (C) 2015 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 && !defined NOT_IN_libc
|
||||
+# include <string.h>
|
||||
+# include <ifunc-resolve.h>
|
||||
+
|
||||
+s390_vx_libc_ifunc2 (__strchr, strchr)
|
||||
+weak_alias (strchr, index)
|
||||
+
|
||||
+#else
|
||||
+# include <string/strchr.c>
|
||||
+#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && !defined NOT_IN_libc) */
|
||||
diff --git a/sysdeps/s390/multiarch/wcschr-c.c b/sysdeps/s390/multiarch/wcschr-c.c
|
||||
new file mode 100644
|
||||
index 0000000..ad7415e
|
||||
--- /dev/null
|
||||
+++ b/sysdeps/s390/multiarch/wcschr-c.c
|
||||
@@ -0,0 +1,31 @@
|
||||
+/* Default wcschr implementation for S/390.
|
||||
+ Copyright (C) 2015 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 && !defined NOT_IN_libc
|
||||
+# define WCSCHR __wcschr_c
|
||||
+
|
||||
+# include <wchar.h>
|
||||
+extern __typeof (wcschr) __wcschr_c;
|
||||
+# ifdef SHARED
|
||||
+# undef libc_hidden_def
|
||||
+# define libc_hidden_def(name) \
|
||||
+ __hidden_ver1 (__wcschr_c, __GI_wcschr, __wcschr_c);
|
||||
+# endif /* SHARED */
|
||||
+
|
||||
+# include <wcsmbs/wcschr.c>
|
||||
+#endif /* HAVE_S390_VX_ASM_SUPPORT && !defined NOT_IN_libc */
|
||||
diff --git a/sysdeps/s390/multiarch/wcschr-vx.S b/sysdeps/s390/multiarch/wcschr-vx.S
|
||||
new file mode 100644
|
||||
index 0000000..c1b3f6b
|
||||
--- /dev/null
|
||||
+++ b/sysdeps/s390/multiarch/wcschr-vx.S
|
||||
@@ -0,0 +1,103 @@
|
||||
+/* Vector optimized 32/64 bit S/390 version of wcschr.
|
||||
+ Copyright (C) 2015 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 && !defined NOT_IN_libc
|
||||
+
|
||||
+# include "sysdep.h"
|
||||
+# include "asm-syntax.h"
|
||||
+
|
||||
+ .text
|
||||
+
|
||||
+/* wchar_t *wcschr (const wchar_t *s, wchar_t c)
|
||||
+ Locate character in string.
|
||||
+
|
||||
+ Register usage:
|
||||
+ -r1=tmp
|
||||
+ -r2=s
|
||||
+ -r3=c
|
||||
+ -r4=tmp
|
||||
+ -r5=current_len
|
||||
+ -v16=part of s
|
||||
+ -v17=index of unequal
|
||||
+ -v18=replicated c
|
||||
+*/
|
||||
+ENTRY(__wcschr_vx)
|
||||
+ .machine "z13"
|
||||
+ .machinemode "zarch_nohighgprs"
|
||||
+
|
||||
+ 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. */
|
||||
+
|
||||
+ tmll %r2,3 /* Test if s is 4-byte aligned? */
|
||||
+ jne .Lfallback /* And use common-code variant if not. */
|
||||
+
|
||||
+ lghi %r5,0 /* current_len = 0. */
|
||||
+
|
||||
+ vlvgf %v18,%r3,0 /* Generate vector which elements are all c. */
|
||||
+ vrepf %v18,%v18,0
|
||||
+
|
||||
+ vfeezfs %v16,%v16,%v18 /* Find element equal with zero search. */
|
||||
+ vlgvb %r4,%v16,7 /* Load byte index of character or zero. */
|
||||
+ clrjl %r4,%r1,.Lfound /* Return if c/zero is in loaded bytes. */
|
||||
+
|
||||
+ /* 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. */
|
||||
+
|
||||
+ /* Find c/zero in 16byte aligned loop */
|
||||
+.Lloop:
|
||||
+ vl %v16,0(%r5,%r2) /* Load s. */
|
||||
+ vfeezfs %v16,%v16,%v18 /* Find element equal with zero search. */
|
||||
+ jno .Lfound /* Found c/zero (cc=0|1|2). */
|
||||
+ vl %v16,16(%r5,%r2)
|
||||
+ vfeezfs %v16,%v16,%v18
|
||||
+ jno .Lfound16
|
||||
+ vl %v16,32(%r5,%r2)
|
||||
+ vfeezfs %v16,%v16,%v18
|
||||
+ jno .Lfound32
|
||||
+ vl %v16,48(%r5,%r2)
|
||||
+ vfeezfs %v16,%v16,%v18
|
||||
+ jno .Lfound48
|
||||
+
|
||||
+ aghi %r5,64
|
||||
+ j .Lloop /* No character and no zero -> loop. */
|
||||
+
|
||||
+.Lfound48:
|
||||
+ la %r5,16(%r5) /* Use la since aghi would clobber cc. */
|
||||
+.Lfound32:
|
||||
+ la %r5,16(%r5)
|
||||
+.Lfound16:
|
||||
+ la %r5,16(%r5)
|
||||
+.Lfound:
|
||||
+ je .Lzero /* Found zero, but no c before that zero. */
|
||||
+
|
||||
+.Lcharacter:
|
||||
+ vlgvb %r4,%v16,7 /* Load byte index of character. */
|
||||
+ algr %r5,%r4
|
||||
+ la %r2,0(%r5,%r2) /* Return pointer to character. */
|
||||
+ br %r14
|
||||
+
|
||||
+.Lzero:
|
||||
+ clije %r3,0,.Lcharacter /* Found zero and c is zero. */
|
||||
+ lghi %r2,0 /* Return null if character not found. */
|
||||
+ br %r14
|
||||
+.Lfallback:
|
||||
+ jg __wcschr_c
|
||||
+END(__wcschr_vx)
|
||||
+#endif /* HAVE_S390_VX_ASM_SUPPORT && !defined NOT_IN_libc */
|
||||
diff --git a/sysdeps/s390/multiarch/wcschr.c b/sysdeps/s390/multiarch/wcschr.c
|
||||
new file mode 100644
|
||||
index 0000000..9c8c097
|
||||
--- /dev/null
|
||||
+++ b/sysdeps/s390/multiarch/wcschr.c
|
||||
@@ -0,0 +1,27 @@
|
||||
+/* Multiple versions of wcschr.
|
||||
+ Copyright (C) 2015 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 && !defined NOT_IN_libc
|
||||
+# include <wchar.h>
|
||||
+# include <ifunc-resolve.h>
|
||||
+
|
||||
+s390_vx_libc_ifunc2 (__wcschr, wcschr)
|
||||
+
|
||||
+#else
|
||||
+# include <wcsmbs/wcschr.c>
|
||||
+#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && !defined NOT_IN_libc) */
|
||||
--
|
||||
2.3.0
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue