diff options
| author | Richard Li <richardpku@gmail.com> | 2010-10-25 14:13:17 -0400 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2010-11-01 22:29:35 +0100 |
| commit | 0cd8f10947cd557d35175cab5f38c4e38fab646a (patch) | |
| tree | 91e9b7196b94d1001477569c72cf5c7cba362560 | |
| parent | cd8ba92d3437c83cefdc31ed493cc3731ceec356 (diff) | |
| download | glibc-0cd8f10947cd557d35175cab5f38c4e38fab646a.tar.gz glibc-0cd8f10947cd557d35175cab5f38c4e38fab646a.tar.xz glibc-0cd8f10947cd557d35175cab5f38c4e38fab646a.zip | |
Fix x86-64 strchr propagation of search byte into all bytes of SSE register
(cherry picked from commit dbf3a06904168417a05882a871342e7a9ee3b383)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/strchr.S | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 69117a6d3c..88a0dc5a84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-10-25 Ulrich Drepper <drepper@redhat.com> + + [BZ #12159] + * sysdeps/x86_64/multiarch/strchr.S: Fix propagation of search byte + into all bytes of SSE register. + Patch by Richard Li <richardpku@gmail.com>. + 2010-10-22 Andreas Schwab <schwab@redhat.com> * include/dlfcn.h (__RTLD_SECURE): Define. diff --git a/sysdeps/x86_64/multiarch/strchr.S b/sysdeps/x86_64/multiarch/strchr.S index b35566d1a5..44538aaa81 100644 --- a/sysdeps/x86_64/multiarch/strchr.S +++ b/sysdeps/x86_64/multiarch/strchr.S @@ -1,5 +1,5 @@ /* strchr with SSE4.2 - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009, 2010 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 @@ -87,13 +87,13 @@ __strchr_sse42: pxor %xmm2, %xmm2 movd %esi, %xmm1 movl %edi, %ecx + pshufb %xmm2, %xmm1 andl $15, %ecx movq %rdi, %r8 je L(aligned_start) /* Handle unaligned string. */ andq $-16, %r8 - pshufb %xmm2, %xmm1 movdqa (%r8), %xmm0 pcmpeqb %xmm0, %xmm2 pcmpeqb %xmm1, %xmm0 |