diff options
author | peter <peter@FreeBSD.org> | 1997-05-31 08:59:51 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1997-05-31 08:59:51 +0000 |
commit | 72b61693b58d7b9f6e78f631b74f869c521b9e70 (patch) | |
tree | 6eb7cf50baed30be23488d73c676dbeb92c60521 /sys | |
parent | ea8d17534e063b8acf1fc762fddd08b60f73f397 (diff) | |
download | FreeBSD-src-72b61693b58d7b9f6e78f631b74f869c521b9e70.zip FreeBSD-src-72b61693b58d7b9f6e78f631b74f869c521b9e70.tar.gz |
The SWI_NET_MASK and SWI_TTY_MASK handlers are now back adjacent to the
top of the hardware interrupt handlers. Apparently this is slightly
faster with the bit scanning instruction that looks these up - this set of
changes reverts the original change.
Reviewed by: bde
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/amd64/apic_vector.S | 10 | ||||
-rw-r--r-- | sys/amd64/isa/atpic_vector.S | 8 | ||||
-rw-r--r-- | sys/amd64/isa/icu_vector.S | 8 | ||||
-rw-r--r-- | sys/amd64/isa/icu_vector.s | 8 | ||||
-rw-r--r-- | sys/i386/i386/apic_vector.s | 10 | ||||
-rw-r--r-- | sys/i386/isa/apic_vector.s | 10 | ||||
-rw-r--r-- | sys/i386/isa/atpic_vector.s | 8 | ||||
-rw-r--r-- | sys/i386/isa/icu_vector.s | 8 |
8 files changed, 43 insertions, 27 deletions
diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index 70d3dcb..0817521 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: apic_vector.s,v 1.2 1997/05/24 17:05:26 smp Exp smp $ + * $Id: apic_vector.s,v 1.1 1997/05/26 17:58:26 fsmp Exp $ */ @@ -239,14 +239,16 @@ ihandlers: /* addresses of interrupt handlers */ .long Xresume12, Xresume13, Xresume14, Xresume15 .long Xresume16, Xresume17, Xresume18, Xresume19 .long Xresume20, Xresume21, Xresume22, Xresume23 - .long 0, 0, 0, 0 - .long swi_tty, swi_net, _softclock, swi_ast + .long swi_tty, swi_net + .long 0, 0, 0, 0 + .long _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ + .long SWI_TTY_MASK, SWI_NET_MASK .long 0, 0, 0, 0 - .long SWI_TTY_MASK, SWI_NET_MASK, SWI_CLOCK_MASK, SWI_AST_MASK + .long SWI_CLOCK_MASK, SWI_AST_MASK .globl _ivectors _ivectors: diff --git a/sys/amd64/isa/atpic_vector.S b/sys/amd64/isa/atpic_vector.S index fe673a5..e318b33 100644 --- a/sys/amd64/isa/atpic_vector.S +++ b/sys/amd64/isa/atpic_vector.S @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: icu_vector.s,v 1.2 1997/05/24 17:05:26 smp Exp smp $ + * $Id: icu_vector.s,v 1.1 1997/05/26 17:58:26 fsmp Exp $ */ /* @@ -204,14 +204,16 @@ ihandlers: /* addresses of interrupt handlers */ .long Xresume4, Xresume5, Xresume6, Xresume7 .long Xresume8, Xresume9, Xresume10, Xresume11 .long Xresume12, Xresume13, Xresume14, Xresume15 + .long swi_tty, swi_net .long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - .long swi_tty, swi_net, _softclock, swi_ast + .long _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ + .long SWI_TTY_MASK, SWI_NET_MASK .long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - .long SWI_TTY_MASK, SWI_NET_MASK, SWI_CLOCK_MASK, SWI_AST_MASK + .long SWI_CLOCK_MASK, SWI_AST_MASK /* * Interrupt counters and names. The format of these and the label names diff --git a/sys/amd64/isa/icu_vector.S b/sys/amd64/isa/icu_vector.S index fe673a5..e318b33 100644 --- a/sys/amd64/isa/icu_vector.S +++ b/sys/amd64/isa/icu_vector.S @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: icu_vector.s,v 1.2 1997/05/24 17:05:26 smp Exp smp $ + * $Id: icu_vector.s,v 1.1 1997/05/26 17:58:26 fsmp Exp $ */ /* @@ -204,14 +204,16 @@ ihandlers: /* addresses of interrupt handlers */ .long Xresume4, Xresume5, Xresume6, Xresume7 .long Xresume8, Xresume9, Xresume10, Xresume11 .long Xresume12, Xresume13, Xresume14, Xresume15 + .long swi_tty, swi_net .long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - .long swi_tty, swi_net, _softclock, swi_ast + .long _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ + .long SWI_TTY_MASK, SWI_NET_MASK .long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - .long SWI_TTY_MASK, SWI_NET_MASK, SWI_CLOCK_MASK, SWI_AST_MASK + .long SWI_CLOCK_MASK, SWI_AST_MASK /* * Interrupt counters and names. The format of these and the label names diff --git a/sys/amd64/isa/icu_vector.s b/sys/amd64/isa/icu_vector.s index fe673a5..e318b33 100644 --- a/sys/amd64/isa/icu_vector.s +++ b/sys/amd64/isa/icu_vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: icu_vector.s,v 1.2 1997/05/24 17:05:26 smp Exp smp $ + * $Id: icu_vector.s,v 1.1 1997/05/26 17:58:26 fsmp Exp $ */ /* @@ -204,14 +204,16 @@ ihandlers: /* addresses of interrupt handlers */ .long Xresume4, Xresume5, Xresume6, Xresume7 .long Xresume8, Xresume9, Xresume10, Xresume11 .long Xresume12, Xresume13, Xresume14, Xresume15 + .long swi_tty, swi_net .long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - .long swi_tty, swi_net, _softclock, swi_ast + .long _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ + .long SWI_TTY_MASK, SWI_NET_MASK .long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - .long SWI_TTY_MASK, SWI_NET_MASK, SWI_CLOCK_MASK, SWI_AST_MASK + .long SWI_CLOCK_MASK, SWI_AST_MASK /* * Interrupt counters and names. The format of these and the label names diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s index 70d3dcb..0817521 100644 --- a/sys/i386/i386/apic_vector.s +++ b/sys/i386/i386/apic_vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: apic_vector.s,v 1.2 1997/05/24 17:05:26 smp Exp smp $ + * $Id: apic_vector.s,v 1.1 1997/05/26 17:58:26 fsmp Exp $ */ @@ -239,14 +239,16 @@ ihandlers: /* addresses of interrupt handlers */ .long Xresume12, Xresume13, Xresume14, Xresume15 .long Xresume16, Xresume17, Xresume18, Xresume19 .long Xresume20, Xresume21, Xresume22, Xresume23 - .long 0, 0, 0, 0 - .long swi_tty, swi_net, _softclock, swi_ast + .long swi_tty, swi_net + .long 0, 0, 0, 0 + .long _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ + .long SWI_TTY_MASK, SWI_NET_MASK .long 0, 0, 0, 0 - .long SWI_TTY_MASK, SWI_NET_MASK, SWI_CLOCK_MASK, SWI_AST_MASK + .long SWI_CLOCK_MASK, SWI_AST_MASK .globl _ivectors _ivectors: diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s index 70d3dcb..0817521 100644 --- a/sys/i386/isa/apic_vector.s +++ b/sys/i386/isa/apic_vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: apic_vector.s,v 1.2 1997/05/24 17:05:26 smp Exp smp $ + * $Id: apic_vector.s,v 1.1 1997/05/26 17:58:26 fsmp Exp $ */ @@ -239,14 +239,16 @@ ihandlers: /* addresses of interrupt handlers */ .long Xresume12, Xresume13, Xresume14, Xresume15 .long Xresume16, Xresume17, Xresume18, Xresume19 .long Xresume20, Xresume21, Xresume22, Xresume23 - .long 0, 0, 0, 0 - .long swi_tty, swi_net, _softclock, swi_ast + .long swi_tty, swi_net + .long 0, 0, 0, 0 + .long _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ + .long SWI_TTY_MASK, SWI_NET_MASK .long 0, 0, 0, 0 - .long SWI_TTY_MASK, SWI_NET_MASK, SWI_CLOCK_MASK, SWI_AST_MASK + .long SWI_CLOCK_MASK, SWI_AST_MASK .globl _ivectors _ivectors: diff --git a/sys/i386/isa/atpic_vector.s b/sys/i386/isa/atpic_vector.s index fe673a5..e318b33 100644 --- a/sys/i386/isa/atpic_vector.s +++ b/sys/i386/isa/atpic_vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: icu_vector.s,v 1.2 1997/05/24 17:05:26 smp Exp smp $ + * $Id: icu_vector.s,v 1.1 1997/05/26 17:58:26 fsmp Exp $ */ /* @@ -204,14 +204,16 @@ ihandlers: /* addresses of interrupt handlers */ .long Xresume4, Xresume5, Xresume6, Xresume7 .long Xresume8, Xresume9, Xresume10, Xresume11 .long Xresume12, Xresume13, Xresume14, Xresume15 + .long swi_tty, swi_net .long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - .long swi_tty, swi_net, _softclock, swi_ast + .long _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ + .long SWI_TTY_MASK, SWI_NET_MASK .long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - .long SWI_TTY_MASK, SWI_NET_MASK, SWI_CLOCK_MASK, SWI_AST_MASK + .long SWI_CLOCK_MASK, SWI_AST_MASK /* * Interrupt counters and names. The format of these and the label names diff --git a/sys/i386/isa/icu_vector.s b/sys/i386/isa/icu_vector.s index fe673a5..e318b33 100644 --- a/sys/i386/isa/icu_vector.s +++ b/sys/i386/isa/icu_vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: icu_vector.s,v 1.2 1997/05/24 17:05:26 smp Exp smp $ + * $Id: icu_vector.s,v 1.1 1997/05/26 17:58:26 fsmp Exp $ */ /* @@ -204,14 +204,16 @@ ihandlers: /* addresses of interrupt handlers */ .long Xresume4, Xresume5, Xresume6, Xresume7 .long Xresume8, Xresume9, Xresume10, Xresume11 .long Xresume12, Xresume13, Xresume14, Xresume15 + .long swi_tty, swi_net .long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - .long swi_tty, swi_net, _softclock, swi_ast + .long _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ + .long SWI_TTY_MASK, SWI_NET_MASK .long 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - .long SWI_TTY_MASK, SWI_NET_MASK, SWI_CLOCK_MASK, SWI_AST_MASK + .long SWI_CLOCK_MASK, SWI_AST_MASK /* * Interrupt counters and names. The format of these and the label names |