a122cca953
to build the kernel. It doesn't affect the operation if gcc.
Most of the changes are just adding __INTEL_COMPILER to #ifdef's, as
icc v8 may define __GNUC__ some parts may look strange but are
necessary.
Additional changes:
- in_cksum.[ch]:
* use a generic C version instead of the assembly version in the !gcc
case (ASM code breaks with the optimizations icc does)
-> no bad checksums with an icc compiled kernel
Help from: andre, grehan, das
Stolen from: alpha version via ppc version
The entire checksum code should IMHO be replaced with the DragonFly
version (because it isn't guaranteed future revisions of gcc will
include similar optimizations) as in:
---snip---
Revision Changes Path
1.12 +1 -0 src/sys/conf/files.i386
1.4 +142 -558 src/sys/i386/i386/in_cksum.c
1.5 +33 -69 src/sys/i386/include/in_cksum.h
1.5 +2 -0 src/sys/netinet/igmp.c
1.6 +0 -1 src/sys/netinet/in.h
1.6 +2 -0 src/sys/netinet/ip_icmp.c
1.4 +3 -4 src/contrib/ipfilter/ip_compat.h
1.3 +1 -2 src/sbin/natd/icmp.c
1.4 +0 -1 src/sbin/natd/natd.c
1.48 +1 -0 src/sys/conf/files
1.2 +0 -1 src/sys/conf/files.amd64
1.13 +0 -1 src/sys/conf/files.i386
1.5 +0 -1 src/sys/conf/files.pc98
1.7 +1 -1 src/sys/contrib/ipfilter/netinet/fil.c
1.10 +2 -3 src/sys/contrib/ipfilter/netinet/ip_compat.h
1.10 +1 -1 src/sys/contrib/ipfilter/netinet/ip_fil.c
1.7 +1 -1 src/sys/dev/netif/txp/if_txp.c
1.7 +1 -1 src/sys/net/ip_mroute/ip_mroute.c
1.7 +1 -2 src/sys/net/ipfw/ip_fw2.c
1.6 +1 -2 src/sys/netinet/igmp.c
1.4 +158 -116 src/sys/netinet/in_cksum.c
1.6 +1 -1 src/sys/netinet/ip_gre.c
1.7 +1 -2 src/sys/netinet/ip_icmp.c
1.10 +1 -1 src/sys/netinet/ip_input.c
1.10 +1 -2 src/sys/netinet/ip_output.c
1.13 +1 -2 src/sys/netinet/tcp_input.c
1.9 +1 -2 src/sys/netinet/tcp_output.c
1.10 +1 -1 src/sys/netinet/tcp_subr.c
1.10 +1 -1 src/sys/netinet/tcp_syncache.c
1.9 +1 -2 src/sys/netinet/udp_usrreq.c
1.5 +1 -2 src/sys/netinet6/ipsec.c
1.5 +1 -2 src/sys/netproto/ipsec/ipsec.c
1.5 +1 -1 src/sys/netproto/ipsec/ipsec_input.c
1.4 +1 -2 src/sys/netproto/ipsec/ipsec_output.c
and finally remove
sys/i386/i386 in_cksum.c
sys/i386/include in_cksum.h
---snip---
- endian.h:
* DTRT in C++ mode
- quad.h:
* we don't use gcc v1 anymore, remove support for it
Suggested by: bde (long ago)
- assym.h:
* avoid zero-length arrays (remove dependency on a gcc specific
feature)
This change changes the contents of the object file, but as it's
only used to generate some values for a header, and the generator
knows how to handle this, there's no impact in the gcc case.
Explained by: bde
Submitted by: Marius Strobl <marius@alchemy.franken.de>
- aicasm.c:
* minor change to teach it about the way icc spells "-nostdinc"
Not approved by: gibbs (no reply to my mail)
- bump __FreeBSD_version (lang/icc needs to know about the changes)
Incarnations of this patch survive gcc compiles since a loooong time,
I use it on my desktop. An icc compiled kernel works since Nov. 2003
(exceptions: snd_* if used as modules), it survives a build of the
entire ports collection with icc.
Parts of this commit contains suggestions or submissions from
Marius Strobl <marius@alchemy.franken.de>.
Reviewed by: -arch
Submitted by: netchild
137 lines
4.3 KiB
C
137 lines
4.3 KiB
C
/*-
|
|
* Copyright (c) 1990 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. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. 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.
|
|
*
|
|
* from tahoe: in_cksum.c 1.2 86/01/05
|
|
* from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91
|
|
* from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _MACHINE_IN_CKSUM_H_
|
|
#define _MACHINE_IN_CKSUM_H_ 1
|
|
|
|
/*
|
|
* MP safe (alfred)
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
#define in_cksum(m, len) in_cksum_skip(m, len, 0)
|
|
|
|
/*
|
|
* It it useful to have an Internet checksum routine which is inlineable
|
|
* and optimized specifically for the task of computing IP header checksums
|
|
* in the normal case (where there are no options and the header length is
|
|
* therefore always exactly five 32-bit words.
|
|
*/
|
|
#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
|
|
static __inline u_int
|
|
in_cksum_hdr(const struct ip *ip)
|
|
{
|
|
register u_int sum = 0;
|
|
|
|
/* __volatile is necessary here because the condition codes are used. */
|
|
#define ADD(n) __asm __volatile ("addl %1, %0" : "+r" (sum) : \
|
|
"g" (((const u_int32_t *)ip)[n / 4]))
|
|
#define ADDC(n) __asm __volatile ("adcl %1, %0" : "+r" (sum) : \
|
|
"g" (((const u_int32_t *)ip)[n / 4]))
|
|
#define MOP __asm __volatile ("adcl $0, %0" : "+r" (sum))
|
|
|
|
ADD(0);
|
|
ADDC(4);
|
|
ADDC(8);
|
|
ADDC(12);
|
|
ADDC(16);
|
|
MOP;
|
|
#undef ADD
|
|
#undef ADDC
|
|
#undef MOP
|
|
sum = (sum & 0xffff) + (sum >> 16);
|
|
if (sum > 0xffff)
|
|
sum -= 0xffff;
|
|
|
|
return ~sum & 0xffff;
|
|
}
|
|
|
|
static __inline void
|
|
in_cksum_update(struct ip *ip)
|
|
{
|
|
int __tmpsum;
|
|
__tmpsum = (int)ntohs(ip->ip_sum) + 256;
|
|
ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16));
|
|
}
|
|
|
|
static __inline u_short
|
|
in_addword(u_short sum, u_short b)
|
|
{
|
|
/* __volatile is necessary because the condition codes are used. */
|
|
__asm __volatile ("addw %1, %0" : "+r" (sum) : "r" (b));
|
|
__asm __volatile ("adcw $0, %0" : "+r" (sum));
|
|
|
|
return (sum);
|
|
}
|
|
|
|
static __inline u_short
|
|
in_pseudo(u_int sum, u_int b, u_int c)
|
|
{
|
|
/* __volatile is necessary because the condition codes are used. */
|
|
__asm __volatile ("addl %1, %0" : "+r" (sum) : "g" (b));
|
|
__asm __volatile ("adcl %1, %0" : "+r" (sum) : "g" (c));
|
|
__asm __volatile ("adcl $0, %0" : "+r" (sum));
|
|
|
|
sum = (sum & 0xffff) + (sum >> 16);
|
|
if (sum > 0xffff)
|
|
sum -= 0xffff;
|
|
return (sum);
|
|
}
|
|
|
|
#else
|
|
#define in_cksum_update(ip) \
|
|
do { \
|
|
int __tmpsum; \
|
|
__tmpsum = (int)ntohs(ip->ip_sum) + 256; \
|
|
ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16)); \
|
|
} while(0)
|
|
|
|
#endif
|
|
|
|
#ifdef _KERNEL
|
|
#if !defined(__GNUC__) || defined(__INTEL_COMPILER)
|
|
u_int in_cksum_hdr(const struct ip *ip);
|
|
u_short in_addword(u_short sum, u_short b);
|
|
u_short in_pseudo(u_int sum, u_int b, u_int c);
|
|
#endif
|
|
u_short in_cksum_skip(struct mbuf *m, int len, int skip);
|
|
#endif /* _KERNEL */
|
|
|
|
#endif /* _MACHINE_IN_CKSUM_H_ */
|