Mon Aug 19 02:20:06 2013 UTC ()
ip -> r2
teq -> cmp


(matt)
diff -r1.1 -r1.2 src/common/lib/libc/arch/arm/string/strchr_naive.S
cvs diff -r1.1 -r1.2 src/common/lib/libc/arch/arm/string/strchr_naive.S (expand / switch to unified diff)

--- src/common/lib/libc/arch/arm/string/strchr_naive.S 2013/01/15 02:03:30 1.1
+++ src/common/lib/libc/arch/arm/string/strchr_naive.S 2013/08/19 02:20:06 1.2
@@ -18,27 +18,27 @@ @@ -18,27 +18,27 @@
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
19 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 19 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
20 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 20 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
21 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 21 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
22 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 22 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27 * POSSIBILITY OF SUCH DAMAGE. 27 * POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29#include <machine/asm.h> 29#include <machine/asm.h>
30 30
31RCSID("$NetBSD: strchr_naive.S,v 1.1 2013/01/15 02:03:30 matt Exp $") 31RCSID("$NetBSD: strchr_naive.S,v 1.2 2013/08/19 02:20:06 matt Exp $")
32 32
33/* LINTSTUB: char * strchr(const char *, int) */ 33/* LINTSTUB: char * strchr(const char *, int) */
34ENTRY(strchr) 34ENTRY(strchr)
35 mov ip, r0 /* using r0 as return value */ 35 mov r2, r0 /* using r0 as return value */
36 mov r0, #0 /* default to no match */ 36 mov r0, #0 /* default to no match */
37 and r1, r1, #0xff /* restrict to a byte value */ 37 and r1, r1, #0xff /* restrict to a byte value */
381: ldrb r3, [ip], #1 /* read a byte */ 381: ldrb r3, [r2], #1 /* read a byte */
39 cmp r3, r1 /* does it match? */ 39 cmp r3, r1 /* does it match? */
40 subeq r0, ip, #1 /* yes, set return value to point to it */ 40 subeq r0, r2, #1 /* yes, set return value to point to it */
41 teqne r3, #0 /* no, was it a NUL? */ 41 cmpne r3, #0 /* no, was it a NUL? */
42 bne 1b /* no, get next byte */ 42 bne 1b /* no, get next byte */
43 RET 43 RET
44END(strchr) 44END(strchr)