diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-02-09 18:11:13 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-02-09 18:11:13 +0000 |
commit | 7780748a91903a2e9e9abdc82b0a3b035e4c4ab9 (patch) | |
tree | 1a1b910c06f616b7085339dcfa309a3a7a9f9e4d | |
parent | 80fb8840c05723096158fe787df2856c14769f7a (diff) |
add two nops needed for wrpr/wrwim post-delay
-rw-r--r-- | sys/arch/sparc/sparc/locore.s | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/sparc/sparc/locore.s b/sys/arch/sparc/sparc/locore.s index d976d788f95..c93afc27f3b 100644 --- a/sys/arch/sparc/sparc/locore.s +++ b/sys/arch/sparc/sparc/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.21 1998/09/29 19:04:39 millert Exp $ */ +/* $OpenBSD: locore.s,v 1.22 1999/02/09 18:11:12 deraadt Exp $ */ /* $NetBSD: locore.s,v 1.73 1997/09/13 20:36:48 pk Exp $ */ /* @@ -1826,6 +1826,7 @@ memfault_sun4c: * If memerr() returns, return from the trap. */ wr %l0, PSR_ET, %psr + nop call _memerr ! memerr(0, ser, sva, aer, ava) clr %o0 @@ -2819,6 +2820,7 @@ winuf_invalid: wr %l4, 0, %wim ! window I is now invalid again set USPACE-CCFSZ-80, %l5 add %l6, %l5, %sp ! get onto kernel stack + nop CHECK_SP_REDZONE(%l6, %l5) /* |