diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-06-16 10:23:31 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-06-16 10:23:31 -0700 |
| commit | fab8238de69de67637d21923b3ec1c26e4ce8450 (patch) | |
| tree | c5e43b38acd54f9f46d3856a9b71d22b70ce1b3d | |
| parent | 435aa54b3b9c1c87498e8bb3831394fd42220fa7 (diff) | |
| download | glibc-fab8238de69de67637d21923b3ec1c26e4ce8450.tar.gz glibc-fab8238de69de67637d21923b3ec1c26e4ce8450.tar.xz glibc-fab8238de69de67637d21923b3ec1c26e4ce8450.zip | |
Fix x86-64 memchr for large lengths.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | string/test-memchr.c | 9 | ||||
| -rw-r--r-- | sysdeps/x86_64/memchr.S | 6 |
3 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 020b25f74e..85ab3dab50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-06-16 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/x86_64/memchr.S (memchr): Use unsigned instead of signed + comparisons. + * string/test-memchr.c (do_random_tests): Test very large lengths + as well. + 2009-06-02 H.J. Lu <hongjiu.lu@intel.com> * Makeconfig (+link-pie): Define. diff --git a/string/test-memchr.c b/string/test-memchr.c index c233ead5dd..cd9a01e3da 100644 --- a/string/test-memchr.c +++ b/string/test-memchr.c @@ -1,5 +1,5 @@ /* Test and measure memchr functions. - Copyright (C) 1999, 2002, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek <jakub@redhat.com>, 1999. @@ -144,7 +144,12 @@ do_random_tests (void) } if (pos < len) - result = (char *) (p + pos + align); + { + size_t r = random (); + if ((r & 31) == 0) + len = ~(uintptr_t) (p + align) - ((r >> 5) & 31); + result = (char *) (p + pos + align); + } else result = NULL; diff --git a/sysdeps/x86_64/memchr.S b/sysdeps/x86_64/memchr.S index 54b7af534c..6082aa7f76 100644 --- a/sysdeps/x86_64/memchr.S +++ b/sysdeps/x86_64/memchr.S @@ -41,7 +41,7 @@ ENTRY (memchr) movl $16, %esi jnz 1f cmpq %rsi, %rdx - jle 3f + jbe 3f 2: movdqa (%rdi,%rsi), %xmm0 leaq 16(%rsi), %rsi @@ -50,7 +50,7 @@ ENTRY (memchr) testl %ecx, %ecx jnz 1f cmpq %rsi, %rdx - jg 2b + ja 2b 3: xorl %eax, %eax ret @@ -60,7 +60,7 @@ ENTRY (memchr) addq %rcx, %rax leaq -16(%rsi,%rcx), %rsi cmpq %rsi, %rdx - jle 3b + jbe 3b ret END (memchr) |