diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2011-04-17 22:03:53 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-04-17 22:03:53 -0400 |
| commit | 4420675c9d361643d1179ad67e0bb35c8fbdd1ce (patch) | |
| tree | ed77b603e1b450eab5bcc27d78ce246bf87a5260 /sysdeps/powerpc | |
| parent | 75ea32abcde4e1699328354e1804ea94560d2950 (diff) | |
| download | glibc-4420675c9d361643d1179ad67e0bb35c8fbdd1ce.tar.gz glibc-4420675c9d361643d1179ad67e0bb35c8fbdd1ce.tar.xz glibc-4420675c9d361643d1179ad67e0bb35c8fbdd1ce.zip | |
Fix POWER4/POWER7 optimized strncmp to not read past differing bytes
Diffstat (limited to 'sysdeps/powerpc')
| -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 |
4 files changed, 24 insertions, 20 deletions
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 |