Module Name: src
Committed By: matt
Date: Sun Aug 11 05:02:36 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/string: ffs.S strcpy_naive.S
strlcat_naive.S
Log Message:
Convert some more conditional instructions to unified syntax
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/arm/string/ffs.S \
src/common/lib/libc/arch/arm/string/strcpy_naive.S
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/string/strlcat_naive.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/string/ffs.S
diff -u src/common/lib/libc/arch/arm/string/ffs.S:1.2 src/common/lib/libc/arch/arm/string/ffs.S:1.3
--- src/common/lib/libc/arch/arm/string/ffs.S:1.2 Sun Jul 3 07:13:31 2011
+++ src/common/lib/libc/arch/arm/string/ffs.S Sun Aug 11 05:02:35 2013
@@ -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 @@ ENTRY(ffs)
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;
Index: src/common/lib/libc/arch/arm/string/strcpy_naive.S
diff -u src/common/lib/libc/arch/arm/string/strcpy_naive.S:1.2 src/common/lib/libc/arch/arm/string/strcpy_naive.S:1.3
--- src/common/lib/libc/arch/arm/string/strcpy_naive.S:1.2 Thu Jan 10 02:08:22 2013
+++ src/common/lib/libc/arch/arm/string/strcpy_naive.S Sun Aug 11 05:02:35 2013
@@ -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 @@ ENTRY(strncpy)
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)
Index: src/common/lib/libc/arch/arm/string/strlcat_naive.S
diff -u src/common/lib/libc/arch/arm/string/strlcat_naive.S:1.1 src/common/lib/libc/arch/arm/string/strlcat_naive.S:1.2
--- src/common/lib/libc/arch/arm/string/strlcat_naive.S:1.1 Fri Jan 18 22:49:11 2013
+++ src/common/lib/libc/arch/arm/string/strlcat_naive.S Sun Aug 11 05:02:35 2013
@@ -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 @@ ENTRY(strlcat)
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 */
