[src/trunk]: src/common/lib/libc/arch/arm/string Convert some more conditiona...

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

details:   https://anonhg.NetBSD.org/src/rev/68536e17153f
branches:  trunk
changeset: 789223:68536e17153f
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Aug 11 05:02:35 2013 +0000

description:
Convert some more conditional instructions to unified syntax

diffstat:

 common/lib/libc/arch/arm/string/ffs.S           |  6 +++---
 common/lib/libc/arch/arm/string/strcpy_naive.S  |  4 ++--
 common/lib/libc/arch/arm/string/strlcat_naive.S |  4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r d1314f84875c -r 68536e17153f common/lib/libc/arch/arm/string/ffs.S
--- a/common/lib/libc/arch/arm/string/ffs.S     Sun Aug 11 04:58:01 2013 +0000
+++ b/common/lib/libc/arch/arm/string/ffs.S     Sun Aug 11 05:02:35 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs.S,v 1.2 2011/07/03 07:13:31 matt Exp $     */
+/*     $NetBSD: ffs.S,v 1.3 2013/08/11 05:02:35 matt Exp $     */
 /*
  * Copyright (c) 2001 Christopher Gilbert
  * All rights reserved.
@@ -30,7 +30,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: ffs.S,v 1.2 2011/07/03 07:13:31 matt Exp $")
+RCSID("$NetBSD: ffs.S,v 1.3 2013/08/11 05:02:35 matt Exp $")
 
 /*
  * ffs - find first set bit, this algorithm isolates the first set
@@ -67,7 +67,7 @@
        rsbne   r0, r0, r0, lsl #16 /* r0 = X * 0x0450fbaf */
               
        /* now lookup in table indexed on top 6 bits of r0 */
-       ldrneb  r0, [ r2, r0, lsr #26 ]
+       ldrbne  r0, [ r2, r0, lsr #26 ]
 
         RET
 .text;
diff -r d1314f84875c -r 68536e17153f common/lib/libc/arch/arm/string/strcpy_naive.S
--- a/common/lib/libc/arch/arm/string/strcpy_naive.S    Sun Aug 11 04:58:01 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strcpy_naive.S    Sun Aug 11 05:02:35 2013 +0000
@@ -28,7 +28,7 @@
  */
 #include <machine/asm.h>
 
-RCSID("$NetBSD: strcpy_naive.S,v 1.2 2013/01/10 02:08:22 matt Exp $")
+RCSID("$NetBSD: strcpy_naive.S,v 1.3 2013/08/11 05:02:35 matt Exp $")
 
 #ifdef _LIBC
 #ifdef STRLCPY
@@ -76,7 +76,7 @@
        teq     r3, #0                  /* was it a NUL? */
        bne     1b                      /*   no, try next byte */
 2:     cmp     ip, r2                  /* are at the end of dst already? */
-       strltb  r3, [ip], #1            /*   no, write a NUL */
+       strblt  r3, [ip], #1            /*   no, write a NUL */
        blt     2b                      /*       until dst is filled */
 3:     RET                             /* return dst pointer */
 END(strncpy)
diff -r d1314f84875c -r 68536e17153f common/lib/libc/arch/arm/string/strlcat_naive.S
--- a/common/lib/libc/arch/arm/string/strlcat_naive.S   Sun Aug 11 04:58:01 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strlcat_naive.S   Sun Aug 11 05:02:35 2013 +0000
@@ -29,7 +29,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: strlcat_naive.S,v 1.1 2013/01/18 22:49:11 matt Exp $")
+RCSID("$NetBSD: strlcat_naive.S,v 1.2 2013/08/11 05:02:35 matt Exp $")
 
 /* LINTSTUB: size_t strlcat(char *, const char *, size_t) */
 ENTRY(strlcat)
@@ -51,7 +51,7 @@
        beq     3f                      /*   yes, end of append */
        add     r0, r0, #1              /* count another byte */
        cmp     ip, r3                  /* do we have enough room for it? */
-       strltb  r2, [ip], #1            /*   yes, store it */
+       strblt  r2, [ip], #1            /*   yes, store it */
        b       2b                      /* get next byte from append */
 
 3:     mov     r2, #0                  /* NUL */