From 4ca1b3cb841fd3d6e50d62e2e06a9b2ae013498c Mon Sep 17 00:00:00 2001 From: matt Date: Mon, 19 Aug 2013 17:50:04 +0000 Subject: [PATCH] Add two thumb2 bits. --- common/lib/libc/arch/arm/string/strchr_arm.S | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/common/lib/libc/arch/arm/string/strchr_arm.S b/common/lib/libc/arch/arm/string/strchr_arm.S index 45e96897c252..864ce61a8941 100644 --- a/common/lib/libc/arch/arm/string/strchr_arm.S +++ b/common/lib/libc/arch/arm/string/strchr_arm.S @@ -29,7 +29,11 @@ #include -RCSID("$NetBSD: strchr_arm.S,v 1.7 2013/08/19 17:41:47 matt Exp $") +RCSID("$NetBSD: strchr_arm.S,v 1.8 2013/08/19 17:50:04 matt Exp $") + +#if defined(__thumb__) && !defined(_ARM_ARCH_T2) +#error Only Thumb2 or ARM supported +#endif #ifdef __ARMEL__ #define BYTE0 0x000000ff @@ -92,13 +96,20 @@ ENTRY(strchr) * We've encountered a NUL or a match but we don't know which happened * first. */ +#if defined(__thumb__) && defined(_ARM_ARCH_T2) + cbz r2, .Lfind_match /* searching for NUL? yes, find it */ +#else cmp r2, #0 /* searching for NUL? */ beq .Lfind_match /* yes, find the match */ +#endif mvns r1, r1 /* did we encounter a NUL? */ beq .Lfind_match /* no, find the match */ bics r3, r3, r1 /* clear match for the NUL(s) */ beq .Lnomatch /* any left set? if not, no match */ lshis r1, r1, #8 /* replicate NUL bit to other bytes */ +#ifdef __thumb__ + itt ne +#endif orrne r1, r1, r1, lshi #8 /* replicate NUL bit to other bytes */ orrne r1, r1, r1, lshi #8 /* replicate NUL bit to other bytes */ bics r3, r3, r1 /* clear any match bits after the NUL */