diff options
author | Andreas Schwab <schwab@linux-m68k.org> | 2011-04-17 22:03:53 -0400 |
---|---|---|
committer | Ryan S. Arnold <rsa@us.ibm.com> | 2011-05-03 17:05:17 -0500 |
commit | c2b8191991e549895215d44a32fba567d747af90 (patch) | |
tree | ae1d87560684561ace2f8a05c6d6afd38c2443b8 | |
parent | e6121c8630ab06267036872230889caf8ab54123 (diff) | |
download | glibc-c2b8191991e549895215d44a32fba567d747af90.tar glibc-c2b8191991e549895215d44a32fba567d747af90.tar.gz glibc-c2b8191991e549895215d44a32fba567d747af90.tar.bz2 glibc-c2b8191991e549895215d44a32fba567d747af90.zip |
Fix POWER4/POWER7 optimized strncmp to not read past differing bytes
(cherry picked from commit 4420675c9d361643d1179ad67e0bb35c8fbdd1ce)
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc32/power4/strncmp.S | 11 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc32/power7/strncmp.S | 11 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc64/power4/strncmp.S | 11 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc64/power7/strncmp.S | 11 |
5 files changed, 32 insertions, 20 deletions
@@ -1,3 +1,11 @@ +2011-03-28 Andreas Schwab <schwab@linux-m68k.org> + + * sysdeps/powerpc/powerpc32/power4/strncmp.S: Don't read past + differing bytes. + * sysdeps/powerpc/powerpc64/power4/strncmp.S: Likewise. + * sysdeps/powerpc/powerpc32/power7/strncmp.S: Likewise. + * sysdeps/powerpc/powerpc64/power7/strncmp.S: Likewise. + 2011-04-10 Ulrich Drepper <drepper@gmail.com> [BZ #12650] diff --git a/sysdeps/powerpc/powerpc32/power4/strncmp.S b/sysdeps/powerpc/powerpc32/power4/strncmp.S index fc0835ebe0..f5d47af1eb 100644 --- a/sysdeps/powerpc/powerpc32/power4/strncmp.S +++ b/sysdeps/powerpc/powerpc32/power4/strncmp.S @@ -1,5 +1,5 @@ /* Optimized strcmp implementation for PowerPC32. - Copyright (C) 2003, 2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2006, 2011 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 @@ -139,30 +139,31 @@ L(u1): bdz L(u4) cmpw rWORD1, rWORD2 beq- cr1, L(u4) + bne- L(u4) lbzu rWORD3, 1(rSTR1) lbzu rWORD4, 1(rSTR2) - bne- L(u4) cmpwi cr1, rWORD3, 0 bdz L(u3) cmpw rWORD3, rWORD4 beq- cr1, L(u3) + bne- L(u3) lbzu rWORD1, 1(rSTR1) lbzu rWORD2, 1(rSTR2) - bne- L(u3) cmpwi cr1, rWORD1, 0 bdz L(u4) cmpw rWORD1, rWORD2 beq- cr1, L(u4) + bne- L(u4) lbzu rWORD3, 1(rSTR1) lbzu rWORD4, 1(rSTR2) - bne- L(u4) cmpwi cr1, rWORD3, 0 bdz L(u3) cmpw rWORD3, rWORD4 beq- cr1, L(u3) + bne- L(u3) lbzu rWORD1, 1(rSTR1) lbzu rWORD2, 1(rSTR2) - beq+ L(u1) + b L(u1) L(u3): sub rRTN, rWORD3, rWORD4 blr diff --git a/sysdeps/powerpc/powerpc32/power7/strncmp.S b/sysdeps/powerpc/powerpc32/power7/strncmp.S index ba72d0a029..7ee9e03e7a 100644 --- a/sysdeps/powerpc/powerpc32/power7/strncmp.S +++ b/sysdeps/powerpc/powerpc32/power7/strncmp.S @@ -1,5 +1,5 @@ /* Optimized strcmp implementation for POWER7/PowerPC32. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 2010, 2011 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 @@ -141,30 +141,31 @@ L(u1): bdz L(u4) cmpw rWORD1,rWORD2 beq cr1,L(u4) + bne L(u4) lbzu rWORD3,1(rSTR1) lbzu rWORD4,1(rSTR2) - bne L(u4) cmpwi cr1,rWORD3,0 bdz L(u3) cmpw rWORD3,rWORD4 beq cr1,L(u3) + bne L(u3) lbzu rWORD1,1(rSTR1) lbzu rWORD2,1(rSTR2) - bne L(u3) cmpwi cr1,rWORD1,0 bdz L(u4) cmpw rWORD1,rWORD2 beq cr1,L(u4) + bne L(u4) lbzu rWORD3,1(rSTR1) lbzu rWORD4,1(rSTR2) - bne L(u4) cmpwi cr1,rWORD3,0 bdz L(u3) cmpw rWORD3,rWORD4 beq cr1,L(u3) + bne L(u3) lbzu rWORD1,1(rSTR1) lbzu rWORD2,1(rSTR2) - beq L(u1) + b L(u1) L(u3): sub rRTN,rWORD3,rWORD4 blr diff --git a/sysdeps/powerpc/powerpc64/power4/strncmp.S b/sysdeps/powerpc/powerpc64/power4/strncmp.S index 7a1665d2bc..94ae85b9e4 100644 --- a/sysdeps/powerpc/powerpc64/power4/strncmp.S +++ b/sysdeps/powerpc/powerpc64/power4/strncmp.S @@ -1,5 +1,5 @@ /* Optimized strcmp implementation for PowerPC64. - Copyright (C) 2003, 2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2006, 2011 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 @@ -143,30 +143,31 @@ L(u1): bdz L(u4) cmpd rWORD1, rWORD2 beq- cr1, L(u4) + bne- L(u4) lbzu rWORD3, 1(rSTR1) lbzu rWORD4, 1(rSTR2) - bne- L(u4) cmpdi cr1, rWORD3, 0 bdz L(u3) cmpd rWORD3, rWORD4 beq- cr1, L(u3) + bne- L(u3) lbzu rWORD1, 1(rSTR1) lbzu rWORD2, 1(rSTR2) - bne- L(u3) cmpdi cr1, rWORD1, 0 bdz L(u4) cmpd rWORD1, rWORD2 beq- cr1, L(u4) + bne- L(u4) lbzu rWORD3, 1(rSTR1) lbzu rWORD4, 1(rSTR2) - bne- L(u4) cmpdi cr1, rWORD3, 0 bdz L(u3) cmpd rWORD3, rWORD4 beq- cr1, L(u3) + bne- L(u3) lbzu rWORD1, 1(rSTR1) lbzu rWORD2, 1(rSTR2) - beq+ L(u1) + b L(u1) L(u3): sub rRTN, rWORD3, rWORD4 blr diff --git a/sysdeps/powerpc/powerpc64/power7/strncmp.S b/sysdeps/powerpc/powerpc64/power7/strncmp.S index 34f1e52df9..5ee5e2eafa 100644 --- a/sysdeps/powerpc/powerpc64/power7/strncmp.S +++ b/sysdeps/powerpc/powerpc64/power7/strncmp.S @@ -1,5 +1,5 @@ /* Optimized strcmp implementation for POWER7/PowerPC64. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 2010, 2011 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 @@ -145,30 +145,31 @@ L(u1): bdz L(u4) cmpd rWORD1,rWORD2 beq cr1,L(u4) + bne L(u4) lbzu rWORD3,1(rSTR1) lbzu rWORD4,1(rSTR2) - bne L(u4) cmpdi cr1,rWORD3,0 bdz L(u3) cmpd rWORD3,rWORD4 beq cr1,L(u3) + bne L(u3) lbzu rWORD1,1(rSTR1) lbzu rWORD2,1(rSTR2) - bne L(u3) cmpdi cr1,rWORD1,0 bdz L(u4) cmpd rWORD1,rWORD2 beq cr1,L(u4) + bne L(u4) lbzu rWORD3,1(rSTR1) lbzu rWORD4,1(rSTR2) - bne L(u4) cmpdi cr1,rWORD3,0 bdz L(u3) cmpd rWORD3,rWORD4 beq cr1,L(u3) + bne L(u3) lbzu rWORD1,1(rSTR1) lbzu rWORD2,1(rSTR2) - beq L(u1) + b L(u1) L(u3): sub rRTN,rWORD3,rWORD4 blr |