kernel will compile with -Werror. Added intr.h

3 files changed, 30 insertions, 8 deletions

diff --git a/sys/arch/mvme88k/ddb/db_interface.c b/sys/arch/mvme88k/ddb/db_interface.c
index c0a1f512475..7450beb9b7a 100644
--- a/sys/arch/mvme88k/ddb/db_interface.c
+++ b/sys/arch/mvme88k/ddb/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.6 2001/03/08 00:02:18 miod Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.7 2001/03/09 05:44:37 smurph Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -31,9 +31,9 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
-#include <sys/systm.h> /* just for boothowto --eichin */
 
 #include <vm/vm.h>
 
@@ -41,14 +41,25 @@
 #include <machine/trap.h>		 /* current_thread()            */
 #include <machine/db_machdep.h>		 /* local ddb stuff             */
 #include <machine/bug.h>		 /* bug routines 		*/
+#include <machine/locore.h>		 
 #include <machine/mmu.h>
 #include <machine/cpu_number.h>
 
 #include <ddb/db_command.h>
+#include <ddb/db_extern.h>
+#include <ddb/db_output.h>
 #include <ddb/db_sym.h>
 
 extern label_t *db_recover;
 extern unsigned int db_maxoff;
+extern int db_are_interrupts_disabled();
+extern unsigned db_trace_get_val(vm_offset_t addr, unsigned *ptr);
+extern int frame_is_sane();
+extern int badwordaddr();
+extern void cnpollc __P((int));
+void kdbprinttrap __P((int type, int code));
+void kdb_init __P((void));
+
 
 int 	db_active = 0;
 int 	db_noisy = 0;
@@ -383,7 +394,7 @@ m88k_db_trap(
 #if 0
     (void) spl7();
 #endif
-    return(1);
+    return;
 }
 
 extern char *trap_type[];
@@ -392,6 +403,7 @@ extern int trap_types;
 /*
  * Print trap reason.
  */
+void
 kdbprinttrap(type, code)
 	int type, code;
 {       
diff --git a/sys/arch/mvme88k/ddb/db_sstep.c b/sys/arch/mvme88k/ddb/db_sstep.c
index 717f3c07332..8027004189d 100644
--- a/sys/arch/mvme88k/ddb/db_sstep.c
+++ b/sys/arch/mvme88k/ddb/db_sstep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_sstep.c,v 1.5 2001/03/07 23:58:36 miod Exp $	*/
+/*	$OpenBSD: db_sstep.c,v 1.6 2001/03/09 05:44:38 smurph Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -26,6 +26,8 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/param.h>
+#include <sys/systm.h>
 #include <machine/db_machdep.h>
 #include <ddb/db_access.h>	/* db_get_value() */
 
diff --git a/sys/arch/mvme88k/ddb/db_trace.c b/sys/arch/mvme88k/ddb/db_trace.c
index 91c9d1fedcc..b6852ba0bd3 100644
--- a/sys/arch/mvme88k/ddb/db_trace.c
+++ b/sys/arch/mvme88k/ddb/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.6 2001/03/08 00:02:18 miod Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.7 2001/03/09 05:44:38 smurph Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -84,12 +84,17 @@ static inline unsigned br_dest(unsigned addr, union instruction inst)
 
 #define TRACE_DEBUG	/* undefine to disable debugging */
 
+#include <sys/param.h>
+#include <sys/systm.h>
 #include <machine/db_machdep.h> /* lots of stuff                  */
 #include <ddb/db_variables.h>	/* db_variable, DB_VAR_GET, etc.  */
 #include <ddb/db_output.h>	/* db_printf                      */
 #include <ddb/db_sym.h>		/* DB_STGY_PROC, etc.             */
 #include <ddb/db_command.h>	/* db_recover                     */
 
+extern int badwordaddr();
+extern int m88k_print_instruction __P((unsigned iadr, long inst));
+extern void db_read_bytes();
 /*
  * Some macros to tell if the given text is the instruction.
  */
@@ -355,7 +360,7 @@ db_trace_get_val(vm_offset_t addr, unsigned *ptr)
 
     quiet_db_read_bytes = 1;
 
-    if (setjmp(*(db_recover = &db_jmpbuf)) != 0) {
+    if (setjmp((db_recover = &db_jmpbuf)) != 0) {
 	db_recover = prev;
         quiet_db_read_bytes = old_quiet_db_read_bytes;
 	return 0;
@@ -1067,7 +1072,10 @@ db_stack_trace_cmd(
       case Frame:
 	regs = arg.frame;
 	break;
-
+      
+      case Proc:
+        break;
+      
       case Stack:
       {
 	unsigned val1, val2, sxip;
@@ -1139,7 +1147,7 @@ db_stack_trace_cmd(
 	frame.sxip = sxip | 2;
 	frame.snip = frame.sxip + 4;
 	frame.sfip = frame.snip + 4;
-db_printf("[r31=%x, sxip=%x]\n", frame.r[31], frame.sxip);
+	db_printf("[r31=%x, sxip=%x]\n", frame.r[31], frame.sxip);
 	regs = &frame;
       }
     }