[src/trunk]: src/common/lib/libc/arch/arm/string Thumbify

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

details:   https://anonhg.NetBSD.org/src/rev/c50b67924c12
branches:  trunk
changeset: 789425:c50b67924c12
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Aug 19 00:56:12 2013 +0000

description:
Thumbify

diffstat:

 common/lib/libc/arch/arm/string/strcmp.S  |  20 ++++++++++++++----
 common/lib/libc/arch/arm/string/strncmp.S |  32 ++++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 8 deletions(-)

diffs (98 lines):

diff -r 121a4a78e49a -r c50b67924c12 common/lib/libc/arch/arm/string/strcmp.S
--- a/common/lib/libc/arch/arm/string/strcmp.S  Mon Aug 19 00:36:29 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strcmp.S  Mon Aug 19 00:56:12 2013 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: strcmp.S,v 1.1 2005/12/20 19:28:49 christos Exp $ */
+/*      $NetBSD: strcmp.S,v 1.2 2013/08/19 00:56:12 matt Exp $ */
 
 /*
  * Copyright (c) 2002 ARM Ltd
@@ -30,14 +30,24 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: strcmp.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+RCSID("$NetBSD: strcmp.S,v 1.2 2013/08/19 00:56:12 matt Exp $")
 
 ENTRY(strcmp)
-1:
-       ldrb    r2, [r0], #1
+#if !defined(__thumb__)
+1:     ldrb    r2, [r0], #1
        ldrb    r3, [r1], #1
        cmp     r2, #1
        cmpcs   r2, r3
+#else
+       subs    r1, r1, r0      /* this allows us to only one increment */
+1:     ldrb    r2, [r0]
+       ldrb    r3, [r1, r0]
+       adds    r0, r0, #1      /* increment */
+       cmp     r2, #1
+       bcc     2f
+       cmp     r2, r3
+#endif
        beq     1b
-       sub     r0, r2, r3
+2:     subs    r0, r2, r3
        RET
+END(strcmp)
diff -r 121a4a78e49a -r c50b67924c12 common/lib/libc/arch/arm/string/strncmp.S
--- a/common/lib/libc/arch/arm/string/strncmp.S Mon Aug 19 00:36:29 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strncmp.S Mon Aug 19 00:56:12 2013 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: strncmp.S,v 1.1 2005/12/20 19:28:49 christos Exp $ */
+/*      $NetBSD: strncmp.S,v 1.2 2013/08/19 00:57:25 matt Exp $ */
 
 /*
  * Copyright (c) 2002 ARM Ltd
@@ -30,22 +30,48 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: strncmp.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+RCSID("$NetBSD: strncmp.S,v 1.2 2013/08/19 00:57:25 matt Exp $")
 
 ENTRY(strncmp)
 /* if ((len - 1) < 0) return 0 */
        subs    r2, r2, #1
+#ifdef __thumb__
+       bmi     5f
+#else
        movmi   r0, #0
        RETc(mi)
+#endif
 
 /* ip == last src address to compare */
+#ifdef __thumb__
+       adds    r3, r0, r2
+       mov     ip, r3
+       subs    r1, r1, r0
+#else
        add     ip, r0, r2
+#endif
 1:
+#ifdef __thumb__
+       ldrb    r2, [r0]
+       ldrb    r3, [r1, r0]
+       adds    r0, r0, #1
+       cmp     ip, r0          /* exhausted length? */
+       bcc     4f              /*   yes, we're done */
+       cmp     r2, #1          /* NUL? */
+       bcc     4f              /*   yes, we're done */
+       cmp     r2, r3          /* different? */
+#else
        ldrb    r2, [r0], #1
        ldrb    r3, [r1], #1
        cmp     ip, r0
        cmpcs   r2, #1
        cmpcs   r2, r3
+#endif
        beq     1b
-       sub     r0, r2, r3
+4:     subs    r0, r2, r3
        RET
+#ifdef __thumb__
+5:     movs    r0, #0
+       RET
+#endif
+END(strncmp)