From: niklas <niklas@openbsd.org>
Date: Thu, 10 Apr 1997 08:51:04 +0000 (+0000)
Subject: SunOS emulation trap#2 handling from NetBSD (gwr via scottr)
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f7d4b746a2ba4523683dc9577f6950355f3977d2;p=openbsd

SunOS emulation trap#2 handling from NetBSD (gwr via scottr)
---

diff --git a/sys/arch/amiga/amiga/trap.c b/sys/arch/amiga/amiga/trap.c
index 3b8ed3b78bb..6ea8e96b9be 100644
--- a/sys/arch/amiga/amiga/trap.c
+++ b/sys/arch/amiga/amiga/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.12 1997/02/21 08:51:49 niklas Exp $	*/
+/*	$OpenBSD: trap.c,v 1.13 1997/04/10 08:51:04 niklas Exp $	*/
 /*	$NetBSD: trap.c,v 1.53 1997/01/16 15:30:57 gwr Exp $	*/
 
 /*
@@ -708,13 +708,14 @@ trap(type, code, v, frame)
 	case T_TRAP15|T_USER:
 #ifdef COMPAT_SUNOS
 		/*
-		 * XXX This comment/code is not consistent XXX
-		 * SunOS seems to use Trap #2 for some obscure 
-		 * fpu operations.  So far, just ignore it, but
-		 * DONT trap on it.. 
+		 * SunOS uses Trap #2 for a "CPU cache flush"
+		 * Just flush the on-chip caches and return.
+		 * XXX - Too bad m68k BSD uses trap 2...
 		 */
 		if (p->p_emul == &emul_sunos) {
-			userret(p, frame.f_pc, sticks); 
+			ICIA();
+			DCIU();
+			/* get out fast */
 			return;
 		}
 #endif