f6877ab8d5
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
171 lines
5.2 KiB
C
171 lines
5.2 KiB
C
/*-
|
|
* Copyright (c) Peter Wemm <peter@netplex.com.au>
|
|
* 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.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _MACHINE_PCPU_H_
|
|
#define _MACHINE_PCPU_H_
|
|
|
|
#ifdef _KERNEL
|
|
|
|
#include <machine/segments.h>
|
|
#include <machine/tss.h>
|
|
|
|
/*
|
|
* The SMP parts are setup in pmap.c and locore.s for the BSP, and
|
|
* mp_machdep.c sets up the data for the AP's to "see" when they awake.
|
|
* The reason for doing it via a struct is so that an array of pointers
|
|
* to each CPU's data can be set up for things like "check curproc on all
|
|
* other processors"
|
|
*/
|
|
#define PCPU_MD_FIELDS \
|
|
struct pcpu *pc_prvspace; /* Self-reference */ \
|
|
struct pmap *pc_curpmap; \
|
|
struct i386tss pc_common_tss; \
|
|
struct segment_descriptor pc_common_tssd; \
|
|
struct segment_descriptor *pc_tss_gdt; \
|
|
int pc_currentldt; \
|
|
u_int pc_acpi_id; \
|
|
u_int pc_apic_id
|
|
|
|
#if defined(lint)
|
|
|
|
extern struct pcpu *pcpup;
|
|
|
|
#define PCPU_GET(member) (pcpup->pc_ ## member)
|
|
#define PCPU_PTR(member) (&pcpup->pc_ ## member)
|
|
#define PCPU_SET(member,value) (pcpup->pc_ ## member = (value))
|
|
|
|
#elif defined(__GNUC__) || defined (__INTEL_COMPILER)
|
|
|
|
/*
|
|
* Evaluates to the byte offset of the per-cpu variable name.
|
|
*/
|
|
#define __pcpu_offset(name) \
|
|
__offsetof(struct pcpu, name)
|
|
|
|
/*
|
|
* Evaluates to the type of the per-cpu variable name.
|
|
*/
|
|
#define __pcpu_type(name) \
|
|
__typeof(((struct pcpu *)0)->name)
|
|
|
|
/*
|
|
* Evaluates to the address of the per-cpu variable name.
|
|
*/
|
|
#define __PCPU_PTR(name) __extension__ ({ \
|
|
__pcpu_type(name) *__p; \
|
|
\
|
|
__asm __volatile("movl %%fs:%1,%0; addl %2,%0" \
|
|
: "=r" (__p) \
|
|
: "m" (*(struct pcpu *)(__pcpu_offset(pc_prvspace))), \
|
|
"i" (__pcpu_offset(name))); \
|
|
\
|
|
__p; \
|
|
})
|
|
|
|
/*
|
|
* Evaluates to the value of the per-cpu variable name.
|
|
*/
|
|
#define __PCPU_GET(name) __extension__ ({ \
|
|
__pcpu_type(name) __result; \
|
|
\
|
|
if (sizeof(__result) == 1) { \
|
|
u_char __b; \
|
|
__asm __volatile("movb %%fs:%1,%0" \
|
|
: "=r" (__b) \
|
|
: "m" (*(u_char *)(__pcpu_offset(name)))); \
|
|
__result = *(__pcpu_type(name) *)(void *)&__b; \
|
|
} else if (sizeof(__result) == 2) { \
|
|
u_short __w; \
|
|
__asm __volatile("movw %%fs:%1,%0" \
|
|
: "=r" (__w) \
|
|
: "m" (*(u_short *)(__pcpu_offset(name)))); \
|
|
__result = *(__pcpu_type(name) *)(void *)&__w; \
|
|
} else if (sizeof(__result) == 4) { \
|
|
u_int __i; \
|
|
__asm __volatile("movl %%fs:%1,%0" \
|
|
: "=r" (__i) \
|
|
: "m" (*(u_int *)(__pcpu_offset(name)))); \
|
|
__result = *(__pcpu_type(name) *)(void *)&__i; \
|
|
} else { \
|
|
__result = *__PCPU_PTR(name); \
|
|
} \
|
|
\
|
|
__result; \
|
|
})
|
|
|
|
/*
|
|
* Sets the value of the per-cpu variable name to value val.
|
|
*/
|
|
#define __PCPU_SET(name, val) { \
|
|
__pcpu_type(name) __val = (val); \
|
|
\
|
|
if (sizeof(__val) == 1) { \
|
|
u_char __b; \
|
|
__b = *(u_char *)&__val; \
|
|
__asm __volatile("movb %1,%%fs:%0" \
|
|
: "=m" (*(u_char *)(__pcpu_offset(name))) \
|
|
: "r" (__b)); \
|
|
} else if (sizeof(__val) == 2) { \
|
|
u_short __w; \
|
|
__w = *(u_short *)&__val; \
|
|
__asm __volatile("movw %1,%%fs:%0" \
|
|
: "=m" (*(u_short *)(__pcpu_offset(name))) \
|
|
: "r" (__w)); \
|
|
} else if (sizeof(__val) == 4) { \
|
|
u_int __i; \
|
|
__i = *(u_int *)&__val; \
|
|
__asm __volatile("movl %1,%%fs:%0" \
|
|
: "=m" (*(u_int *)(__pcpu_offset(name))) \
|
|
: "r" (__i)); \
|
|
} else { \
|
|
*__PCPU_PTR(name) = __val; \
|
|
} \
|
|
}
|
|
|
|
#define PCPU_GET(member) __PCPU_GET(pc_ ## member)
|
|
#define PCPU_PTR(member) __PCPU_PTR(pc_ ## member)
|
|
#define PCPU_SET(member, val) __PCPU_SET(pc_ ## member, val)
|
|
|
|
static __inline struct thread *
|
|
__curthread(void)
|
|
{
|
|
struct thread *td;
|
|
|
|
__asm __volatile("movl %%fs:0,%0" : "=r" (td));
|
|
return (td);
|
|
}
|
|
#define curthread (__curthread())
|
|
|
|
#else
|
|
#error gcc or lint is required to use this file
|
|
#endif
|
|
|
|
#endif /* _KERNEL */
|
|
|
|
#endif /* ! _MACHINE_PCPU_H_ */
|