New interrupt code from Bruce Evans. In additional to Bruce's attached

list of changes, I've made the following additional changes:

1) i386/include/ipl.h renamed to spl.h as the name conflicts with the
   file of the same name in i386/isa/ipl.h.
2) changed all use of *mask (i.e. netmask, biomask, ttymask, etc) to
   *_imask (net_imask, etc).
3) changed vestige of splnet use in if_is to splimp.
4) got rid of "impmask" completely (Bruce had gotten rid of netmask),
   and are now using net_imask instead.
5) dozens of minor cruft to glue in Bruce's changes.

   These require changes I made to config(8) as well, and thus it must
be rebuilt.

-DG

from Bruce Evans:

sio:
	o No diff is supplied.  Remove the define of setsofttty().  I hope
	  that is enough.

*.s:
	o i386/isa/debug.h no longer exists.  The event counters became too
	  much trouble to maintain.  All function call entry and exception
	  entry counters can be recovered by using profiling kernel (the new
	  profiling supports all entry points; however, it is too slow to
	  leave enabled all the time; it also).  Only BDBTRAP() from debug.h
	  is now used.  That is moved to exception.s.  It might be worth
	  preserving SHOW_BITS() and calling it from _mcount() (if enabled).
	o T_ASTFLT is now only set just before calling trap().
	o All exception handlers set SWI_AST_MASK in cpl as soon as possible
	  after entry and arrange for _doreti to restore it atomically with
	  exiting.  It is not possible to set it atomically with entering
	  the kernel, so it must be checked against the user mode bits in
	  the trap frame before committing to using it.  There is no place
	  to store the old value of cpl for syscalls or traps, so there are
	  some complications restoring it.

Profiling stuff (mostly in *.s):
	o Changes to kern/subr_mcount.c, gcc and gprof are not supplied yet.
	o All interesting labels `foo' are renamed `_foo' and all
	  uninteresting labels `_bar' are renamed `bar'.  A small change
	  to gprof allows ignoring labels not starting with underscores.
	o MCOUNT_LABEL() is to provide names for counters for times spent
	  in exception handlers.
	o FAKE_MCOUNT() is a version of MCOUNT() suitable for exception
	  handlers.  Its arg is the pc where the exception occurred.  The
	  new mcount() pretends that this was a call from that pc to a
	  suitable MCOUNT_LABEL().
	o MEXITCOUNT is to turn off any timer started by MCOUNT().

/usr/src/sys/i386/i386/exception.s:
	o The non-BDB BPTTRAP() macros were doing a sti even when interrupts
	  were disabled when the trap occurred.  The sti (fixed) sti is
	  actually a no-op unless you have my changes to machdep.c that make
	  the debugger trap gates interrupt gates, but fixing that would
	  make the ifdefs messier.  ddb seems to be unharmed by both
	  interrupts always disabled and always enabled (I had the branch in
	  the fix back to front for some time :-().
	o There is no known pushal bug.
	o tf_err can be left as garbage for syscalls.

/usr/src/sys/i386/i386/locore.s:
	o Fix and update BDE_DEBUGGER support.
	o ENTRY(btext) before initialization was dangerous.
	o Warm boot shot was longer than intended.

/usr/src/sys/i386/i386/machdep.c:
	o DON'T APPLY ALL OF THIS DIFF.  It's what I'm using, but may require
	  other changes.
	  Use the following:
		o Remove aston() and setsoftclock().
	  Maybe use the following:
		o No netisr.h.
		o Spelling fix.
		o Delay to read the Rebooting message.
		o Fix for vm system unmapping a reduced area of memory
		  after bounds_check_with_label() reduces the size of
		  a physical i/o for a partition boundary.  A similar
		  fix is required in kern_physio.c.
		o Correct use of __CONCAT.  It never worked here for non-
		  ANSI cpp's.  Is it time to drop support for non-ANSI?
		o gdt_segs init.  0xffffffffUL is bogus because ssd_limit
		  is not 32 bits.  The replacement may have the same
		  value :-), but is more natural.
		o physmem was one page too low.  Confusing variable names.
	  Don't use the following:
		o Better numbers of buffers.  Each 8K page requires up to
		  16 buffer headers.  On my system, this results in 5576
		  buffers containing [up to] 2854912 bytes of memory.
		  The usual allocation of about 384 buffers only holds
		  192K of disk if you use it on an fs with a block size
		  of 512.
		o gdt changes for bdb.
		o *TGT -> *IDT changes for bdb.
		o #ifdefed changes for bdb.

