From 979989de208282ffcb05551f4f5983889d7d6f99 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Tue, 10 May 2005 04:04:40 +0000 Subject: - add vax optimized in4_cksum - de register and use ANSI prototype From NetBSD ok miod@ --- sys/arch/vax/conf/files.vax | 4 +- sys/arch/vax/vax/in4_cksum.c | 234 +++++++++++++++++++++++++++++++++++++++++++ sys/arch/vax/vax/in_cksum.c | 23 ++--- 3 files changed, 246 insertions(+), 15 deletions(-) create mode 100644 sys/arch/vax/vax/in4_cksum.c diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax index dc42aad1cd0..57aeaa78efc 100644 --- a/sys/arch/vax/conf/files.vax +++ b/sys/arch/vax/conf/files.vax @@ -1,4 +1,4 @@ -# $OpenBSD: files.vax,v 1.30 2005/05/01 21:36:57 brad Exp $ +# $OpenBSD: files.vax,v 1.31 2005/05/10 04:04:39 brad Exp $ # $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $ # # new style config file for vax architecture @@ -345,7 +345,7 @@ file arch/vax/vax/random.s file arch/vax/vax/rootfil.c file arch/vax/vax/autoconf.c file arch/vax/vax/in_cksum.c inet -file netinet/in4_cksum.c inet +file arch/vax/vax/in4_cksum.c inet file arch/vax/vax/ns_cksum.c ns file arch/vax/vax/disksubr.c disk | tape file arch/vax/vax/db_machdep.c ddb diff --git a/sys/arch/vax/vax/in4_cksum.c b/sys/arch/vax/vax/in4_cksum.c new file mode 100644 index 00000000000..95c884f0322 --- /dev/null +++ b/sys/arch/vax/vax/in4_cksum.c @@ -0,0 +1,234 @@ +/* $OpenBSD: in4_cksum.c,v 1.1 2005/05/10 04:04:39 brad Exp $ */ +/* $NetBSD: in4_cksum.c,v 1.8 2003/09/29 22:54:28 matt Exp $ */ + +/* + * Copyright (C) 1999 WIDE Project. + * All rights reserved. + * + * 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. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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. + */ + +/* + * Copyright (c) 1988, 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * 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. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + * + * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 + */ + +#if 0 +#include +__KERNEL_RCSID(0, "$NetBSD: in4_cksum.c,v 1.8 2003/09/29 22:54:28 matt Exp $"); +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef CKSUMDEBUG +int in4_cksum_md_debug(struct mbuf *m, u_int8_t nxt, int off, int len); +#define in4_cksum in4_cksum_md_debug +#include +#undef in4_cksum +#undef ADDCARRY +#undef REDUCE +#endif + +/* + * Checksum routine for Internet Protocol family headers. + * This is only for IPv4 pseudo header checksum. + * No need to clear non-pseudo-header fields in IPv4 header. + * len is for actual payload size, and does not include IPv4 header and + * skipped header chain (off + len should be equal to the whole packet). + * + * This implementation is VAX version. + */ + + +#define REDUCE {sum = (sum & 0xffff) + (sum >> 16);} +#define ADDCARRY {if (sum > 0xffff) sum -= 0xffff;} +#define ADVANCE(n) {w += n; mlen -= n;} +#define SWAP {sum <<= 8;} /* depends on recent REDUCE */ + +#define Asm __asm __volatile +#define ADDL Asm("addl2 (%2)+,%0" : "=r" (sum) : "0" (sum), "r" (w)) +#define ADWC Asm("adwc (%2)+,%0" : "=r" (sum) : "0" (sum), "r" (w)) +#define ADDC Asm("adwc $0,%0" : "=r" (sum) : "0" (sum)) +#define UNSWAP Asm("rotl $8,%0,%0" : "=r" (sum) : "0" (sum)) +#define ADDBYTE {sum += *w; SWAP; byte_swapped ^= 1;} +#define ADDWORD {sum += *(u_short *)w;} + +int +in4_cksum(struct mbuf *m, u_int8_t nxt, int off, int len) +{ + u_int8_t *w; + u_int32_t sum = 0; + int mlen = 0; + int byte_swapped = 0; +#ifdef CKSUMDEBUG + int debugrv = in4_cksum_md_debug(m, nxt, off, len); +#endif + + if (nxt != 0) { +#ifdef DIAGNOSTIC + if (off < sizeof(struct ipovly)) + panic("in4_cksum: offset too short"); + if (m->m_len < sizeof(struct ip)) + panic("in4_cksum: bad mbuf chain"); +#endif + + __asm __volatile( + "movzwl 16(ap),%0;" /* mov len to sum */ + "addb2 8(ap),%0;" /* add proto to sum */ + "rotl $8,%0,%0;" /* htons, carry is preserved */ + "adwc 12(%2),%0;" /* add src ip */ + "adwc 16(%2),%0;" /* add dst ip */ + "adwc $0,%0;" /* clean up carry */ + : "=r" (sum) + : "0" (sum), "r" (mtod(m, void *))); + } + + /* skip unnecessary part */ + while (m && off > 0) { + if (m->m_len > off) + break; + off -= m->m_len; + m = m->m_next; + } + + for (;m && len; m = m->m_next) { + if ((mlen = m->m_len) == 0) + continue; + w = mtod(m, u_int8_t *); + if (off) { + w += off; + mlen -= off; + off = 0; + } + if (len < mlen) + mlen = len; + len -= mlen; + if (mlen < 16) + goto short_mbuf; + /* + * Ensure that we're aligned on a word boundary here so + * that we can do 32 bit operations below. + */ + if ((3 & (u_long) w) != 0) { + REDUCE; + if ((1 & (u_long) w) != 0) { + ADDBYTE; + ADVANCE(1); + } + if ((2 & (u_long) w) != 0) { + ADDWORD; + ADVANCE(2); + } + } + /* + * Do as much of the checksum as possible 32 bits at at time. + * In fact, this loop is unrolled to make overhead from + * branches &c small. + */ + while ((mlen -= 32) >= 0) { + /* + * Add with carry 16 words and fold in the last carry + * by adding a 0 with carry. + */ + ADDL; ADWC; ADWC; ADWC; + ADWC; ADWC; ADWC; ADWC; + ADDC; + } + mlen += 32; + if (mlen >= 16) { + ADDL; ADWC; ADWC; ADWC; + ADDC; + mlen -= 16; + } + short_mbuf: + if (mlen >= 8) { + ADDL; ADWC; + ADDC; + mlen -= 8; + } + if (mlen >= 4) { + ADDL; + ADDC; + mlen -= 4; + } + if (mlen > 0) { + REDUCE; + if (mlen >= 2) { + ADDWORD; + ADVANCE(2); + } + if (mlen >= 1) { + ADDBYTE; + } + } + } + + if (len) + printf("cksum4: out of data\n"); + if (byte_swapped) { + UNSWAP; + } + REDUCE; + ADDCARRY; +#ifdef CKSUMDEBUG + if ((sum ^ 0xffff) != debugrv) + printf("in4_cksum: rv != debugrv (rv %x debugrv %x)\n", + (sum ^ 0xffff), debugrv); +#endif + return (sum ^ 0xffff); +} diff --git a/sys/arch/vax/vax/in_cksum.c b/sys/arch/vax/vax/in_cksum.c index 0175b9ff593..73d6d95f02e 100644 --- a/sys/arch/vax/vax/in_cksum.c +++ b/sys/arch/vax/vax/in_cksum.c @@ -1,5 +1,5 @@ -/* $OpenBSD: in_cksum.c,v 1.4 2003/06/02 23:27:58 millert Exp $ */ -/* $NetBSD: in_cksum.c,v 1.4 1996/10/13 03:35:40 christos Exp $ */ +/* $OpenBSD: in_cksum.c,v 1.5 2005/05/10 04:04:39 brad Exp $ */ +/* $NetBSD: in_cksum.c,v 1.7 2003/08/07 16:30:19 agc Exp $ */ /* * Copyright (c) 1988, 1992, 1993 @@ -61,19 +61,17 @@ #define ADDWORD {sum += *(u_short *)w;} int -in_cksum(m, len) - register struct mbuf *m; - register int len; +in_cksum(struct mbuf *m, int len) { - register u_char *w; - register u_int sum = 0; - register int mlen = 0; + u_int8_t *w; + u_int32_t sum = 0; + int mlen = 0; int byte_swapped = 0; for (;m && len; m = m->m_next) { if ((mlen = m->m_len) == 0) continue; - w = mtod(m, u_char *); + w = mtod(m, u_int8_t *); if (len < mlen) mlen = len; len -= mlen; @@ -83,13 +81,13 @@ in_cksum(m, len) * Ensure that we're aligned on a word boundary here so * that we can do 32 bit operations below. */ - if ((3 & (long)w) != 0) { + if ((3 & (u_long) w) != 0) { REDUCE; - if ((1 & (long)w) != 0) { + if ((1 & (u_long) w) != 0) { ADDBYTE; ADVANCE(1); } - if ((2 & (long)w) != 0) { + if ((2 & (u_long) w) != 0) { ADDWORD; ADVANCE(2); } @@ -146,4 +144,3 @@ in_cksum(m, len) ADDCARRY; return (sum ^ 0xffff); } - -- cgit v1.2.3