Move the declaration of EH_DEBUG and ERRATA__XXX_USR to the kernel

configuration files.

6 files changed, 40 insertions, 15 deletions

diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 9fdf2a3a0b9..ecac7fa8358 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.21 2001/11/08 23:53:12 miod Exp $
+#	$OpenBSD: GENERIC,v 1.22 2001/11/27 05:26:34 miod Exp $
 
 machine		mvme88k 
 
@@ -10,6 +10,10 @@ option		MVME188		# support for 188
 option		"NCPUS=1"	# number of CPUs supported (max 4)
 option		BUGMAP		# use the Bug ROM VME mappings
 #option		DEBUG		# print debugging statements
+#option		EH_DEBUG	# debugging code for exception handlers
+
+# Define this if your processor has the xxx.usr bug (mask C82N)
+option		ERRATA__XXX_USR	
 
 maxusers	64
 
diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
index 4417bb9b669..de5ba16fd14 100644
--- a/sys/arch/mvme88k/conf/M187
+++ b/sys/arch/mvme88k/conf/M187
@@ -1,4 +1,4 @@
-#	$OpenBSD: M187,v 1.13 2001/11/08 23:53:12 miod Exp $
+#	$OpenBSD: M187,v 1.14 2001/11/27 05:26:34 miod Exp $
 
 machine mvme88k
 
@@ -7,6 +7,11 @@ include "../../../conf/GENERIC"
 option		MVME187		# support for 187
 option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		BUGMAP		# use Bug Rom VME Mappings
+#option		DEBUG		# print debugging statements
+#option		EH_DEBUG	# debugging code for exception handlers
+
+# Define this if your processor has the xxx.usr bug (mask C82N)
+option		ERRATA__XXX_USR	
 
 maxusers 64
 
diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188
index 561bc4f19f1..bce658c7a96 100644
--- a/sys/arch/mvme88k/conf/M188
+++ b/sys/arch/mvme88k/conf/M188
@@ -1,14 +1,17 @@
-#	$OpenBSD: M188,v 1.10 2001/11/08 23:53:12 miod Exp $
+#	$OpenBSD: M188,v 1.11 2001/11/27 05:26:34 miod Exp $
 
 machine mvme88k
 
 include "../../../conf/GENERIC"
 
-# processors this kernel should support
-
 option		MVME188		# support for 187
 option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		BUGMAP		# use Bug Rom VME Mappings
+#option		DEBUG		# print debugging statements
+#option		EH_DEBUG	# debugging code for exception handlers
+
+# Define this if your processor has the xxx.usr bug (mask C82N)
+option		ERRATA__XXX_USR	
 
 maxusers 64
 
diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
index 61824a7bc17..a65288c79a1 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,13 +1,17 @@
-#	$OpenBSD: M197,v 1.8 2001/11/08 23:53:12 miod Exp $
+#	$OpenBSD: M197,v 1.9 2001/11/27 05:26:34 miod Exp $
 
 machine mvme88k
 
 include "../../../conf/GENERIC"
 
-# processors this kernel should support
-
 option 		MVME197		# support for 197
+option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		BUGMAP		# use Bug Rom VME Mappings
+#option		DEBUG		# print debugging statements
+#option		EH_DEBUG	# debugging code for exception handlers
+
+# Define this if your processor has the xxx.usr bug (mask C82N)
+option		ERRATA__XXX_USR	
 
 maxusers 64
 
diff --git a/sys/arch/mvme88k/mvme88k/eh.S b/sys/arch/mvme88k/mvme88k/eh.S
index b3bef7145d7..719d85dabf4 100644
--- a/sys/arch/mvme88k/mvme88k/eh.S
+++ b/sys/arch/mvme88k/mvme88k/eh.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh.S,v 1.17 2001/11/18 01:43:33 miod Exp $   */
+/*   $OpenBSD: eh.S,v 1.18 2001/11/27 05:26:36 miod Exp $   */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -214,10 +214,12 @@
  */
 
 #include "assym.h"
-#include <machine/trap.h>           /* for T_ defines */
 #include <machine/asm.h>
-
-#define	EH_DEBUG
+#include <machine/board.h>
+#include <machine/trap.h>           /* for T_ defines */
+#ifdef MVME188
+#include <machine/mvme188.h>
+#endif
 
 /*
  * The exception frame as defined in "machine/pcb.h" (among other places) is
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 1cbd6bb2a5c..ee7bd51bebf 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.64 2001/11/07 01:18:00 art Exp $	*/
+/* $OpenBSD: machdep.c,v 1.65 2001/11/27 05:26:36 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -81,7 +81,10 @@
 #include <net/netisr.h>
 
 #include <machine/asm_macro.h>   /* enable/disable interrupts */
+#include <machine/mmu.h>
+#include <machine/board.h>
 #include <machine/bug.h>
+#include <machine/bugio.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
 #include <machine/cpu_number.h>
@@ -1411,7 +1414,7 @@ int
 slave_main()
 {
 	printf("slave CPU%d started\n", cpu_number());
-	while (-1); /* spin forever */
+	while (1); /* spin forever */
 	return 0;
 }
 
@@ -2046,6 +2049,8 @@ spl0()
 	return (x);
 }
 
+#ifdef EH_DEBUG
+
 void
 MY_info(f, p, flags, s)
 struct trapframe  *f;
@@ -2063,7 +2068,9 @@ MY_info_done(f, flags)
 	int         flags;
 {
 	regdump(f);
-}  
+} 
+
+#endif
 
 void
 nmihand(void *framep)