From d2aa96e13c2f7a3066d53e4711aff63e313c4c0b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 7 Apr 2009 07:04:24 +0000 Subject: Updated to fedora-glibc-20090407T0657 --- ChangeLog | 7 ++++++ NEWS | 2 +- fedora/branch.mk | 4 +-- fedora/glibc.spec.in | 2 +- string/Makefile | 2 +- string/strverscmp.c | 61 +++++++++++++++++++++----------------------- string/tst-svc.expect | 2 ++ string/tst-svc.input | 2 ++ sysdeps/x86_64/memchr.S | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ sysdeps/x86_64/strlen.S | 1 + 10 files changed, 113 insertions(+), 37 deletions(-) create mode 100644 sysdeps/x86_64/memchr.S diff --git a/ChangeLog b/ChangeLog index 62e4d49dc2..4923d25b73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-04-06 Ulrich Drepper + * string/strverscmp.c (__strverscmp): Fix last cleanups. + * string/tst-svc.input: Add new test case. + * string/tst-svc.expect: Adjust. + * string/Makefile: Don't ignore tst-svc error. + + * sysdeps/x86_64/memchr.S: New file. + * resolv/resolv.h (RES_SNGLKUP): Define. * resolv/res_init.c (res_setoptions): Recognize single-request option. * resolv/res_send.c (send_dg): If we sent two requests at once and diff --git a/NEWS b/NEWS index 1388caa804..e969b61b58 100644 --- a/NEWS +++ b/NEWS @@ -37,7 +37,7 @@ Version 2.10 * New locales: nan_TW@latin, ks_IN -* Faster strlen and strchr on x86-64. +* Faster strlen, strchr, and memchr on x86-64. Implemented by Ulrich Drepper. diff --git a/fedora/branch.mk b/fedora/branch.mk index 5d5323430d..83f90a76ff 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-f8 -fedora-sync-date := 2009-04-07 05:45 UTC -fedora-sync-tag := fedora-glibc-20090407T0545 +fedora-sync-date := 2009-04-07 06:57 UTC +fedora-sync-tag := fedora-glibc-20090407T0657 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 92b7d62051..eb4f745790 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1011,8 +1011,8 @@ rm -f *.filelist* %changelog * Tue Apr 7 2009 Jakub Jelinek 2.9.90-13 - update from trunk + - fix strverscmp (#494457) - configure with --enable-nss-crypt -- temporarily revert recent strverscmp cleanups (#494457) * Wed Apr 1 2009 Jakub Jelinek 2.9.90-12 - update from trunk diff --git a/string/Makefile b/string/Makefile index 127e25fbd9..db9b5081d5 100644 --- a/string/Makefile +++ b/string/Makefile @@ -79,5 +79,5 @@ tests: $(objpfx)tst-svc.out $(objpfx)tst-svc.out: tst-svc.input $(objpfx)tst-svc GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ $(built-program-cmd) < $(word 1,$^) > $@ - -cmp tst-svc.expect $(objpfx)tst-svc.out + @cmp tst-svc.expect $(objpfx)tst-svc.out endif diff --git a/string/strverscmp.c b/string/strverscmp.c index 2e6c96a657..7c5be8dd95 100644 --- a/string/strverscmp.c +++ b/string/strverscmp.c @@ -18,15 +18,16 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include #include #include /* states: S_N: normal, S_I: comparing integral part, S_F: comparing fractionnal parts, S_Z: idem but with leading Zeroes only */ #define S_N 0x0 -#define S_I 0x4 -#define S_F 0x8 -#define S_Z 0xC +#define S_I 0x3 +#define S_F 0x6 +#define S_Z 0x9 /* result_type: CMP: return diff; LEN: compare using len_diff/diff */ #define CMP 2 @@ -45,53 +46,49 @@ __strverscmp (s1, s2) { const unsigned char *p1 = (const unsigned char *) s1; const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - int state; - int diff; - /* Symbol(s) 0 [1-9] others (padding) - Transition (10) 0 (01) d (00) x (11) - */ - static const unsigned int next_state[] = + /* Symbol(s) 0 [1-9] others + Transition (10) 0 (01) d (00) x */ + static const uint8_t next_state[] = { - /* state x d 0 - */ - /* S_N */ S_N, S_I, S_Z, S_N, - /* S_I */ S_N, S_I, S_I, S_I, - /* S_F */ S_N, S_F, S_F, S_F, - /* S_Z */ S_N, S_F, S_Z, S_Z + /* state x d 0 */ + /* S_N */ S_N, S_I, S_Z, + /* S_I */ S_N, S_I, S_I, + /* S_F */ S_N, S_F, S_F, + /* S_Z */ S_N, S_F, S_Z }; - static const int result_type[] = + static const int8_t result_type[] = { - /* state x/x x/d x/0 x/- d/x d/d d/0 d/- - 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */ - - /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, - CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, - /* S_I */ CMP, -1, -1, CMP, +1, LEN, LEN, CMP, - +1, LEN, LEN, CMP, CMP, CMP, CMP, CMP, - /* S_F */ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, - CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, - /* S_Z */ CMP, +1, +1, CMP, -1, CMP, CMP, CMP, - -1, CMP, CMP, CMP + /* state x/x x/d x/0 d/x d/d d/0 0/x 0/d 0/0 */ + + /* S_N */ CMP, CMP, CMP, CMP, LEN, CMP, CMP, CMP, CMP, + /* S_I */ CMP, -1, -1, +1, LEN, LEN, +1, LEN, LEN, + /* S_F */ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, + /* S_Z */ CMP, +1, +1, -1, CMP, CMP, -1, CMP, CMP }; if (p1 == p2) return 0; - c1 = *p1++; - c2 = *p2++; + unsigned char c1 = *p1++; + unsigned char c2 = *p2++; /* Hint: '0' is a digit too. */ - state = S_N | ((c1 == '0') + (isdigit (c1) != 0)); + int state = S_N + ((c1 == '0') + (isdigit (c1) != 0)); - while ((diff = c1 - c2) == 0 && c1 != '\0') + int diff; + while ((diff = c1 - c2) == 0) { + if (c1 == '\0') + return diff; + state = next_state[state]; c1 = *p1++; c2 = *p2++; - state |= (c1 == '0') + (isdigit (c1) != 0); + state += (c1 == '0') + (isdigit (c1) != 0); } - state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))]; + state = result_type[state * 3 + (((c2 == '0') + (isdigit (c2) != 0)))]; switch (state) { diff --git a/string/tst-svc.expect b/string/tst-svc.expect index bb54a2ace0..6240112772 100644 --- a/string/tst-svc.expect +++ b/string/tst-svc.expect @@ -6,6 +6,8 @@ 01a 0 0a +2.6.20 +2.6.21 2.8 2.8-0.4 20 diff --git a/string/tst-svc.input b/string/tst-svc.input index fbe06d2c87..247b1c48f9 100644 --- a/string/tst-svc.input +++ b/string/tst-svc.input @@ -6,6 +6,7 @@ 01a 00a 000 +2.6.21 20 212 21 @@ -18,6 +19,7 @@ foo foo-3.0.0 foo-3.0.1 foo-0.5 +2.6.20 foo-0.4b foo-3.10 foo-3.2 diff --git a/sysdeps/x86_64/memchr.S b/sysdeps/x86_64/memchr.S new file mode 100644 index 0000000000..15484cb9f3 --- /dev/null +++ b/sysdeps/x86_64/memchr.S @@ -0,0 +1,67 @@ +/* strlen(str) -- determine the length of the string STR. + Copyright (C) 2009 Free Software Foundation, Inc. + Contributed by Ulrich Drepper . + 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include + + + .text +ENTRY (memchr) + movd %esi, %xmm1 + movq %rdi, %rcx + punpcklbw %xmm1, %xmm1 + andq $~15, %rdi + punpcklbw %xmm1, %xmm1 + orl $0xffffffff, %esi + movdqa (%rdi), %xmm0 + pshufd $0, %xmm1, %xmm1 + subq %rdi, %rcx + pcmpeqb %xmm1, %xmm0 + addq %rcx, %rdx + shl %cl, %esi + pmovmskb %xmm0, %ecx + andl %esi, %ecx + movl $0, %esi + jnz 1f + cmpq %rsi, %rdx + jle 3f + +2: movdqa 16(%rdi,%rsi), %xmm0 + leaq 16(%rsi), %rsi + pcmpeqb %xmm1, %xmm0 + pmovmskb %xmm0, %ecx + testl %ecx, %ecx + jnz 1f + cmpq %rsi, %rdx + jg 2b + +3: xorl %eax, %eax + ret + +1: leaq (%rdi,%rsi), %rax + bsfl %ecx, %ecx + addq %rcx, %rax + addq %rcx, %rsi + cmpq %rsi, %rdx + jle 3b + ret +END (memchr) + +strong_alias (memchr, __memchr) +libc_hidden_builtin_def (memchr) diff --git a/sysdeps/x86_64/strlen.S b/sysdeps/x86_64/strlen.S index b83332c90c..86bb8a50a9 100644 --- a/sysdeps/x86_64/strlen.S +++ b/sysdeps/x86_64/strlen.S @@ -21,6 +21,7 @@ #include + .text ENTRY(strlen) movq %rdi, %rcx movq %rdi, %r8 -- cgit v1.2.3