PowerPC: fix POWER7 memrchr for some large inputs

diff --git a/ChangeLog b/ChangeLog
index 5ff3fa41ca15b1aa2a3b8d297118aee7499da131..61494ca6339c992451976099cfe0a693f09e784b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-05  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+       * sysdeps/powerpc/powerpc32/power7/memrchr.S (__memrchr): Fix invalid
+       memory access for final bytes in some large inputs.
+       * sysdeps/powerpc/powerpc64/power7/memrchr.S (__memrchr): Likewise.
+
 2013-09-05  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
        * string/test-memrchr.c: New file.

diff --git a/sysdeps/powerpc/powerpc32/power7/memrchr.S b/sysdeps/powerpc/powerpc32/power7/memrchr.S
index d1e3fda12537aaf6d4ded78425ff983911df8569..defd832b0ac6d46c9d305627df5ffefbbbaac212 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power7/memrchr.S
+++ b/sysdeps/powerpc/powerpc32/power7/memrchr.S
@@ -101,8 +101,8 @@ L(loop):
        /* We're here because the counter reached 0, and that means we
           didn't have any matches for BYTE in the whole range.  Just return
           the original range.  */
-       addi    r9,r8,4
-       cmplw   cr6,r9,r7
+       addi    r8,r8,4
+       cmplw   cr6,r8,r7
        bgt     cr6,L(loop_small)
        b       L(null)
 

diff --git a/sysdeps/powerpc/powerpc64/power7/memrchr.S b/sysdeps/powerpc/powerpc64/power7/memrchr.S
index d24fbbb1b940b70e08a40231725862bd5db67c6e..c49995210cea06465d336def1894a3fd98035502 100644 (file)
--- a/sysdeps/powerpc/powerpc64/power7/memrchr.S
+++ b/sysdeps/powerpc/powerpc64/power7/memrchr.S
@@ -102,8 +102,8 @@ L(loop):
        /* We're here because the counter reached 0, and that means we
           didn't have any matches for BYTE in the whole range.  Just return
           the original range.  */
-       addi    r9,r8,8
-       cmpld   cr6,r9,r7
+       addi    r8,r8,8
+       cmpld   cr6,r8,r7
        bgt     cr6,L(loop_small)
        b       L(null)