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
201 lines
5.6 KiB
C
201 lines
5.6 KiB
C
/*-
|
|
* Copyright (c) 1987, 1991 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.
|
|
*
|
|
* @(#)endian.h 7.8 (Berkeley) 4/3/91
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _MACHINE_ENDIAN_H_
|
|
#define _MACHINE_ENDIAN_H_
|
|
|
|
#include <sys/cdefs.h>
|
|
#include <sys/_types.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/*
|
|
* Define the order of 32-bit words in 64-bit words.
|
|
*/
|
|
#define _QUAD_HIGHWORD 1
|
|
#define _QUAD_LOWWORD 0
|
|
|
|
/*
|
|
* Definitions for byte order, according to byte significance from low
|
|
* address to high.
|
|
*/
|
|
#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */
|
|
#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */
|
|
#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */
|
|
|
|
#define _BYTE_ORDER _LITTLE_ENDIAN
|
|
|
|
/*
|
|
* Deprecated variants that don't have enough underscores to be useful in more
|
|
* strict namespaces.
|
|
*/
|
|
#if __BSD_VISIBLE
|
|
#define LITTLE_ENDIAN _LITTLE_ENDIAN
|
|
#define BIG_ENDIAN _BIG_ENDIAN
|
|
#define PDP_ENDIAN _PDP_ENDIAN
|
|
#define BYTE_ORDER _BYTE_ORDER
|
|
#endif
|
|
|
|
#if defined(__INTEL_COMPILER)
|
|
#if defined(__cplusplus)
|
|
#if __INTEL_COMPILER >= 800
|
|
#define __INTEL_COMPILER_with_FreeBSD_endian 1
|
|
#endif
|
|
#else
|
|
#define __INTEL_COMPILER_with_FreeBSD_endian 1
|
|
#endif
|
|
#endif
|
|
|
|
#if defined(__GNUC__) || defined(__INTEL_COMPILER_with_FreeBSD_endian)
|
|
|
|
#define __word_swap_int_var(x) \
|
|
__extension__ ({ register __uint32_t __X = (x); \
|
|
__asm ("rorl $16, %0" : "+r" (__X)); \
|
|
__X; })
|
|
|
|
#ifdef __OPTIMIZE__
|
|
|
|
#define __word_swap_int_const(x) \
|
|
((((x) & 0xffff0000) >> 16) | \
|
|
(((x) & 0x0000ffff) << 16))
|
|
#define __word_swap_int(x) (__builtin_constant_p(x) ? \
|
|
__word_swap_int_const(x) : __word_swap_int_var(x))
|
|
|
|
#else /* __OPTIMIZE__ */
|
|
|
|
#define __word_swap_int(x) __word_swap_int_var(x)
|
|
|
|
#endif /* __OPTIMIZE__ */
|
|
|
|
#if defined(_KERNEL) && (defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)) && !defined(I386_CPU)
|
|
|
|
#define __byte_swap_int_var(x) \
|
|
__extension__ ({ register __uint32_t __X = (x); \
|
|
__asm ("bswap %0" : "+r" (__X)); \
|
|
__X; })
|
|
#else
|
|
|
|
#define __byte_swap_int_var(x) \
|
|
__extension__ ({ register __uint32_t __X = (x); \
|
|
__asm ("xchgb %h0, %b0\n\trorl $16, %0\n\txchgb %h0, %b0" \
|
|
: "+q" (__X)); \
|
|
__X; })
|
|
#endif
|
|
|
|
#ifdef __OPTIMIZE__
|
|
|
|
#define __byte_swap_int_const(x) \
|
|
((((x) & 0xff000000) >> 24) | \
|
|
(((x) & 0x00ff0000) >> 8) | \
|
|
(((x) & 0x0000ff00) << 8) | \
|
|
(((x) & 0x000000ff) << 24))
|
|
#define __byte_swap_int(x) (__builtin_constant_p(x) ? \
|
|
__byte_swap_int_const(x) : __byte_swap_int_var(x))
|
|
|
|
#else /* __OPTIMIZE__ */
|
|
|
|
#define __byte_swap_int(x) __byte_swap_int_var(x)
|
|
|
|
#endif /* __OPTIMIZE__ */
|
|
|
|
#define __byte_swap_word_var(x) \
|
|
__extension__ ({ register __uint16_t __X = (x); \
|
|
__asm ("xchgb %h0, %b0" : "+q" (__X)); \
|
|
__X; })
|
|
|
|
#ifdef __OPTIMIZE__
|
|
|
|
#define __byte_swap_word_const(x) \
|
|
((((x) & 0xff00) >> 8) | \
|
|
(((x) & 0x00ff) << 8))
|
|
|
|
#define __byte_swap_word(x) (__builtin_constant_p(x) ? \
|
|
__byte_swap_word_const(x) : __byte_swap_word_var(x))
|
|
|
|
#else /* __OPTIMIZE__ */
|
|
|
|
#define __byte_swap_word(x) __byte_swap_word_var(x)
|
|
|
|
#endif /* __OPTIMIZE__ */
|
|
|
|
static __inline __uint64_t
|
|
__bswap64(__uint64_t _x)
|
|
{
|
|
|
|
return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
|
|
((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
|
|
((_x << 24) & ((__uint64_t)0xff << 40)) |
|
|
((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
|
|
}
|
|
|
|
static __inline __uint32_t
|
|
__bswap32(__uint32_t _x)
|
|
{
|
|
|
|
return (__byte_swap_int(_x));
|
|
}
|
|
|
|
static __inline __uint16_t
|
|
__bswap16(__uint16_t _x)
|
|
{
|
|
|
|
return (__byte_swap_word(_x));
|
|
}
|
|
|
|
#define __htonl(x) __bswap32(x)
|
|
#define __htons(x) __bswap16(x)
|
|
#define __ntohl(x) __bswap32(x)
|
|
#define __ntohs(x) __bswap16(x)
|
|
|
|
#else /* !(__GNUC__ || __INTEL_COMPILER_with_FreeBSD_endian) */
|
|
|
|
/*
|
|
* No optimizations are available for this compiler. Fall back to
|
|
* non-optimized functions by defining the constant usually used to prevent
|
|
* redefinition.
|
|
*/
|
|
#define _BYTEORDER_FUNC_DEFINED
|
|
|
|
#endif /* __GNUC__ || __INTEL_COMPILER_with_FreeBSD_endian */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* !_MACHINE_ENDIAN_H_ */
|