[src/trunk]: src/common/lib/libc/arch/arm/string teq -> cmp

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/18d097de0376
branches:  trunk
changeset: 789430:18d097de0376
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Aug 19 02:07:22 2013 +0000

description:
teq -> cmp
ip -> r2
add/sub -> adds/subs
(thumbify part 1)

diffstat:

 common/lib/libc/arch/arm/string/strlen_naive.S |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (45 lines):

diff -r c912a43b792d -r 18d097de0376 common/lib/libc/arch/arm/string/strlen_naive.S
--- a/common/lib/libc/arch/arm/string/strlen_naive.S    Mon Aug 19 01:17:32 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strlen_naive.S    Mon Aug 19 02:07:22 2013 +0000
@@ -28,19 +28,19 @@
  */
 #include <machine/asm.h>
 
-RCSID("$NetBSD: strlen_naive.S,v 1.3 2013/01/23 06:59:55 matt Exp $")
+RCSID("$NetBSD: strlen_naive.S,v 1.4 2013/08/19 02:07:22 matt Exp $")
 
 #ifdef STRNLEN
 /* LINTSTUB: size_t strnlen(const char *, size_t) */
 ENTRY(strnlen)
-       add     ip, r0, #1      /* start of src + NUL */
-       add     r2, r0, r1      /* &src[maxlen] */
+       adds    r2, r0, #1      /* start of src + NUL */
+       adds    r2, r0, r1      /* &src[maxlen] */
 1:     cmp     r0, r2          /* is this of string? */
        beq     2f              /*   yes it is */
        ldrb    r3, [r0], #1    /* read a byte */
-       teq     r3, #0          /* is it a NUL? */
+       cmp     r3, #0          /* is it a NUL? */
        bne     1b              /*   no, get next byte */
-       sub     r0, r0, ip      /* get difference between start and end */
+       subs    r0, r0, r2      /* get difference between start and end */
        RET                     /* return */
 2:     mov     r0, r1          /* get maxlen */
        RET                     /* return */
@@ -48,11 +48,12 @@
 #else /* STRNLEN */
 /* LINTSTUB: size_t strlen(const char *) */
 ENTRY(strlen)
-       add     ip, r0, #1      /* start of src + NUL */
-1:     ldrb    r3, [r0], #1    /* read a byte */
-       teq     r3, #0          /* is it a NUL? */
+       adds    r2, r0, #1      /* start of src + NUL */
+1:
+       ldrb    r3, [r0], #1    /* read a byte */
+       cmp     r3, #0          /* is it a NUL? */
        bne     1b              /*   no, get next byte */
-       sub     r0, r0, ip      /* return difference between start and end */
+       subs    r0, r0, r2      /* return difference between start and end */
        RET
 END(strlen)
 #endif /* !STRNLEN */