aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/x86_64
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-07-20 21:18:28 -0700
committerUlrich Drepper <drepper@redhat.com>2009-07-20 21:18:28 -0700
commita8f895ebe15c8988618ab1948d3f7035341a2eb7 (patch)
tree7b1a5cf8112acd7eeef69d542edcff7b96daaa5b /sysdeps/x86_64
parent2b7a8664fa86a182c053b6743f36a5ea8bf6bf6f (diff)
downloadglibc-a8f895ebe15c8988618ab1948d3f7035341a2eb7.tar
glibc-a8f895ebe15c8988618ab1948d3f7035341a2eb7.tar.gz
glibc-a8f895ebe15c8988618ab1948d3f7035341a2eb7.tar.bz2
glibc-a8f895ebe15c8988618ab1948d3f7035341a2eb7.zip
Better check for optimization in new x86-64 strstr/strcasestr.
Diffstat (limited to 'sysdeps/x86_64')
-rw-r--r--sysdeps/x86_64/multiarch/strstr.c26
1 files changed, 15 insertions, 11 deletions
diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c
index bb4275313c..f1455a1450 100644
--- a/sysdeps/x86_64/multiarch/strstr.c
+++ b/sysdeps/x86_64/multiarch/strstr.c
@@ -26,8 +26,7 @@
#ifdef USE_AS_STRCASESTR
# include <ctype.h>
-# include <locale.h>
-# include <string.h>
+# include <locale/localeinfo.h>
# define LOADBYTE(C) tolower (C)
# define CMPBYTE(C1, C2) \
@@ -257,12 +256,20 @@ char *
__attribute__ ((section (".text.sse4.2")))
STRSTR_SSE42 (const unsigned char *s1, const unsigned char *s2)
{
- int len, len1;
+ int len;
+ int len1;
const unsigned char *p1 = s1;
const unsigned char *p2 = s2;
- __m128i frag1, frag2, zero;
- int cmp, cmp_c, cmp_z, cmp_s;
- int kmp_fwd, bmsk, bmsk1;
+ __m128i frag1;
+ __m128i frag2;
+ __m128i zero;
+ int cmp;
+ int cmp_c;
+ int cmp_z;
+ int cmp_s;
+ int kmp_fwd;
+ int bmsk;
+ int bmsk1;
const unsigned char *pt;
if (!p2[0])
@@ -277,11 +284,8 @@ STRSTR_SSE42 (const unsigned char *s1, const unsigned char *s2)
#ifdef USE_AS_STRCASESTR
__m128i (*strloadu) (const unsigned char *);
- const char *used_locale = setlocale (LC_CTYPE, NULL);
- if (!used_locale
- || (used_locale[0] == 'C' && used_locale[1] == '\0')
- || strcmp (used_locale, "POSIX") == 0)
+ if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_NONASCII_CASE) == 0)
strloadu = __m128i_strloadu_tolower_posix;
else
strloadu = __m128i_strloadu_tolower;
@@ -430,7 +434,7 @@ re_trace:
action done done continue continue if s2 < s1
false match retrace s1 else false
*/
-
+
if(cmp_s & !cmp)
return (char *) pt;
else if (cmp_z)