diff options
author | delphij <delphij@FreeBSD.org> | 2005-07-02 20:06:44 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2005-07-02 20:06:44 +0000 |
commit | 019106f6e576eb8e05e7b5b562d7115dd05ba567 (patch) | |
tree | f712cf3be64a135dbc1f4e04704add0988835f8e | |
parent | 696ddfbe750f1c4366a789f2a656f2ff955fd9d8 (diff) | |
download | FreeBSD-src-019106f6e576eb8e05e7b5b562d7115dd05ba567.zip FreeBSD-src-019106f6e576eb8e05e7b5b562d7115dd05ba567.tar.gz |
Remove the CPU_ENABLE_SSE option from the i386 and pc98 architectures,
as they are already default for I686_CPU for almost 3 years, and
CPU_DISABLE_SSE always disables it. On the other hand, CPU_ENABLE_SSE
does not work for I486_CPU and I586_CPU.
This commit has:
- Removed the option from conf/options.*
- Removed the option and comments from MD NOTES files
- Simplified the CPU_ENABLE_SSE ifdef's so they don't
deal with CPU_ENABLE_SSE from kernel configuration. (*)
For most users, this commit should be largely no-op. If you used to
place CPU_ENABLE_SSE into your kernel configuration for some reason,
it is time to remove it.
(*) The ifdef's of CPU_ENABLE_SSE are not removed at this point, since
we need to change it to !defined(CPU_DISABLE_SSE) && defined(I686_CPU),
not just !defined(CPU_DISABLE_SSE), if we really want to do so.
Discussed on: -arch
Approved by: re (scottl)
-rw-r--r-- | sys/conf/options.i386 | 1 | ||||
-rw-r--r-- | sys/conf/options.pc98 | 1 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 4 | ||||
-rw-r--r-- | sys/i386/i386/initcpu.c | 5 | ||||
-rw-r--r-- | sys/i386/i386/machdep.c | 5 | ||||
-rw-r--r-- | sys/i386/i386/pmap.c | 5 | ||||
-rw-r--r-- | sys/i386/i386/ptrace_machdep.c | 5 | ||||
-rw-r--r-- | sys/i386/isa/npx.c | 5 | ||||
-rw-r--r-- | sys/i386/linux/linux_ptrace.c | 5 | ||||
-rw-r--r-- | sys/pc98/conf/NOTES | 4 | ||||
-rw-r--r-- | sys/pc98/pc98/machdep.c | 5 |
11 files changed, 7 insertions, 38 deletions
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 33f71f0..8ad0b8b 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -51,7 +51,6 @@ CPU_ELAN opt_cpu.h CPU_ELAN_PPS opt_cpu.h CPU_ELAN_XTAL opt_cpu.h CPU_ENABLE_LONGRUN opt_cpu.h -CPU_ENABLE_SSE opt_cpu.h CPU_FASTER_5X86_FPU opt_cpu.h CPU_GEODE opt_cpu.h CPU_I486_ON_386 opt_cpu.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index 5f8db10..f50c867 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -41,7 +41,6 @@ CPU_DIRECT_MAPPED_CACHE opt_cpu.h CPU_DISABLE_5X86_LSSER opt_cpu.h CPU_DISABLE_CMPXCHG opt_global.h # XXX global, unlike other CPU_* CPU_DISABLE_SSE opt_cpu.h -CPU_ENABLE_SSE opt_cpu.h CPU_FASTER_5X86_FPU opt_cpu.h CPU_GEODE opt_cpu.h CPU_I486_ON_386 opt_cpu.h diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index b04750b..50dbb60 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -116,9 +116,6 @@ cpu I686_CPU # aka Pentium Pro(tm) # technology which allows to restrict power consumption of the CPU by # using group of hw.crusoe.* sysctls. # -# CPU_ENABLE_SSE enables SSE/MMX2 instructions support. This is default -# on I686_CPU and above. -# # CPU_FASTER_5X86_FPU enables faster FPU exception handler. # # CPU_GEODE is for the SC1100 Geode embedded processor. This option @@ -194,7 +191,6 @@ options CPU_ELAN options CPU_ELAN_PPS options CPU_ELAN_XTAL=32768000 options CPU_ENABLE_LONGRUN -options CPU_ENABLE_SSE options CPU_FASTER_5X86_FPU options CPU_GEODE options CPU_I486_ON_386 diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c index 4594724..cec1fa5 100644 --- a/sys/i386/i386/initcpu.c +++ b/sys/i386/i386/initcpu.c @@ -41,12 +41,9 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/specialreg.h> -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif void initializecpu(void); #if defined(I586_CPU) && defined(CPU_WT_ALLOC) diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 909fbf8..be715d0 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -147,12 +147,9 @@ extern void initializecpu(void); #define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif static void cpu_startup(void *); static void fpstate_drop(struct thread *td); diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 5400006..9dc44c5 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -143,12 +143,9 @@ __FBSDID("$FreeBSD$"); #include <machine/smp.h> #endif -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 diff --git a/sys/i386/i386/ptrace_machdep.c b/sys/i386/i386/ptrace_machdep.c index 3c877df..c63daa9 100644 --- a/sys/i386/i386/ptrace_machdep.c +++ b/sys/i386/i386/ptrace_machdep.c @@ -35,12 +35,9 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/pcb.h> -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif int cpu_ptrace(struct thread *td, int req, void *addr, int data) diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 2c7906a..ae2ca9b 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -73,12 +73,9 @@ __FBSDID("$FreeBSD$"); #include <isa/isavar.h> #endif -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif /* * 387 and 287 Numeric Coprocessor Extension (NPX) Driver. diff --git a/sys/i386/linux/linux_ptrace.c b/sys/i386/linux/linux_ptrace.c index f7e3d83..9445028 100644 --- a/sys/i386/linux/linux_ptrace.c +++ b/sys/i386/linux/linux_ptrace.c @@ -46,12 +46,9 @@ __FBSDID("$FreeBSD$"); #include <i386/linux/linux.h> #include <i386/linux/linux_proto.h> -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif /* * Linux ptrace requests numbers. Mostly identical to FreeBSD, diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES index 86f1426..dcac1e7 100644 --- a/sys/pc98/conf/NOTES +++ b/sys/pc98/conf/NOTES @@ -88,9 +88,6 @@ cpu I686_CPU # aka Pentium Pro(tm) # # CPU_DISABLE_SSE explicitly prevents I686_CPU from turning on SSE. # -# CPU_ENABLE_SSE enables SSE/MMX2 instructions support. This is default -# on I686_CPU and above. -# # CPU_FASTER_5X86_FPU enables faster FPU exception handler. # # CPU_I486_ON_386 enables CPU cache on i486 based CPU upgrade products @@ -156,7 +153,6 @@ options CPU_DIRECT_MAPPED_CACHE options CPU_DISABLE_5X86_LSSER options CPU_DISABLE_CMPXCHG #options CPU_DISABLE_SSE -options CPU_ENABLE_SSE options CPU_FASTER_5X86_FPU options CPU_I486_ON_386 options CPU_IORT diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index fa9c058..5c2fa32 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -147,12 +147,9 @@ extern void initializecpu(void); #define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif static void cpu_startup(void *); static void fpstate_drop(struct thread *td); |