/usr/src/sys/i386/i386/microtime.s:
	o Use the correct asm macros.  I think asm.h was copied from Mach
	  just for microtime and isn't used now.  It certainly doesn't
	  belong in <sys>.  Various macros are also duplicated in
	  sys/i386/boot.h and libc/i386/*.h.
	o Don't switch to and from the IRR; it is guaranteed to be selected
	  (default after ICU init and explicitly selected in isa.c too, and
	  never changed until the old microtime clobbered it).

/usr/src/sys/i386/i386/support.s:
	o Non-essential changes (none related to spls or profiling).
	o Removed slow loads of %gs again.  The LDT support may require
	  not relying on %gs, but loading it is not the way to fix it!
	  Some places (copyin ...) forgot to load it.  Loading it clobbers
	  the user %gs.  trap() still loads it after certain types of
	  faults so that fuword() etc can rely on it without loading it
	  explicitly.  Exception handlers don't restore it.  If we want
	  to preserve the user %gs, then the fastest method is to not
	  touch it except for context switches.  Comparing with
	  VM_MAXUSER_ADDRESS and branching takes only 2 or 4 cycles on
	  a 486, while loading %gs takes 9 cycles and using it takes
	  another.
	o Fixed a signed branch to unsigned.

/usr/src/sys/i386/i386/swtch.s:
	o Move spl0() outside of idle loop.
	o Remove cli/sti from idle loop.  sw1 does a cli, and in the
	  unlikely event of an interrupt occurring and whichqs becoming
	  zero, sw1 will just jump back to _idle.
	o There's no spl0() function in asm any more, so use splz().
	o swtch() doesn't need to be superaligned, at least with the
	  new mcounting.
	o Fixed a signed branch to unsigned.
	o Removed astoff().

/usr/src/sys/i386/i386/trap.c:
	o The decentralized extern decls were inconsistent, of course.
	o Fixed typo MATH_EMULTATE in comments. */
	o Removed unused variables.
	o Old netmask is now impmask; print it instead.  Perhaps we
	  should print some of the new masks.
	o BTW, trap() should not print anything for normal debugger
	  traps.

/usr/src/sys/i386/include/asmacros.h:
	o DON'T APPLY ALL OF THIS DIFF.  Just use some of the null macros
	  as necessary.

/usr/src/sys/i386/include/cpu.h:
	o CLKF_BASEPRI() changes since cpl == SWI_AST_MASK is now normal
	  while the kernel is running.
	o Don't use var++ to set boolean variables.  It fails after a mere
	  4G times :-) and is slower than storing a constant on [3-4]86s.

/usr/src/sys/i386/include/cpufunc.h:
	o DON'T APPLY ALL OF THIS DIFF.  You need mainly the include of
	  <machine/ipl.h>.  Unfortunately, <machine/ipl.h> is needed by
	  almost everything for the inlines.

/usr/src/sys/i386/include/ipl.h:
	o New file.  Defines spl inlines and SWI macros and declares most
	  variables related to hard and soft interrupt masks.

/usr/src/sys/i386/isa/icu.h:
	o Moved definitions to <machine/ipl.h>

