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
113 lines
4.1 KiB
C
113 lines
4.1 KiB
C
/*-
|
|
* Copyright (c) 1992, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This software was developed by the Computer Systems Engineering group
|
|
* at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
|
|
* contributed to Berkeley.
|
|
*
|
|
* 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.
|
|
*
|
|
* @(#)quad.h 8.1 (Berkeley) 6/4/93
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _LIBKERN_QUAD_H
|
|
#define _LIBKERN_QUAD_H
|
|
|
|
/*
|
|
* Quad arithmetic.
|
|
*
|
|
* This library makes the following assumptions:
|
|
*
|
|
* - The type long long (aka quad_t) exists.
|
|
*
|
|
* - A quad variable is exactly twice as long as `long'.
|
|
*
|
|
* - The machine's arithmetic is two's complement.
|
|
*
|
|
* This library can provide 128-bit arithmetic on a machine with 128-bit
|
|
* quads and 64-bit longs, for instance, or 96-bit arithmetic on machines
|
|
* with 48-bit longs.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
#include <sys/types.h>
|
|
#include <sys/limits.h>
|
|
#include <sys/syslimits.h>
|
|
|
|
/*
|
|
* Depending on the desired operation, we view a `long long' (aka quad_t) in
|
|
* one or more of the following formats.
|
|
*/
|
|
union uu {
|
|
quad_t q; /* as a (signed) quad */
|
|
quad_t uq; /* as an unsigned quad */
|
|
long sl[2]; /* as two signed longs */
|
|
u_long ul[2]; /* as two unsigned longs */
|
|
};
|
|
|
|
/*
|
|
* Define high and low longwords.
|
|
*/
|
|
#define H _QUAD_HIGHWORD
|
|
#define L _QUAD_LOWWORD
|
|
|
|
/*
|
|
* Total number of bits in a quad_t and in the pieces that make it up.
|
|
* These are used for shifting, and also below for halfword extraction
|
|
* and assembly.
|
|
*/
|
|
#define QUAD_BITS (sizeof(quad_t) * CHAR_BIT)
|
|
#define LONG_BITS (sizeof(long) * CHAR_BIT)
|
|
#define HALF_BITS (sizeof(long) * CHAR_BIT / 2)
|
|
|
|
/*
|
|
* Extract high and low shortwords from longword, and move low shortword of
|
|
* longword to upper half of long, i.e., produce the upper longword of
|
|
* ((quad_t)(x) << (number_of_bits_in_long/2)). (`x' must actually be u_long.)
|
|
*
|
|
* These are used in the multiply code, to split a longword into upper
|
|
* and lower halves, and to reassemble a product as a quad_t, shifted left
|
|
* (sizeof(long)*CHAR_BIT/2).
|
|
*/
|
|
#define HHALF(x) ((x) >> HALF_BITS)
|
|
#define LHALF(x) ((x) & ((1 << HALF_BITS) - 1))
|
|
#define LHUP(x) ((x) << HALF_BITS)
|
|
|
|
quad_t __divdi3(quad_t a, quad_t b);
|
|
quad_t __moddi3(quad_t a, quad_t b);
|
|
u_quad_t __qdivrem(u_quad_t u, u_quad_t v, u_quad_t *rem);
|
|
u_quad_t __udivdi3(u_quad_t a, u_quad_t b);
|
|
u_quad_t __umoddi3(u_quad_t a, u_quad_t b);
|
|
int __ucmpdi2(u_quad_t a, u_quad_t b);
|
|
|
|
typedef unsigned int qshift_t;
|
|
#endif /* _LIBKERN_QUAD_H */
|