diff options
| author | jhb <jhb@FreeBSD.org> | 2004-11-16 20:42:32 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2004-11-16 20:42:32 +0000 |
| commit | cc03c9de7d057c1fb843aa928c6c607a3c775700 (patch) | |
| tree | 675ab00de5628f598aa1773d0c714a0300dafb2d /sys/i386/include | |
| parent | 5437b62b67fb9d20d8eed546b0e7fb9a776c10b6 (diff) | |
| download | FreeBSD-src-cc03c9de7d057c1fb843aa928c6c607a3c775700.zip FreeBSD-src-cc03c9de7d057c1fb843aa928c6c607a3c775700.tar.gz | |
Initiate deorbit burn sequence for 80386 support in FreeBSD: Remove
80386 (I386_CPU) support from the kernel.
Diffstat (limited to 'sys/i386/include')
| -rw-r--r-- | sys/i386/include/atomic.h | 6 | ||||
| -rw-r--r-- | sys/i386/include/cpu.h | 2 | ||||
| -rw-r--r-- | sys/i386/include/endian.h | 10 |
3 files changed, 4 insertions, 14 deletions
diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h index a1f4acb..5b9ef42 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -118,7 +118,7 @@ extern void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) #if defined(__GNUC__) || defined(__INTEL_COMPILER) -#if defined(I386_CPU) || defined(CPU_DISABLE_CMPXCHG) +#if defined(CPU_DISABLE_CMPXCHG) static __inline int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) @@ -144,7 +144,7 @@ atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) return (res); } -#else /* defined(I386_CPU) */ +#else /* defined(CPU_DISABLE_CMPXCHG) */ static __inline int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) @@ -166,7 +166,7 @@ atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) return (res); } -#endif /* defined(I386_CPU) */ +#endif /* defined(CPU_DISABLE_CMPXCHG) */ #endif /* defined(__GNUC__) || defined(__INTEL_COMPILER) */ diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h index fb1017f..ec9ecd3 100644 --- a/sys/i386/include/cpu.h +++ b/sys/i386/include/cpu.h @@ -99,7 +99,7 @@ void swi_vm(void *); static __inline u_int64_t get_cyclecount(void) { -#if defined(I386_CPU) || defined(I486_CPU) || defined(KLD_MODULE) +#if defined(I486_CPU) || defined(KLD_MODULE) struct bintime bt; if (!tsc_present) { diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h index 6cc225c..13d596a 100644 --- a/sys/i386/include/endian.h +++ b/sys/i386/include/endian.h @@ -98,20 +98,10 @@ __extension__ ({ register __uint32_t __X = (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__ |
