diff options
| author | matt <matt@NetBSD.org> | 2008-10-14 03:16:20 +0000 |
|---|---|---|
| committer | matt <matt@NetBSD.org> | 2008-10-14 03:16:20 +0000 |
| commit | 01a00ce83ad9d677b464fd655c0ae8a41ccc8d56 (patch) | |
| tree | 79ff85b3fef0836d2ef186b728c09bde66cf3d37 /sys/lib | |
| parent | 8a7a4b818457e51741edd5f1757b3e29e84ff5da (diff) | |
Add a _clzsi2 for armv4 platforms.
Diffstat (limited to 'sys/lib')
| -rw-r--r-- | sys/lib/libkern/arch/arm/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/lib/libkern/arch/arm/clzsi2.S | 89 |
2 files changed, 91 insertions, 2 deletions
diff --git a/sys/lib/libkern/arch/arm/Makefile.inc b/sys/lib/libkern/arch/arm/Makefile.inc index 5cd2e5663db..dd355427d49 100644 --- a/sys/lib/libkern/arch/arm/Makefile.inc +++ b/sys/lib/libkern/arch/arm/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.6 2002/11/23 14:29:29 chris Exp $ +# $NetBSD: Makefile.inc,v 1.7 2008/10/14 03:16:20 matt Exp $ SRCS+= __assert.c __main.c bswap64.c byte_swap_2.S byte_swap_4.S \ ffs.S imax.c imin.c lmax.c lmin.c max.c min.c random.c scanc.c \ @@ -6,5 +6,5 @@ SRCS+= __assert.c __main.c bswap64.c byte_swap_2.S byte_swap_4.S \ strcpy.c strlen.c strncasecmp.c \ strncpy.c strtoul.c ulmax.c ulmin.c -SRCS+= divsi3.S +SRCS+= divsi3.S clzsi2.S SRCS+= memchr.c memcmp.S memcpy.S memset.S memmove.S strcmp.S strncmp.S diff --git a/sys/lib/libkern/arch/arm/clzsi2.S b/sys/lib/libkern/arch/arm/clzsi2.S new file mode 100644 index 00000000000..579ce5e946a --- /dev/null +++ b/sys/lib/libkern/arch/arm/clzsi2.S @@ -0,0 +1,89 @@ +/*- + * Copyright (c) 2008 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas <matt@3am-software.com> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#include <machine/asm.h> + + .text +ENTRY(_clzdi2) + movs r3, r0 + movne r0, #31 + bne .L_clz + movs r3, r1 + movne r0, #63 + bne .L_clz + mov r0, #64 + bx lr +END(_clzdi2) + + +ENTRY(_clzsi2) + movs r3, r0 + moveq r0, #32 + bxeq lr + mov r0, #31 +.L_clz: + mvn r1, #0 +#ifndef __OPTIMIZE_SIZE__ + eor r1, r1, r1, lsr #16 /* 0xFFFFFFFF -> 0xFFFF0000 */ + ands r2, r3, r1 + eorne r0, r0, #16 + movne r3, r2 + eor r1, r1, r1, lsr #8 /* 0xFFFF0000 -> 0xFF00FF00 */ + ands r2, r3, r1 + eorne r0, r0, #8 + movne r3, r2 + eor r1, r1, r1, lsr #4 /* 0xFF00FF00 -> 0xF0F0F0F0 */ + ands r2, r3, r1 + eorne r0, r0, #4 + movne r3, r2 + eor r1, r1, r1, lsr #2 /* 0xF0F0F0F0 -> 0xCCCCCCCC */ + ands r2, r3, r1 + eorne r0, r0, #2 + movne r3, r2 + eor r1, r1, r1, lsr #1 /* 0xCCCCCCCC -> 0xAAAAAAAA */ + ands r2, r3, r1 + eorne r0, r0, #1 +#if 0 + teqeq r3, #0 + addeq r0, r0, #1 +#endif +#else + mov r2, #16 +1: eor r1, r1, r1, lsr r2 + ands ip, r3, r1 + movne r3, ip + eorne r0, r0, r2 + movs r2, r2, lsr #1 + bne 1b +#if 0 + teq r3, #0 + addeq r0, r0, #1 +#endif +#endif + bx lr +END(_clzsi2) |
