Do not consider userland trap #496 (BUG system call on mvme88k) as special

anymore, since we don't want to allow userland to talk to the BUG. Deliver
SIGSYS instead of doing nothing. Makes things simpler, plus it polluted
luna88k.

3 files changed, 3 insertions, 36 deletions

diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 10ab2ef04d3..fae882a9d6b 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.21 2005/08/01 15:42:46 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.22 2005/09/25 20:30:03 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -112,7 +112,6 @@ typedef struct {
 } m88k_exception_vector_area;
 
 caddr_t	allocsys(caddr_t);
-void	bugsyscall(void);
 void	consinit(void);
 void	dosoftint(void);
 void	dumpconf(void);
@@ -1077,11 +1076,6 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 }
 
 void
-bugsyscall()
-{
-}
-
-void
 dosoftint()
 {
 	if (ssir & SIR_NET) {
@@ -1427,7 +1421,6 @@ vector_init(m88k_exception_vector_area *vector, unsigned *vector_init_list)
 {
 	unsigned num;
 	unsigned vec;
-	extern void bugtrap(void);
 
 	for (num = 0; (vec = vector_init_list[num]) != END_OF_VECTOR_LIST;
 	    num++) {
diff --git a/sys/arch/m88k/m88k/eh_common.S b/sys/arch/m88k/m88k/eh_common.S
index 7ac59c0c979..c3a2e104d97 100644
--- a/sys/arch/m88k/m88k/eh_common.S
+++ b/sys/arch/m88k/m88k/eh_common.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh_common.S,v 1.10 2005/04/30 16:46:51 miod Exp $	*/
+/*   $OpenBSD: eh_common.S,v 1.11 2005/09/25 20:30:03 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -532,14 +532,6 @@ GLOBAL(cache_flush_handler)
 	 or	r2, r0, r30
 	DONE88100
 
-/* trap 496: BUG system calls */
-GLOBAL(bugtrap)
-	PREP88100("bugsyscall", 496,,)
-	ld	r2, r30, GENREG_OFF(9)
-	bsr.n	_C_LABEL(bugsyscall)
-	 or	r3, r0, r30
-	DONE88100
-
 GLOBAL(sigsys)
 	PREP88100("sigsys", 501,,)
 	CALL(m88100_trap, T_SIGSYS, r30)
@@ -1944,14 +1936,6 @@ GLOBAL(m88110_cache_flush_handler)
 	 or	r2, r0, r30
 	DONE88110
 
-/* trap 496: BUG system calls */
-GLOBAL(m88110_bugtrap)
-	PREP88110("bugsyscall", 496,)
-	ld	r2,  r30, GENREG_OFF(9)
-	bsr.n	_C_LABEL(bugsyscall)
-	 or	r3, r0, r30
-	DONE88110
-
 GLOBAL(m88110_sigsys)
 	PREP88110("sigsys", 501,)
 	CALL(m88110_trap, T_SIGSYS, r30)
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 933da6653de..51f969e82a9 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.166 2005/09/11 23:05:37 miod Exp $	*/
+/* $OpenBSD: machdep.c,v 1.167 2005/09/25 20:30:03 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -96,7 +96,6 @@ typedef struct {
 } m88k_exception_vector_area;
 
 caddr_t	allocsys(caddr_t);
-void	bugsyscall(void);
 void	consinit(void);
 void	dosoftint(void);
 void	dumpconf(void);
@@ -991,11 +990,6 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 }
 
 void
-bugsyscall()
-{
-}
-
-void
 myetheraddr(cp)
 	u_char *cp;
 {
@@ -1268,8 +1262,6 @@ vector_init(m88k_exception_vector_area *vector, unsigned *vector_init_list)
 {
 	unsigned num;
 	unsigned vec;
-	extern void bugtrap(void);
-	extern void m88110_bugtrap(void);
 
 	for (num = 0; (vec = vector_init_list[num]) != END_OF_VECTOR_LIST;
 	    num++) {
@@ -1291,7 +1283,6 @@ vector_init(m88k_exception_vector_area *vector, unsigned *vector_init_list)
 
 		SET_VECTOR(450, m88110_syscall_handler);
 		SET_VECTOR(451, m88110_cache_flush_handler);
-		SET_VECTOR(MVMEPROM_VECTOR, m88110_bugtrap);
 		SET_VECTOR(504, m88110_stepbpt);
 		SET_VECTOR(511, m88110_userbpt);
 	}
@@ -1306,7 +1297,6 @@ vector_init(m88k_exception_vector_area *vector, unsigned *vector_init_list)
 
 		SET_VECTOR(450, syscall_handler);
 		SET_VECTOR(451, cache_flush_handler);
-		SET_VECTOR(MVMEPROM_VECTOR, bugtrap);
 		SET_VECTOR(504, stepbpt);
 		SET_VECTOR(511, userbpt);
 	}