summaryrefslogtreecommitdiff
path: root/lib/libc/arm/string
diff options
context:
space:
mode:
authorStanislav Sedov <stas@FreeBSD.org>2009-08-15 15:41:10 +0000
committerStanislav Sedov <stas@FreeBSD.org>2009-08-15 15:41:10 +0000
commite9adb9bbc7f9c24f8cea23439fb666a42026e0ec (patch)
tree358c7a8997d40cea9e73b307f7fddd42f9625d0d /lib/libc/arm/string
parent4c43a87308556604be218508ad01e2384fe1a13f (diff)
Notes
Diffstat (limited to 'lib/libc/arm/string')
-rw-r--r--lib/libc/arm/string/strncmp.S14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/libc/arm/string/strncmp.S b/lib/libc/arm/string/strncmp.S
index d172264bd8686..5beff413614f5 100644
--- a/lib/libc/arm/string/strncmp.S
+++ b/lib/libc/arm/string/strncmp.S
@@ -33,13 +33,17 @@
__FBSDID("$FreeBSD$");
ENTRY(strncmp)
-/* if ((len - 1) < 0) return 0 */
- subs r2, r2, #1
- movmi r0, #0
- movmi pc, lr
+/* if (len == 0) return 0 */
+ cmp r2, #0
+ moveq r0, #0
+ moveq pc, lr
/* ip == last src address to compare */
- add ip, r0, r2
+ adds ip, r0, r2
+ sub ip, ip, #1
+/* Use last possible address on overflow. */
+ movcs ip, #0
+ subcs ip, ip, #1
1:
ldrb r2, [r0], #1
ldrb r3, [r1], #1