[src/trunk]: src/common/lib/libc/arch/aarch64/string aarch64/strlen.S didn't ...

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

details:   https://anonhg.NetBSD.org/src/rev/cf6190674c2a
branches:  trunk
changeset: 826218:cf6190674c2a
user:      ryo <ryo%NetBSD.org@localhost>
date:      Tue Aug 22 06:45:07 2017 +0000

description:
aarch64/strlen.S didn't work. fixed some bugs.

diffstat:

 common/lib/libc/arch/aarch64/string/strlen.S |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r c3c6129bdf63 -r cf6190674c2a common/lib/libc/arch/aarch64/string/strlen.S
--- a/common/lib/libc/arch/aarch64/string/strlen.S      Tue Aug 22 02:36:48 2017 +0000
+++ b/common/lib/libc/arch/aarch64/string/strlen.S      Tue Aug 22 06:45:07 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: strlen.S,v 1.1 2014/08/10 05:47:35 matt Exp $ */
+/* $NetBSD: strlen.S,v 1.2 2017/08/22 06:45:07 ryo Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: strlen.S,v 1.1 2014/08/10 05:47:35 matt Exp $")
+RCSID("$NetBSD: strlen.S,v 1.2 2017/08/22 06:45:07 ryo Exp $")
 
 #ifdef STRNLEN
 #define FUNCNAME       strnlen
@@ -47,6 +47,7 @@
 ENTRY(FUNCNAME)
        mov     x4, x0                  /* need x0 for return */
        add     x9, x0, #8              /* start + dword */
+       bic     x9, x9, #7              /* and aligned */
 #ifdef STRNLEN
        add     x10, x0, x1             /* don't go past here */
 #endif
@@ -93,16 +94,16 @@
         * We know there is a NUL in this dword.  Use clz to find it.
         */
 #ifdef __AARCH64EL__
-       rev     x7, x7                  /* convert to BE */
+       rev     x6, x6                  /* convert to BE */
 #endif
-       clz     x7, x7                  /* find null byte */
-       add     x0, x0, x7, lsr #3      /* add offset to the length */
+       clz     x6, x6                  /* find null byte */
+       add     x0, x0, x6, lsr #3      /* add offset to the length */
 
        add     x0, x0, x4              /* add end to the length */
        sub     x0, x0, x9              /* subtract start from the length */
 #ifdef STRNLEN
        cmp     x0, x1                  /* did we go too far? */
-        csel    x0, x0, x1, lt         /* yes, return max length */
+       csel    x0, x0, x1, lt          /* yes, return max length */
 #endif
        ret
 #ifdef STRNLEN