Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix case when searching for NUL.

Browse Source
This commit is contained in:
matt 2013-01-15 16:52:35 +00:00
parent 2326b56f19
commit 97ca0f0675
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/lib/libc/arch/arm/string/strchr_arm.S
View File

@ -29,7 +29,7 @@
#include <machine/asm.h>
RCSID("$NetBSD: strchr_arm.S,v 1.1 2013/01/15 02:04:04 matt Exp $")
RCSID("$NetBSD: strchr_arm.S,v 1.2 2013/01/15 16:52:35 matt Exp $")
#ifdef __ARMEL__
#define BYTE0 0x000000ff
@ -92,8 +92,6 @@ ENTRY(strchr)
*/
mvns ip, ip /* did we encounter a NUL? */
beq .Lfind_match /* no, find the match */
eors r3, r3, ip /* remove NUL bit */
beq .Lnomatch /* if no other bits, no match */
movs ip, ip, lshi #8 /* replicate NUL bit to other bytes */
orrne ip, ip, lshi #8 /* replicate NUL bit to other bytes */
orrne ip, ip, lshi #8 /* replicate NUL bit to other bytes */
@ -128,27 +126,30 @@ ENTRY(strchr)
sub r2, r0, #4 /* un post-inc */
mov r0, #0 /* assume no match */
tst r3, #BYTE0 /* is this byte NUL? */
RETc(eq) /* yes, return NULL */
tst ip, #BYTE0 /* does this byte match? */
moveq r0, r2 /* yes, point to it */
RETc(eq) /* and return */
tst r3, #BYTE1 /* is this byte NUL? */
tst r3, #BYTE0 /* is this byte NUL? */
RETc(eq) /* yes, return NULL */
tst ip, #BYTE1 /* does this byte match? */
addeq r0, r2, #1 /* yes, point to it */
RETc(eq) /* and return */
tst r3, #BYTE2 /* is this byte NUL? */
tst r3, #BYTE1 /* is this byte NUL? */
RETc(eq) /* yes, return NULL */
tst ip, #BYTE2 /* does this byte match? */
addeq r0, r2, #2 /* yes, point to it */
RETc(eq) /* and return */
tst r3, #BYTE3 /* is this byte NUL? */
tst r3, #BYTE2 /* is this byte NUL? */
RETc(eq) /* yes, return NULL */
tst ip, #BYTE3 /* does this byte match? */
addeq r0, r2, #3 /* yes, point to it */
/*
* Since no NULs and no matches this must be the only case left.
*/
add r0, r2, #3 /* point to it */
RET /* return */
#endif /* _ARM_ARCH_6 */
END(strchr)