diff options
| author |   briggs <briggs@openbsd.org> | 1997-04-08 13:55:56 +0000 |
|---|---|---|
| committer | briggs <briggs@openbsd.org> | 1997-04-08 13:55:56 +0000 |
| commit | e143adbf6a8ce5f59b87cb56a060ef09f083e506 (patch) | |
| tree | 2c08e4b4d0e48edbf30dd9ff6a01808153669b61 | |
| parent | use $> -- thanks for the debugging help niklas (diff) | |
| download | wireguard-openbsd-e143adbf6a8ce5f59b87cb56a060ef09f083e506.tar.xz wireguard-openbsd-e143adbf6a8ce5f59b87cb56a060ef09f083e506.zip | |
Clarify comment a bit and skip userret when flushing CPU caches in SunOS emul.
| -rw-r--r-- | sys/arch/atari/atari/trap.c | 3 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/trap.c | 6 | ||||
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/trap.c | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/sys/arch/atari/atari/trap.c b/sys/arch/atari/atari/trap.c index 9055e0afb6c..d650a031159 100644 --- a/sys/arch/atari/atari/trap.c +++ b/sys/arch/atari/atari/trap.c @@ -617,13 +617,12 @@ trap(type, code, v, frame) /* * SunOS uses Trap #2 for a "CPU cache flush" * Just flush the on-chip caches and return. - * XXX - Too bad OpenBSD uses trap 2... + * XXX - Too bad m68k BSD uses trap 2... */ if (p->p_emul == &emul_sunos) { ICIA(); DCIU(); /* get out fast */ - userret(p, frame.f_pc, sticks); return; #endif frame.f_sr &= ~PSL_T; diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c index 9af660a38fe..5903f721450 100644 --- a/sys/arch/mac68k/mac68k/trap.c +++ b/sys/arch/mac68k/mac68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.10 1997/04/08 02:53:27 gene Exp $ */ +/* $OpenBSD: trap.c,v 1.11 1997/04/08 13:55:59 briggs Exp $ */ /* $NetBSD: trap.c,v 1.46 1997/04/07 22:54:44 scottr Exp $ */ /* @@ -464,13 +464,13 @@ copyfault: /* * SunOS uses Trap #2 for a "CPU cache flush" * Just flush the on-chip caches and return. - * XXX - Too bad NetBSD uses trap 2... + * XXX - Too bad m68k BSD uses trap 2... */ if (p->p_emul == &emul_sunos) { ICIA(); DCIU(); /* get out fast */ - goto done; + return; } #endif frame.f_sr &= ~PSL_T; diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c index 7dfa8b2d7f5..f27ccadb935 100644 --- a/sys/arch/mvme68k/mvme68k/trap.c +++ b/sys/arch/mvme68k/mvme68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.17 1997/04/08 05:14:52 briggs Exp $ */ +/* $OpenBSD: trap.c,v 1.18 1997/04/08 13:55:57 briggs Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -477,13 +477,12 @@ copyfault: /* * SunOS uses Trap #2 for a "CPU cache flush" * Just flush the on-chip caches and return. - * XXX - Too bad OpenBSD uses trap 2... + * XXX - Too bad m68k BSD uses trap 2... */ if (p->p_emul == &emul_sunos) { ICIA(); DCIU(); /* get out fast */ - userret(p, &frame, sticks, v, 1); return; } #endif |