diff options
| author | bde <bde@FreeBSD.org> | 1995-04-15 21:32:18 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1995-04-15 21:32:18 +0000 |
| commit | e507a852ee094d38d2c406cb293e98ac537a87a8 (patch) | |
| tree | 432994513824515825ee94b6fef380fdb22c3990 /sys/i386/isa/vector.s | |
| parent | 3431d053fa86499ee92a8ee702ab458cc8262022 (diff) | |
| download | FreeBSD-src-e507a852ee094d38d2c406cb293e98ac537a87a8.zip FreeBSD-src-e507a852ee094d38d2c406cb293e98ac537a87a8.tar.gz | |
Don't waste time sending an EOI to ICU1 if option AUTO_EOI_1 is defined.
Previously, this worked right if both AUTO_EOI_1 and AUTO_EOI_2 are
defined, but not if AUTO_EOI_1 is defined and AUTO_EOI_2 is not defined.
The latter case should be the default. DUMMY_NOPS should be the default
too. Currently there are only two NOPs slowing down rtcin() (although
there are no delays in writertc()) and several FASTER_NOPs slowing down
interrupt handling in vector.s.
Fix stack offsets for the (previously) unused untested
FAST_INTR_HANDLER_USES_ES case.
Diffstat (limited to 'sys/i386/isa/vector.s')
| -rw-r--r-- | sys/i386/isa/vector.s | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s index fcd0a77..bbed601 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.10 1994/11/01 23:29:50 bde Exp $ + * $Id: vector.s,v 1.11 1994/12/03 10:03:19 bde Exp $ */ #include <i386/isa/icu.h> @@ -13,11 +13,14 @@ #ifdef AUTO_EOI_1 #define ENABLE_ICU1 /* use auto-EOI to reduce i/o */ +#define OUTB_ICU1 #else #define ENABLE_ICU1 \ movb $ICU_EOI,%al ; /* as soon as possible send EOI ... */ \ - FASTER_NOP ; /* ... ASAP ... */ \ - outb %al,$IO_ICU1 /* ... to clear in service bit */ + OUTB_ICU1 /* ... to clear in service bit */ +#define OUTB_ICU1 \ + FASTER_NOP ; \ + outb %al,$IO_ICU1 #endif #ifdef AUTO_EOI_2 @@ -29,9 +32,8 @@ #define ENABLE_ICU1_AND_2 \ movb $ICU_EOI,%al ; /* as above */ \ FASTER_NOP ; \ - outb %al,$IO_ICU2 ; /* but do second icu first */ \ - FASTER_NOP ; \ - outb %al,$IO_ICU1 /* then first icu */ + outb %al,$IO_ICU2 ; /* but do second icu first ... */ \ + OUTB_ICU1 /* ... then first icu (if !AUTO_EOI_1) */ #endif #ifdef FAST_INTR_HANDLER_USES_ES @@ -136,7 +138,7 @@ IDTVEC(fastintr/**/irq_num) ; \ MAYBE_POPL_ES ; /* discard most of thin frame ... */ \ popl %ecx ; /* ... original %ds ... */ \ popl %edx ; \ - xchgl %eax,(1+ACTUALLY_PUSHED)*4(%esp) ; /* orig %eax; save cpl */ \ + xchgl %eax,4(%esp) ; /* orig %eax; save cpl */ \ pushal ; /* build fat frame (grrr) ... */ \ pushl %ecx ; /* ... actually %ds ... */ \ pushl %es ; \ |
