diff options
Diffstat (limited to 'arch/alpha/lib')
| -rw-r--r-- | arch/alpha/lib/Makefile | 2 | ||||
| -rw-r--r-- | arch/alpha/lib/io.c | 91 | ||||
| -rw-r--r-- | arch/alpha/lib/memchr.S | 164 |
3 files changed, 237 insertions, 20 deletions
diff --git a/arch/alpha/lib/Makefile b/arch/alpha/lib/Makefile index 400adf0e1..f550ba7cb 100644 --- a/arch/alpha/lib/Makefile +++ b/arch/alpha/lib/Makefile @@ -5,7 +5,7 @@ OBJS = __divqu.o __remqu.o __divlu.o __remlu.o memset.o memcpy.o io.o \ checksum.o csum_partial_copy.o strlen.o \ strcat.o strcpy.o strncat.o strncpy.o stxcpy.o stxncpy.o \ - strchr.o strrchr.o \ + strchr.o strrchr.o memchr.o \ copy_user.o clear_user.o strncpy_from_user.o strlen_user.o \ csum_ipv6_magic.o strcasecmp.o semaphore.o \ srm_dispatch.o srm_fixup.o srm_puts.o srm_printk.o diff --git a/arch/alpha/lib/io.c b/arch/alpha/lib/io.c index 71ba9d4bf..25de0f871 100644 --- a/arch/alpha/lib/io.c +++ b/arch/alpha/lib/io.c @@ -37,45 +37,96 @@ void _outl(unsigned int b, unsigned long addr) __outl(b, addr); } +unsigned long ___raw_readb(unsigned long addr) +{ + return __readb(addr); +} + +unsigned long ___raw_readw(unsigned long addr) +{ + return __readw(addr); +} + +unsigned long ___raw_readl(unsigned long addr) +{ + return __readl(addr); +} + +unsigned long ___raw_readq(unsigned long addr) +{ + return __readq(addr); +} unsigned long _readb(unsigned long addr) { - return __readb(addr); + unsigned long r = __readb(addr); + mb(); + return r; } unsigned long _readw(unsigned long addr) { - return __readw(addr); + unsigned long r = __readw(addr); + mb(); + return r; } unsigned long _readl(unsigned long addr) { - return __readl(addr); + unsigned long r = __readl(addr); + mb(); + return r; } unsigned long _readq(unsigned long addr) { - return __readq(addr); + unsigned long r = __readq(addr); + mb(); + return r; +} + +void ___raw_writeb(unsigned char b, unsigned long addr) +{ + __writeb(b, addr); +} + +void ___raw_writew(unsigned short b, unsigned long addr) +{ + __writew(b, addr); +} + +void ___raw_writel(unsigned int b, unsigned long addr) +{ + __writel(b, addr); +} + +void ___raw_writeq(unsigned long b, unsigned long addr) +{ + __writeq(b, addr); } void _writeb(unsigned char b, unsigned long addr) { __writeb(b, addr); + mb(); } void _writew(unsigned short b, unsigned long addr) { __writew(b, addr); + mb(); } void _writel(unsigned int b, unsigned long addr) { __writel(b, addr); + mb(); } void _writeq(unsigned long b, unsigned long addr) { __writeq(b, addr); + mb(); } /* @@ -363,7 +414,7 @@ void _memcpy_fromio(void * to, unsigned long from, long count) if (count >= 8 && ((long)to & 7) == (from & 7)) { count -= 8; do { - *(u64 *)to = readq(from); + *(u64 *)to = __raw_readq(from); count -= 8; to += 8; from += 8; @@ -374,7 +425,7 @@ void _memcpy_fromio(void * to, unsigned long from, long count) if (count >= 4 && ((long)to & 3) == (from & 3)) { count -= 4; do { - *(u32 *)to = readl(from); + *(u32 *)to = __raw_readl(from); count -= 4; to += 4; from += 4; @@ -385,7 +436,7 @@ void _memcpy_fromio(void * to, unsigned long from, long count) if (count >= 2 && ((long)to & 1) == (from & 1)) { count -= 2; do { - *(u16 *)to = readw(from); + *(u16 *)to = __raw_readw(from); count -= 2; to += 2; from += 2; @@ -394,7 +445,7 @@ void _memcpy_fromio(void * to, unsigned long from, long count) } while (count > 0) { - *(u8 *) to = readb(from); + *(u8 *) to = __raw_readb(from); count--; to++; from++; @@ -414,7 +465,7 @@ void _memcpy_toio(unsigned long to, const void * from, long count) if (count >= 8 && (to & 7) == ((long)from & 7)) { count -= 8; do { - writeq(*(const u64 *)from, to); + __raw_writeq(*(const u64 *)from, to); count -= 8; to += 8; from += 8; @@ -425,7 +476,7 @@ void _memcpy_toio(unsigned long to, const void * from, long count) if (count >= 4 && (to & 3) == ((long)from & 3)) { count -= 4; do { - writel(*(const u32 *)from, to); + __raw_writel(*(const u32 *)from, to); count -= 4; to += 4; from += 4; @@ -436,7 +487,7 @@ void _memcpy_toio(unsigned long to, const void * from, long count) if (count >= 2 && (to & 1) == ((long)from & 1)) { count -= 2; do { - writew(*(const u16 *)from, to); + __raw_writew(*(const u16 *)from, to); count -= 2; to += 2; from += 2; @@ -445,11 +496,12 @@ void _memcpy_toio(unsigned long to, const void * from, long count) } while (count > 0) { - writeb(*(const u8 *) from, to); + __raw_writeb(*(const u8 *) from, to); count--; to++; from++; } + mb(); } /* @@ -459,21 +511,21 @@ void _memset_c_io(unsigned long to, unsigned long c, long count) { /* Handle any initial odd byte */ if (count > 0 && (to & 1)) { - writeb(c, to); + __raw_writeb(c, to); to++; count--; } /* Handle any initial odd halfword */ if (count >= 2 && (to & 2)) { - writew(c, to); + __raw_writew(c, to); to += 2; count -= 2; } /* Handle any initial odd word */ if (count >= 4 && (to & 4)) { - writel(c, to); + __raw_writel(c, to); to += 4; count -= 4; } @@ -483,7 +535,7 @@ void _memset_c_io(unsigned long to, unsigned long c, long count) count -= 8; if (count >= 0) { do { - writeq(c, to); + __raw_writeq(c, to); to += 8; count -= 8; } while (count >= 0); @@ -492,20 +544,21 @@ void _memset_c_io(unsigned long to, unsigned long c, long count) /* The tail is word-aligned if we still have count >= 4 */ if (count >= 4) { - writel(c, to); + __raw_writel(c, to); to += 4; count -= 4; } /* The tail is half-word aligned if we have count >= 2 */ if (count >= 2) { - writew(c, to); + __raw_writew(c, to); to += 2; count -= 2; } /* And finally, one last byte.. */ if (count) { - writeb(c, to); + __raw_writeb(c, to); } + mb(); } diff --git a/arch/alpha/lib/memchr.S b/arch/alpha/lib/memchr.S new file mode 100644 index 000000000..14427eeb5 --- /dev/null +++ b/arch/alpha/lib/memchr.S @@ -0,0 +1,164 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by David Mosberger (davidm@cs.arizona.edu). + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* Finds characters in a memory area. Optimized for the Alpha: + + - memory accessed as aligned quadwords only + - uses cmpbge to compare 8 bytes in parallel + - does binary search to find 0 byte in last + quadword (HAKMEM needed 12 instructions to + do this instead of the 9 instructions that + binary search needs). + +For correctness consider that: + + - only minimum number of quadwords may be accessed + - the third argument is an unsigned long +*/ + + .set noreorder + .set noat + + .globl memchr + .ent memchr +memchr: + .frame $30,0,$26,0 + .prologue 0 + + # Hack -- if someone passes in (size_t)-1, hoping to just + # search til the end of the address space, we will overflow + # below when we find the address of the last byte. Given + # that we will never have a 56-bit address space, cropping + # the length is the easiest way to avoid trouble. + zap $18, 0x80, $5 #-e0 : + + beq $18, $not_found # .. e1 : + ldq_u $1, 0($16) # e1 : load first quadword + insbl $17, 1, $2 # .. e0 : $2 = 000000000000ch00 + and $17, 0xff, $17 #-e0 : $17 = 00000000000000ch + cmpult $18, 9, $4 # .. e1 : + or $2, $17, $17 # e0 : $17 = 000000000000chch + lda $3, -1($31) # .. e1 : + sll $17, 16, $2 #-e0 : $2 = 00000000chch0000 + addq $16, $5, $5 # .. e1 : + or $2, $17, $17 # e1 : $17 = 00000000chchchch + unop # : + sll $17, 32, $2 #-e0 : $2 = chchchch00000000 + or $2, $17, $17 # e1 : $17 = chchchchchchchch + extql $1, $16, $7 # e0 : + beq $4, $first_quad # .. e1 : + + ldq_u $6, -1($5) #-e1 : eight or less bytes to search + extqh $6, $16, $6 # .. e0 : + mov $16, $0 # e0 : + or $7, $6, $1 # .. e1 : $1 = quadword starting at $16 + + # Deal with the case where at most 8 bytes remain to be searched + # in $1. E.g.: + # $18 = 6 + # $1 = ????c6c5c4c3c2c1 +$last_quad: + negq $18, $6 #-e0 : + xor $17, $1, $1 # .. e1 : + srl $3, $6, $6 # e0 : $6 = mask of $18 bits set + cmpbge $31, $1, $2 # .. e1 : + and $2, $6, $2 #-e0 : + beq $2, $not_found # .. e1 : + +$found_it: + # Now, determine which byte matched: + negq $2, $3 # e0 : + and $2, $3, $2 # e1 : + + and $2, 0x0f, $1 #-e0 : + addq $0, 4, $3 # .. e1 : + cmoveq $1, $3, $0 # e0 : + + addq $0, 2, $3 # .. e1 : + and $2, 0x33, $1 #-e0 : + cmoveq $1, $3, $0 # .. e1 : + + and $2, 0x55, $1 # e0 : + addq $0, 1, $3 # .. e1 : + cmoveq $1, $3, $0 #-e0 : + +$done: ret # .. e1 : + + # Deal with the case where $18 > 8 bytes remain to be + # searched. $16 may not be aligned. + .align 4 +$first_quad: + andnot $16, 0x7, $0 #-e1 : + insqh $3, $16, $2 # .. e0 : $2 = 0000ffffffffffff ($16<0:2> ff) + xor $1, $17, $1 # e0 : + or $1, $2, $1 # e1 : $1 = ====ffffffffffff + cmpbge $31, $1, $2 #-e0 : + bne $2, $found_it # .. e1 : + + # At least one byte left to process. + + ldq $1, 8($0) # e0 : + subq $5, 1, $18 # .. e1 : + addq $0, 8, $0 #-e0 : + + # Make $18 point to last quad to be accessed (the + # last quad may or may not be partial). + + andnot $18, 0x7, $18 # .. e1 : + cmpult $0, $18, $2 # e0 : + beq $2, $final # .. e1 : + + # At least two quads remain to be accessed. + + subq $18, $0, $4 #-e0 : $4 <- nr quads to be processed + and $4, 8, $4 # e1 : odd number of quads? + bne $4, $odd_quad_count # e1 : + + # At least three quads remain to be accessed + + mov $1, $4 # e0 : move prefetched value to correct reg + + .align 4 +$unrolled_loop: + ldq $1, 8($0) #-e0 : prefetch $1 + xor $17, $4, $2 # .. e1 : + cmpbge $31, $2, $2 # e0 : + bne $2, $found_it # .. e1 : + + addq $0, 8, $0 #-e0 : +$odd_quad_count: + xor $17, $1, $2 # .. e1 : + ldq $4, 8($0) # e0 : prefetch $4 + cmpbge $31, $2, $2 # .. e1 : + addq $0, 8, $6 #-e0 : + bne $2, $found_it # .. e1 : + + cmpult $6, $18, $6 # e0 : + addq $0, 8, $0 # .. e1 : + bne $6, $unrolled_loop #-e1 : + + mov $4, $1 # e0 : move prefetched value into $1 +$final: subq $5, $0, $18 # .. e1 : $18 <- number of bytes left to do + bne $18, $last_quad # e1 : + +$not_found: + mov $31, $0 #-e0 : + ret # .. e1 : + + .end memchr |