diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2002-04-28 21:48:09 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2002-04-28 21:48:09 +0000 |
| commit | 42b9b5074b7c50d4313c246fdb8a2c9f40812bf1 (patch) | |
| tree | a4ad19e31bd5f49092f13472a2bf8cf15b21fe21 /sys | |
| parent | 4adc9957c8bc849549a51c1c6e1bf320852bc2c1 (diff) | |
Use assym.h for intrhand fields.
ok deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc/sparc/genassym.cf | 8 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/locore.s | 14 |
2 files changed, 14 insertions, 8 deletions
diff --git a/sys/arch/sparc/sparc/genassym.cf b/sys/arch/sparc/sparc/genassym.cf index 721c9c926d5..769897f640a 100644 --- a/sys/arch/sparc/sparc/genassym.cf +++ b/sys/arch/sparc/sparc/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.10 2002/02/20 22:28:23 deraadt Exp $ +# $OpenBSD: genassym.cf,v 1.11 2002/04/28 21:48:08 art Exp $ # $NetBSD: genassym.cf,v 1.2 1997/06/28 19:59:04 pk Exp $ # @@ -161,6 +161,12 @@ member pcb_wcookie # interrupt enable register PTE define IE_REG_PTE_PG (PG_V | PG_W | PG_S | PG_NC | PG_OBIO) +# intrhand fields. +struct intrhand +member ih_fun +member ih_arg +member ih_next + ifdef notyet # ZSCC interrupt fields struct zs_softc Z diff --git a/sys/arch/sparc/sparc/locore.s b/sys/arch/sparc/sparc/locore.s index b5709500930..a1967d0e74a 100644 --- a/sys/arch/sparc/sparc/locore.s +++ b/sys/arch/sparc/sparc/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.48 2002/04/28 03:51:19 art Exp $ */ +/* $OpenBSD: locore.s,v 1.49 2002/04/28 21:48:08 art Exp $ */ /* $NetBSD: locore.s,v 1.73 1997/09/13 20:36:48 pk Exp $ */ /* @@ -2364,13 +2364,13 @@ softintr_common: b 3f st %fp, [%sp + CCFSZ + 16] -1: ld [%l4], %o1 - ld [%l4 + 4], %o0 +1: ld [%l4 + IH_FUN], %o1 + ld [%l4 + IH_ARG], %o0 tst %o0 bz,a 2f add %sp, CCFSZ, %o0 2: jmpl %o1, %o7 ! (void)(*ih->ih_fun)(...) - ld [%l4 + 8], %l4 ! and ih = ih->ih_next + ld [%l4 + IH_NEXT], %l4 ! and ih = ih->ih_next 3: tst %l4 ! while ih != NULL bnz 1b nop @@ -2433,13 +2433,13 @@ _sparc_interrupt_common: b 3f st %fp, [%sp + CCFSZ + 16] -1: ld [%l4], %o1 - ld [%l4 + 4], %o0 +1: ld [%l4 + IH_FUN], %o1 + ld [%l4 + IH_ARG], %o0 tst %o0 bz,a 2f add %sp, CCFSZ, %o0 2: jmpl %o1, %o7 ! handled = (*ih->ih_fun)(...) - ld [%l4 + 8], %l4 ! and ih = ih->ih_next + ld [%l4 + IH_NEXT], %l4 ! and ih = ih->ih_next cmp %o0, 1 bge 4f ! if (handled >= 1) break or %o0, %l5, %l5 ! and %l5 |= handled |