d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the CPU_ENABLE_SSE option from the i386 and pc98 architectures,

Browse Source 
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)
This commit is contained in:
Xin LI 2005-07-02 20:06:44 +00:00
parent 5116398a06
commit 60baed3742
11 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/conf/options.i386
View File

@ -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

1
sys/conf/options.pc98
View File

@ -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

4
sys/i386/conf/NOTES
View File

@ -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

5
sys/i386/i386/initcpu.c
View File

@ -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)

5
sys/i386/i386/machdep.c
View File

@ -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);

5
sys/i386/i386/pmap.c
View File

@ -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

5
sys/i386/i386/ptrace_machdep.c
View File

@ -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)

5
sys/i386/isa/npx.c
View File

@ -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.

5
sys/i386/linux/linux_ptrace.c
View File

@ -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,

4
sys/pc98/conf/NOTES
View File

@ -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

5
sys/pc98/pc98/machdep.c
View File

@ -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);