From: Richard Li Date: Mon, 25 Oct 2010 18:13:17 +0000 (-0400) Subject: Fix x86-64 strchr propagation of search byte into all bytes of SSE register X-Git-Tag: glibc-2.12.2~59 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be75fb29ec9f1d7dfc2e91b74b5ffefeaaa9aeb6;p=thirdparty%2Fglibc.git Fix x86-64 strchr propagation of search byte into all bytes of SSE register (cherry picked from commit dbf3a06904168417a05882a871342e7a9ee3b383) --- diff --git a/ChangeLog b/ChangeLog index a8e764c37b5..cbab7a5a485 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-10-25 Ulrich Drepper + + [BZ #12159] + * sysdeps/x86_64/multiarch/strchr.S: Fix propagation of search byte + into all bytes of SSE register. + Patch by Richard Li . + 2010-10-22 Andreas Schwab * include/dlfcn.h (__RTLD_SECURE): Define. diff --git a/sysdeps/x86_64/multiarch/strchr.S b/sysdeps/x86_64/multiarch/strchr.S index 27eead9852e..71845a35fe0 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