diff options
author | peter <peter@FreeBSD.org> | 2001-08-24 08:27:24 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2001-08-24 08:27:24 +0000 |
commit | 5ccbb1e22b45c1c388123f3802ea88c1fb9ac98f (patch) | |
tree | 0ab210777ff616e3f1b960aed9fa86b60790f4fb | |
parent | 7ebebd69707a9b23428aa7bfe2bba66d2a8eb016 (diff) | |
download | FreeBSD-src-5ccbb1e22b45c1c388123f3802ea88c1fb9ac98f.zip FreeBSD-src-5ccbb1e22b45c1c388123f3802ea88c1fb9ac98f.tar.gz |
Move cpu_fxsr definition to C code (so debug info is generated) and where
it is easily #ifdef'ed so that we dont miss unintentional references to it.
-rw-r--r-- | sys/amd64/amd64/initcpu.c | 4 | ||||
-rw-r--r-- | sys/amd64/amd64/locore.S | 3 | ||||
-rw-r--r-- | sys/amd64/amd64/locore.s | 3 | ||||
-rw-r--r-- | sys/i386/i386/initcpu.c | 4 | ||||
-rw-r--r-- | sys/i386/i386/locore.s | 3 |
5 files changed, 11 insertions, 6 deletions
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c index ba14116..eae6d32 100644 --- a/sys/amd64/amd64/initcpu.c +++ b/sys/amd64/amd64/initcpu.c @@ -70,6 +70,10 @@ SYSCTL_INT(_hw, OID_AUTO, instruction_sse, CTLFLAG_RD, &hw_instruction_sse, 0, "SIMD/MMX2 instructions available in CPU"); +#ifdef CPU_ENABLE_SSE +u_int cpu_fxsr; /* SSE enabled */ +#endif + #ifdef I486_CPU /* * IBM Blue Lightning diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 9d106a4..3007ee1 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -113,13 +113,12 @@ HIDENAME(tmpstk): .globl boothowto,bootdev .globl cpu,cpu_vendor,cpu_id,bootinfo - .globl cpu_high, cpu_feature, cpu_fxsr + .globl cpu_high, cpu_feature cpu: .long 0 /* are we 386, 386sx, or 486 */ cpu_id: .long 0 /* stepping ID */ cpu_high: .long 0 /* highest arg to CPUID */ cpu_feature: .long 0 /* features */ -cpu_fxsr: .long 0 /* use fxsave/fxrstor instruction */ cpu_vendor: .space 20 /* CPU origin code */ bootinfo: .space BOOTINFO_SIZE /* bootinfo that we can handle */ diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s index 9d106a4..3007ee1 100644 --- a/sys/amd64/amd64/locore.s +++ b/sys/amd64/amd64/locore.s @@ -113,13 +113,12 @@ HIDENAME(tmpstk): .globl boothowto,bootdev .globl cpu,cpu_vendor,cpu_id,bootinfo - .globl cpu_high, cpu_feature, cpu_fxsr + .globl cpu_high, cpu_feature cpu: .long 0 /* are we 386, 386sx, or 486 */ cpu_id: .long 0 /* stepping ID */ cpu_high: .long 0 /* highest arg to CPUID */ cpu_feature: .long 0 /* features */ -cpu_fxsr: .long 0 /* use fxsave/fxrstor instruction */ cpu_vendor: .space 20 /* CPU origin code */ bootinfo: .space BOOTINFO_SIZE /* bootinfo that we can handle */ diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c index ba14116..eae6d32 100644 --- a/sys/i386/i386/initcpu.c +++ b/sys/i386/i386/initcpu.c @@ -70,6 +70,10 @@ SYSCTL_INT(_hw, OID_AUTO, instruction_sse, CTLFLAG_RD, &hw_instruction_sse, 0, "SIMD/MMX2 instructions available in CPU"); +#ifdef CPU_ENABLE_SSE +u_int cpu_fxsr; /* SSE enabled */ +#endif + #ifdef I486_CPU /* * IBM Blue Lightning diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index 9d106a4..3007ee1 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -113,13 +113,12 @@ HIDENAME(tmpstk): .globl boothowto,bootdev .globl cpu,cpu_vendor,cpu_id,bootinfo - .globl cpu_high, cpu_feature, cpu_fxsr + .globl cpu_high, cpu_feature cpu: .long 0 /* are we 386, 386sx, or 486 */ cpu_id: .long 0 /* stepping ID */ cpu_high: .long 0 /* highest arg to CPUID */ cpu_feature: .long 0 /* features */ -cpu_fxsr: .long 0 /* use fxsave/fxrstor instruction */ cpu_vendor: .space 20 /* CPU origin code */ bootinfo: .space BOOTINFO_SIZE /* bootinfo that we can handle */ |