7f9d77d758
Alpha currently fails 'make headers_check' in the 2.6.18-rc kernels. This patch fixes it, by moving the existing #ifdef __KERNEL__ in asm/page.h so that it covers everything that userspace shouldn't so, and by adding asm/compiler.h to the list of exported files so that its use within asm/byteorder.h is successful. [ Note that at least with GCC 4, <linux/compiler.h> doesn't do the forced inlining about which there are nasty comments (and a workaround) in <asm/compiler.h>, unless you set CONFIG_FORCED_INLINING. Rather than keep the mess you have in <asm/compiler.h> you could perhaps just make sure CONFIG_FORCED_INLINING=n is also honoured with GCC3, and make sure it cannot be set for Alpha? ] Signed-off-by: David Woodhouse <dwmw2@infradead.org> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Richard Henderson <rth@twiddle.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
108 lines
3.8 KiB
C
108 lines
3.8 KiB
C
#ifndef __ALPHA_COMPILER_H
|
|
#define __ALPHA_COMPILER_H
|
|
|
|
/*
|
|
* Herein are macros we use when describing various patterns we want to GCC.
|
|
* In all cases we can get better schedules out of the compiler if we hide
|
|
* as little as possible inside inline assembly. However, we want to be
|
|
* able to know what we'll get out before giving up inline assembly. Thus
|
|
* these tests and macros.
|
|
*/
|
|
|
|
#if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 || __GNUC__ > 3
|
|
# define __kernel_insbl(val, shift) __builtin_alpha_insbl(val, shift)
|
|
# define __kernel_inswl(val, shift) __builtin_alpha_inswl(val, shift)
|
|
# define __kernel_insql(val, shift) __builtin_alpha_insql(val, shift)
|
|
# define __kernel_inslh(val, shift) __builtin_alpha_inslh(val, shift)
|
|
# define __kernel_extbl(val, shift) __builtin_alpha_extbl(val, shift)
|
|
# define __kernel_extwl(val, shift) __builtin_alpha_extwl(val, shift)
|
|
# define __kernel_cmpbge(a, b) __builtin_alpha_cmpbge(a, b)
|
|
# define __kernel_cttz(x) __builtin_ctzl(x)
|
|
# define __kernel_ctlz(x) __builtin_clzl(x)
|
|
# define __kernel_ctpop(x) __builtin_popcountl(x)
|
|
#else
|
|
# define __kernel_insbl(val, shift) \
|
|
({ unsigned long __kir; \
|
|
__asm__("insbl %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
|
|
__kir; })
|
|
# define __kernel_inswl(val, shift) \
|
|
({ unsigned long __kir; \
|
|
__asm__("inswl %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
|
|
__kir; })
|
|
# define __kernel_insql(val, shift) \
|
|
({ unsigned long __kir; \
|
|
__asm__("insql %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
|
|
__kir; })
|
|
# define __kernel_inslh(val, shift) \
|
|
({ unsigned long __kir; \
|
|
__asm__("inslh %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
|
|
__kir; })
|
|
# define __kernel_extbl(val, shift) \
|
|
({ unsigned long __kir; \
|
|
__asm__("extbl %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
|
|
__kir; })
|
|
# define __kernel_extwl(val, shift) \
|
|
({ unsigned long __kir; \
|
|
__asm__("extwl %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
|
|
__kir; })
|
|
# define __kernel_cmpbge(a, b) \
|
|
({ unsigned long __kir; \
|
|
__asm__("cmpbge %r2,%1,%0" : "=r"(__kir) : "rI"(b), "rJ"(a)); \
|
|
__kir; })
|
|
# define __kernel_cttz(x) \
|
|
({ unsigned long __kir; \
|
|
__asm__("cttz %1,%0" : "=r"(__kir) : "r"(x)); \
|
|
__kir; })
|
|
# define __kernel_ctlz(x) \
|
|
({ unsigned long __kir; \
|
|
__asm__("ctlz %1,%0" : "=r"(__kir) : "r"(x)); \
|
|
__kir; })
|
|
# define __kernel_ctpop(x) \
|
|
({ unsigned long __kir; \
|
|
__asm__("ctpop %1,%0" : "=r"(__kir) : "r"(x)); \
|
|
__kir; })
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Beginning with EGCS 1.1, GCC defines __alpha_bwx__ when the BWX
|
|
* extension is enabled. Previous versions did not define anything
|
|
* we could test during compilation -- too bad, so sad.
|
|
*/
|
|
|
|
#if defined(__alpha_bwx__)
|
|
#define __kernel_ldbu(mem) (mem)
|
|
#define __kernel_ldwu(mem) (mem)
|
|
#define __kernel_stb(val,mem) ((mem) = (val))
|
|
#define __kernel_stw(val,mem) ((mem) = (val))
|
|
#else
|
|
#define __kernel_ldbu(mem) \
|
|
({ unsigned char __kir; \
|
|
__asm__("ldbu %0,%1" : "=r"(__kir) : "m"(mem)); \
|
|
__kir; })
|
|
#define __kernel_ldwu(mem) \
|
|
({ unsigned short __kir; \
|
|
__asm__("ldwu %0,%1" : "=r"(__kir) : "m"(mem)); \
|
|
__kir; })
|
|
#define __kernel_stb(val,mem) \
|
|
__asm__("stb %1,%0" : "=m"(mem) : "r"(val))
|
|
#define __kernel_stw(val,mem) \
|
|
__asm__("stw %1,%0" : "=m"(mem) : "r"(val))
|
|
#endif
|
|
|
|
#ifdef __KERNEL__
|
|
/* Some idiots over in <linux/compiler.h> thought inline should imply
|
|
always_inline. This breaks stuff. We'll include this file whenever
|
|
we run into such problems. */
|
|
|
|
#include <linux/compiler.h>
|
|
#undef inline
|
|
#undef __inline__
|
|
#undef __inline
|
|
#undef __always_inline
|
|
#define __always_inline inline __attribute__((always_inline))
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* __ALPHA_COMPILER_H */
|