/usr/src/sys/i386/isa/icu.s:
	o Software interrupts (SWIs) and delayed hardware interrupts (HWIs)
	  are now handled uniformally, and dispatching them from splx() is
	  more like dispatching them from _doreti.  The dispatcher is
	  essentially *(handler[ffs(ipending & ~cpl)]().
	o More care (not quite enough) is taken to avoid unbounded nesting
	  of interrupts.
	o The interface to softclock() is changed so that a trap frame is
	  not required.
	o Fast interrupt handlers are now handled more uniformally.
	  Configuration is still too early (new handlers would require
	  bits in <machine/ipl.h> and functions to vector.s).
	o splnnn() and splx() are no longer here; they are inline functions
	  (could be macros for other compilers).  splz() is the nontrivial
	  part of the old splx().

/usr/src/sys/i386/isa/ipl.h
	o New file.  Supposed to have only bus-dependent stuff.  Perhaps
	  the h/w masks should be declared here.

/usr/src/sys/i386/isa/isa.c:
	o DON'T APPLY ALL OF THIS DIFF.  You need only things involving
	  *mask and *MASK and comments about them.  netmask is now a pure
	  software mask.  It works like the softclock mask.

/usr/src/sys/i386/isa/vector.s:
	o Reorganize AUTO_EOI* macros.
	o Option FAST_INTR_HANDLER_USERS_ES for people who don't trust
	  fastintr handlers.
	o fastintr handlers need to metamorphose into ordinary interrupt
	  handlers if their SWI bit has become set.  Previously, sio had
	  unintended latency for handling output completions and input
	  of SLIP framing characters because this was not done.

/usr/src/sys/net/netisr.h:
	o The machine-dependent stuff is now imported from <machine/ipl.h>.

/usr/src/sys/sys/systm.h
	o DON'T APPLY ALL OF THIS DIFF.  You need mainly the different
	  splx() prototype.  The spl*() prototypes are duplicated as
	  inlines in <machine/ipl.h> but they need to be duplicated here
	  in case there are no inlines.  I sent systm.h and cpufunc.h
	  to Garrett.  We agree that spl0 should be replaced by splnone
	  and not the other way around like I've done.

/usr/src/sys/kern/kern_clock.c
	o splsoftclock() now lowers cpl so the direct call to softclock()
	  works as intended.
	o softclock() interface changed to avoid passing the whole frame
	  (some machines may need another change for profile_tick()).
	o profiling renamed _profiling to avoid ANSI namespace pollution.
	  (I had to improve the mcount() interface and may as well fix it.)
	  The GUPROF variant doesn't actually reference profiling here,
	  but the 'U' in GUPROF should mean to select the microtimer
	  mcount() and not change the interface.

1 files changed, 94 insertions, 102 deletions

diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s
index d434c76..7135ae7 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.5 1993/12/20 15:08:33 wollman Exp $
+ *	$Id: vector.s,v 1.6 1994/01/10 23:15:09 ache Exp $
  */
 
 #include "i386/isa/icu.h"
@@ -12,24 +12,44 @@
 #define	IRQ_BIT(irq_num)	(1 << ((irq_num) % 8))
 #define	IRQ_BYTE(irq_num)	((irq_num) / 8)
 
+#ifdef AUTO_EOI_1
+#define	ENABLE_ICU1		/* use auto-EOI to reduce i/o */
+#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 */
-#ifdef AUTO_EOI_1
-#undef	ENABLE_ICU1		/* we now use auto-EOI to reduce i/o */
-#define	ENABLE_ICU1
 #endif
 
+#ifdef AUTO_EOI_2
+/*
+ * The data sheet says no auto-EOI on slave, but it sometimes works.
+ */
+#define	ENABLE_ICU1_AND_2	ENABLE_ICU1
+#else
 #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 */
-#ifdef AUTO_EOI_2
-#undef	ENABLE_ICU1_AND_2	/* data sheet says no auto-EOI on slave ... */
-#define	ENABLE_ICU1_AND_2	/* ... but it works */
+#endif
+
+#ifdef FAST_INTR_HANDLER_USES_ES
+#define	ACTUALLY_PUSHED		1
+#define	MAYBE_MOVW_AX_ES	movl	%ax,%es
+#define	MAYBE_POPL_ES		popl	%es
+#define	MAYBE_PUSHL_ES		pushl	%es
+#else
+/*
+ * We can usually skip loading %es for fastintr handlers.  %es should
+ * only be used for string instructions, and fastintr handlers shouldn't
+ * do anything slow enough to justify using a string instruction.
+ */
+#define	ACTUALLY_PUSHED		0
+#define	MAYBE_MOVW_AX_ES
+#define	MAYBE_POPL_ES
+#define	MAYBE_PUSHL_ES
 #endif
 
 /*
@@ -82,39 +102,63 @@
 	pushl	%ecx ; \
 	pushl	%edx ; \
 	pushl	%ds ; \
-	/* pushl	%es ; know compiler doesn't do string insns */ \
+	MAYBE_PUSHL_ES ; \
 	movl	$KDSEL,%eax ; \
 	movl	%ax,%ds ; \
-	/* movl	%ax,%es ; */ \
-	SHOW_CLI ;		/* although it interferes with "ASAP" */ \
+	MAYBE_MOVW_AX_ES ; \
+	FAKE_MCOUNT((4+ACTUALLY_PUSHED)*4(%esp)) ; \
 	pushl	$unit ; \
 	call	handler ;	/* do the work ASAP */ \
 	enable_icus ;		/* (re)enable ASAP (helps edge trigger?) */ \
 	addl	$4,%esp ; \
 	incl	_cnt+V_INTR ;	/* book-keeping can wait */ \
-	COUNT_EVENT(_intrcnt_actv, id_num) ; \
-	SHOW_STI ; \
-	/* popl	%es ; */ \
+	incl	_intrcnt_actv + (id_num) * 4 ; \
+	movl	_cpl,%eax ;	/* are we unmasking pending HWIs or SWIs? */ \
+	notl	%eax ; \
+	andl	_ipending,%eax ; \
+	jne	1f ;		/* yes, handle them */ \
+	MEXITCOUNT ; \
+	MAYBE_POPL_ES ; \
 	popl	%ds ; \
-	popl	%edx; \
-	popl	%ecx; \
-	popl	%eax; \
-	iret
+	popl	%edx ; \
+	popl	%ecx ; \
+	popl	%eax ; \
+	iret ; \
+; \
+	ALIGN_TEXT ; \
+1: ; \
+	movl	_cpl,%eax ; \
+	movl	$HWI_MASK|SWI_MASK,_cpl ;	/* limit nesting ... */ \
+	sti ;			/* ... to do this as early as possible */ \
+	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 */ \
+	pushal ;		/* build fat frame (grrr) ... */ \
+	pushl	%ecx ;		/* ... actually %ds ... */ \
+	pushl	%es ; \
+	movl	$KDSEL,%eax ; \
+	movl	%ax,%es ; \
+	movl	(2+8+0)*4(%esp),%ecx ;	/* ... %ecx from thin frame ... */ \
+	movl	%ecx,(2+6)*4(%esp) ;	/* ... to fat frame ... */ \
+	movl	(2+8+1)*4(%esp),%eax ;	/* ... cpl from thin frame */ \
+	pushl	%eax ; \
+	subl	$4,%esp ;	/* junk for unit number */ \
+	MEXITCOUNT ; \
+	jmp	_doreti
 
 #define	INTR(unit, irq_num, id_num, mask, handler, icu, enable_icus, reg, stray) \
-	pushl	$0 ;		/* dummy error code */ \
-	pushl	$T_ASTFLT ; \
+	pushl	$0 ;		/* dumby error code */ \
+	pushl	$0 ;		/* dumby trap type */ \
 	pushal ; \
-	pushl	%ds ; 		/* save our data and extra segments ... */ \
+	pushl	%ds ;		/* save our data and extra segments ... */ \
 	pushl	%es ; \
 	movl	$KDSEL,%eax ;	/* ... and reload with kernel's own ... */ \
-	movl	%ax,%ds ; 	/* ... early in case SHOW_A_LOT is on */ \
+	movl	%ax,%ds ;	/* ... early for obsolete reasons */ \
 	movl	%ax,%es ; \
-	SHOW_CLI ;		/* interrupt did an implicit cli */ \
 	movb	_imen + IRQ_BYTE(irq_num),%al ; \
 	orb	$IRQ_BIT(irq_num),%al ; \
 	movb	%al,_imen + IRQ_BYTE(irq_num) ; \
-	SHOW_IMEN ; \
 	FASTER_NOP ; \
 	outb	%al,$icu+1 ; \
 	enable_icus ; \
@@ -123,32 +167,32 @@
 	testb	$IRQ_BIT(irq_num),%reg ; \
 	jne	2f ; \
 1: ; \
-	COUNT_EVENT(_intrcnt_actv, id_num) ; \
+	FAKE_MCOUNT(12*4(%esp)) ;	/* XXX late to avoid double count */ \
+	incl	_intrcnt_actv + (id_num) * 4 ; \
 	movl	_cpl,%eax ; \
 	pushl	%eax ; \
 	pushl	$unit ; \
 	orl	mask,%eax ; \
 	movl	%eax,_cpl ; \
-	SHOW_CPL ; \
-	SHOW_STI ; \
 	sti ; \
 	call	handler ; \
 	movb	_imen + IRQ_BYTE(irq_num),%al ; \
 	andb	$~IRQ_BIT(irq_num),%al ; \
 	movb	%al,_imen + IRQ_BYTE(irq_num) ; \
-	SHOW_IMEN ; \
 	FASTER_NOP ; \
 	outb	%al,$icu+1 ; \
-	jmp	doreti ; \
+	MEXITCOUNT ; \
+	/* We could usually avoid the following jmp by inlining some of */ \
+	/* _doreti, but it's probably better to use less cache. */ \
+	jmp	_doreti ; \
 ; \
 	ALIGN_TEXT ; \
 2: ; \
-	COUNT_EVENT(_intrcnt_pend, id_num) ; \
+	/* XXX skip mcounting here to avoid double count */ \
 	movl	$1b,%eax ;	/* register resume address */ \
 				/* XXX - someday do it at attach time */ \
-	movl	%eax,Vresume + (irq_num) * 4 ;	\
+	movl	%eax,ihandlers + (irq_num) * 4 ;	\
 	orb	$IRQ_BIT(irq_num),_ipending + IRQ_BYTE(irq_num) ; \
-	SHOW_IPENDING ; \
 	popl	%es ; \
 	popl	%ds ; \
 	popal ; \
@@ -191,7 +235,7 @@
 	.globl	_V/**/name ; \
 	SUPERALIGN_TEXT ; \
 _V/**/name: ; \
-	FAST_INTR(unit, irq_num, id_num, handler, ENABLE_ICU/**/icu_enables)
+	FAST_INTR(unit, irq_num,id_num, handler, ENABLE_ICU/**/icu_enables)
 
 #undef BUILD_VECTOR
 #define	BUILD_VECTOR(name, unit, irq_num, id_num, mask, handler, \
@@ -201,9 +245,10 @@ _V/**/name: ; \
 	.globl	_V/**/name ; \
 	SUPERALIGN_TEXT ; \
 _V/**/name: ; \
-	INTR(unit,irq_num,id_num, mask, handler, IO_ICU/**/icu_num, \
+	INTR(unit,irq_num, id_num, mask, handler, IO_ICU/**/icu_num, \
 	     ENABLE_ICU/**/icu_enables, reg,)
 
+MCOUNT_LABEL(bintr)
 	BUILD_VECTORS
 
 	/* hardware interrupt catcher (IDT 32 - 47) */
@@ -211,7 +256,7 @@ _V/**/name: ; \
 
 #define	STRAYINTR(irq_num, icu_num, icu_enables, reg) \
 IDTVEC(intr/**/irq_num) ; \
-	INTR(irq_num,irq_num,irq_num, _highmask,  _isa_strayintr, \
+	INTR(irq_num,irq_num,irq_num, _high_imask,  _isa_strayintr, \
 		  IO_ICU/**/icu_num, ENABLE_ICU/**/icu_enables, reg,stray)
 
 /*
@@ -241,6 +286,7 @@ IDTVEC(intr/**/irq_num) ; \
 	STRAYINTR(4,1,1, al)
 	STRAYINTR(5,1,1, al)
 	STRAYINTR(6,1,1, al)
+	STRAYINTR(7,1,1, al)
 	STRAYINTR(8,2,1_AND_2, ah)
 	STRAYINTR(9,2,1_AND_2, ah)
 	STRAYINTR(10,2,1_AND_2, ah)
@@ -249,11 +295,11 @@ IDTVEC(intr/**/irq_num) ; \
 	STRAYINTR(13,2,1_AND_2, ah)
 	STRAYINTR(14,2,1_AND_2, ah)
 	STRAYINTR(15,2,1_AND_2, ah)
-IDTVEC(intrdefault)
-	STRAYINTR(7,1,1, al)	/* XXX */
 #if 0
 	INTRSTRAY(255, _highmask, 255) ; call	_isa_strayintr ; INTREXIT2
 #endif
+MCOUNT_LABEL(eintr)
+
 /*
  * These are the interrupt counters, I moved them here from icu.s so that
  * they are with the name table.  rgrimes
@@ -263,7 +309,15 @@ IDTVEC(intrdefault)
  * work with vmstat.
  */
 	.data
-Vresume:        .space  32 * 4  /* where to resume intr handler after unpend */
+ihandlers:			/* addresses of interrupt handlers */
+	.space	NHWI*4		/* actually resumption addresses for HWI's */
+	.long	swi_tty, swi_net, 0, 0, 0, 0, 0, 0
+	.long	0, 0, 0, 0, 0, 0, swi_clock, swi_ast
+imasks:				/* masks for interrupt handlers */
+	.space	NHWI*4		/* padding; HWI masks are elsewhere */
+	.long	SWI_TTY_MASK, SWI_NET_MASK, 0, 0, 0, 0, 0, 0
+	.long	0, 0, 0, 0, 0, 0, SWI_CLOCK_MASK, SWI_AST_MASK
+
 	.globl	_intrcnt
 _intrcnt:			/* used by vmstat to calc size of table */
 	.globl	_intrcnt_bad7
@@ -274,14 +328,8 @@ _intrcnt_bad15:	.space	4	/* glitches on irq 15 */
 _intrcnt_stray:	.space	4	/* total count of stray interrupts */
 	.globl	_intrcnt_actv
 _intrcnt_actv:	.space	NR_REAL_INT_HANDLERS * 4	/* active interrupts */
-	.globl	_intrcnt_pend
-_intrcnt_pend:	.space	NR_REAL_INT_HANDLERS * 4	/* pending interrupts */
 	.globl	_eintrcnt
 _eintrcnt:			/* used by vmstat to calc size of table */
-	.globl	_intrcnt_spl
-_intrcnt_spl:	.space	32 * 4	/* XXX 32 should not be hard coded ? */
-	.globl	_intrcnt_show
-_intrcnt_show:	.space	8 * 4	/* XXX 16 should not be hard coded ? */
 
 /*
  * Build the interrupt name table for vmstat
@@ -296,8 +344,9 @@ _intrcnt_show:	.space	8 * 4	/* XXX 16 should not be hard coded ? */
 	.ascii	"name irq" ; \
 	.asciz	"irq_num"
 /*
- * XXX - use the STRING and CONCAT macros from <sys/cdefs.h> to stringize
- * and concatenate names above and elsewhere.
+ * XXX - use the __STRING and __CONCAT macros from <sys/cdefs.h> to stringize
+ * and concatenate names above and elsewhere.  Note that __CONCAT doesn't
+ * work when nested.
  */
 
 	.text
@@ -308,61 +357,4 @@ _intrnames:
 	BUILD_VECTOR(stray,,,,,,,,)
 	BUILD_VECTORS
 
-#undef BUILD_FAST_VECTOR
-#define BUILD_FAST_VECTOR	BUILD_VECTOR
-
-#undef BUILD_VECTOR
-#define	BUILD_VECTOR(name, unit, irq_num, id_num, mask, handler, \
-		     icu_num, icu_enables, reg) \
-	.asciz	"name pend"
-
-	BUILD_VECTORS
 _eintrnames:
-
-/*
- * now the spl names
- */
-	.asciz	"unpend_v"
-	.asciz	"doreti"
-	.asciz	"p0!ni"
-	.asciz	"!p0!ni"
-	.asciz	"p0ni"
-	.asciz	"netisr_raw"
-	.asciz	"netisr_ip"
-	.asciz	"netisr_imp"
-	.asciz	"netisr_ns"
-	.asciz	"netisr_iso"
-	.asciz	"softclock"		/* 10 */
-	.asciz	"trap"
-	.asciz	"doreti_exit2"
-	.asciz	"splbio"
-	.asciz	"splclock"
-	.asciz	"splhigh"
-	.asciz	"splimp"
-	.asciz	"splnet"
-	.asciz	"splsoftclock"
-	.asciz	"spltty"
-	.asciz	"spl0"			/* 20 */
-	.asciz	"netisr_raw2"
-	.asciz	"netisr_ip2"
-	.asciz	"netisr_imp2"
-	.asciz	"netisr_ns2"
-	.asciz	"netisr_iso2"
-	.asciz	"splx"
-	.asciz	"splx!0"
-	.asciz	"unpend_V"
-	.asciz	"netisr_x25"
-	.asciz	"netisr_hdlc"
-	.asciz	"spl31"
-/*
- * now the mask names
- */
-	.asciz	"cli"
-	.asciz	"cpl"
-	.asciz	"imen"
-	.asciz	"ipending"
-	.asciz	"sti"
-	.asciz	"mask5"		/* mask5-mask7 are spares */
-	.asciz	"mask6"
-	.asciz	"mask7"
-