From owner-p4-projects@FreeBSD.ORG Fri May 9 17:17:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CC9C37B401; Fri, 9 May 2003 17:17:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 276F437B404 for ; Fri, 9 May 2003 17:17:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9ECA643FBF for ; Fri, 9 May 2003 17:17:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A0HP0U009908 for ; Fri, 9 May 2003 17:17:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A0HOqG009905 for perforce@freebsd.org; Fri, 9 May 2003 17:17:24 -0700 (PDT) Date: Fri, 9 May 2003 17:17:24 -0700 (PDT) Message-Id: <200305100017.h4A0HOqG009905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 00:17:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=30896 Change 30896 by peter@peter_hammer on 2003/05/09 17:17:08 translate remaining i386/support.s code into amd64 asm code. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#14 edit .. //depot/projects/hammer/sys/amd64/amd64/support.S#2 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#14 (text+ko) ==== @@ -1697,64 +1697,3 @@ } #endif /* DDB */ - -void -bcopy(const void *src, void *dest, size_t len) -{ - const char *csrc; - char *cdest; - size_t i; - - csrc = (const char *)src; - cdest = (char *)dest; - if (src < dest) { - for (i = len - 1; i != (size_t)-1; i--) - cdest[i] = csrc[i]; - } else { - for (i = 0; i < len; i++) - cdest[i] = csrc[i]; - } -} - -void * -memcpy(void *dest, const void *src, size_t len) -{ - - bcopy(src, dest, len); - return dest; -} - -void -bzero(void *buf, size_t len) -{ - char *cbuf; - size_t i; - - cbuf = (char *)buf; - for (i = 0; i < len; i++) - cbuf[i] = 0; -} - -void -pagezero(void *buf) -{ - - bzero(buf, PAGE_SIZE); -} - -int -bcmp(const void *s1, const void *s2, size_t len) -{ - const char *cs1, *cs2; - int diff; - size_t i; - - cs1 = (const char *)s1; - cs2 = (const char *)s2; - for (i = 0; i < len; i++) { - diff = cs2[i] - cs1[i]; - if (diff) - return diff; - } - return 0; -} ==== //depot/projects/hammer/sys/amd64/amd64/support.S#2 (text+ko) ==== @@ -34,15 +34,153 @@ */ #include -#include #include -#include #include "assym.s" .text +/* + * bcopy family + * void bzero(void *buf, u_int len) + */ + +/* done */ +ENTRY(bzero) + movq %rsi,%rcx + xorq %rax,%rax + shrq $3,%rcx + cld + rep + stosq + movq %rsi,%rcx + andq $7,%rcx + rep + stosb + ret + +/* Address: %rdi */ +ENTRY(pagezero) + movq $512, %rcx + cld + + ALIGN_TEXT +1: + xorq %rax, %rax + repe + scasq + jnz 2f + + ret + + ALIGN_TEXT + +2: + incq %rcx + subq $8, %rdi + + movq %rcx, %rdx + cmpq $16, %rcx + + jge 3f + + movq %rdi, %r8 + andq $0x7f, %r8 + shrq $3, %r8 + movq $16, %rcx + subq %r8, %rcx + +3: + subq %rcx, %rdx + rep + stosq + + movq %rdx, %rcx + testq %rdx, %rdx + jnz 1b + + ret + + +ENTRY(bcmp) + xorq %rax,%rax + + movq %rdx,%rcx + shrq $3,%rcx + cld /* compare forwards */ + repe + cmpsq + jne 1f + + movq %rdx,%rcx + andq $7,%rcx + repe + cmpsb + je 2f +1: + incq %rax +2: + ret + +/* + * bcopy(src, dst, cnt) + * rdi, rsi, rdx + * ws@tools.de (Wolfgang Solfrank, TooLs GmbH) +49-228-985800 + */ +ENTRY(bcopy) + xchgq %rsi,%rdi + movq %rdx,%rcx + + movq %rdi,%rax + subq %rsi,%rax + cmpq %rcx,%rax /* overlapping && src < dst? */ + jb 1f + + shrq $3,%rcx /* copy by 64-bit words */ + cld /* nope, copy forwards */ + rep + movsq + movq %rdx,%rcx + andq $7,%rcx /* any bytes left? */ + rep + movsb + ret + + /* ALIGN_TEXT */ +1: + addq %rcx,%rdi /* copy backwards */ + addq %rcx,%rsi + decq %rdi + decq %rsi + andq $7,%rcx /* any fractional bytes? */ + std + rep + movsb + movq %rdx,%rcx /* copy remainder by 32-bit words */ + shrq $3,%rcx + subq $7,%rsi + subq $7,%rdi + rep + movsq + cld + ret + +/* + * Note: memcpy does not support overlapping copies + */ +ENTRY(memcpy) + movq %rdx,%rcx + shrq $3,%rcx /* copy by 64-bit words */ + cld /* copy forwards */ + rep + movsq + movq %rdx,%rcx + andq $7,%rcx /* any bytes left? */ + rep + movsb + ret + /* fillw(pat, base, cnt) */ /* %rdi,%rsi, %rdx */ ENTRY(fillw)