diff options
| author | fsmp <fsmp@FreeBSD.org> | 1997-04-28 01:47:55 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 1997-04-28 01:47:55 +0000 |
| commit | 222b28542afdee88c1971ce4e5f51a241da5827c (patch) | |
| tree | d2333cb55b5dc911f6e3cecb053baf957b50ac79 /sys/i386/isa/vector.s | |
| parent | cd2cd1174ec29ab4d44d378f719360f09c825287 (diff) | |
| download | FreeBSD-src-222b28542afdee88c1971ce4e5f51a241da5827c.zip FreeBSD-src-222b28542afdee88c1971ce4e5f51a241da5827c.tar.gz | |
removed TEST_CPUHITS code.
replaced push/pop of %ds with use of 'ss' prefix in Xinvltlb.
Submitted by: Bruce Evans <bde@zeta.org.au>
Diffstat (limited to 'sys/i386/isa/vector.s')
| -rw-r--r-- | sys/i386/isa/vector.s | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s index c7125ca..c316f15 100644 --- a/sys/i386/isa/vector.s +++ b/sys/i386/isa/vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.26 1997/04/26 11:46:07 peter Exp $ + * $Id: vector.s,v 1.27 1997/04/27 21:18:59 fsmp Exp $ */ /* @@ -12,7 +12,6 @@ #if defined(SMP) #include <machine/smpasm.h> /* this includes <machine/apic.h> */ -#include <machine/smptests.h> /** TEST_CPUHITS */ #endif /* SMP */ #include <i386/isa/icu.h> @@ -44,16 +43,6 @@ #if defined(APIC_IO) -#if defined(SMP) && defined(TEST_CPUHITS) - -#undef GET_MPLOCK -#define GET_MPLOCK \ - call _get_mplock ; \ - GETCPUID(%eax) ; \ - incl _cpuhits(,%eax,4) - -#endif /* SMP && TEST_CPUHITS */ - #define REDTBL_IDX(irq_num) (0x10 + ((irq_num) * 2)) #define IRQ_BIT(irq_num) (1 << (irq_num)) @@ -351,23 +340,10 @@ _Xinvltlb: pushl %eax movl %cr3, %eax movl %eax, %cr3 -#if 0 -/** XXX FIXME: convert to Bruces suggested 'ss' style, eliminating %ds */ - ss - incl _ipihits ss movl _apic_base, %eax ss movl $0, APIC_EOI(%eax) -#else - pushl %ds - movl $KDSEL,%eax - movl %ax,%ds - incl _ipihits - movl _apic_base, %eax - movl $0, APIC_EOI(%eax) - popl %ds -#endif popl %eax iret #endif /* APIC_IO */ @@ -474,23 +450,6 @@ _ivectors: iactive: .long 0 - .globl _ipihits -_ipihits: - .long 0 - -#if defined(TEST_CPUHITS) - .globl _cpuhits -_cpuhits: -#if !defined(NCPU) -/** - * FIXME: need a way to pass NCPU to .s files. - * NCPU currently defined in smp.h IF NOT defined in opt_smp.h. - */ -#define NCPU 4 -#endif /* NCPU */ - .space NCPU*4 -#endif /* TEST_CPUHITS */ - #endif /* APIC_IO */ /* |
