More function prototypes.

Move badwordaddr() to a macro.

4 files changed, 87 insertions, 27 deletions

diff --git a/sys/arch/mvme88k/include/db_machdep.h b/sys/arch/mvme88k/include/db_machdep.h
index b25d1493006..03a88e9bf04 100644
--- a/sys/arch/mvme88k/include/db_machdep.h
+++ b/sys/arch/mvme88k/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.7 2001/03/09 05:44:40 smurph Exp $ */
+/*	$OpenBSD: db_machdep.h,v 1.8 2001/03/16 00:05:24 miod Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -180,4 +180,6 @@ int ddb_entry_trap __P((int level, db_regs_t *eframe));
 
 #define	db_printf_enter	db_printing
 
+int m88k_print_instruction __P((unsigned iadr, long inst));
+
 #endif	/* _M88K_DB_MACHDEP_H_ */
diff --git a/sys/arch/mvme88k/include/intr.h b/sys/arch/mvme88k/include/intr.h
index c742dbb69f3..4559c6be83f 100644
--- a/sys/arch/mvme88k/include/intr.h
+++ b/sys/arch/mvme88k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.1 2001/03/09 05:44:40 smurph Exp $	*/
+/*	$OpenBSD: intr.h,v 1.2 2001/03/16 00:05:24 miod Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -81,14 +81,14 @@ extern int intrcnt[M88K_NIRQ];
 #define IPL_NMI		7
 #define IPL_ABORT	7
 
-#ifndef ASSEMBLER
 #ifdef _KERNEL
+#ifndef _LOCORE
 unsigned setipl __P((unsigned level));
 #if DDB
 unsigned db_setipl __P((unsigned level));
 #endif 
 int spl0 __P((void));
-#endif /* ASSEMBLER */
+#endif /* _LOCORE */
 
 /* needs major cleanup - XXX nivas */
 
diff --git a/sys/arch/mvme88k/include/locore.h b/sys/arch/mvme88k/include/locore.h
index 7c8403e3671..446d44b78a1 100644
--- a/sys/arch/mvme88k/include/locore.h
+++ b/sys/arch/mvme88k/include/locore.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.h,v 1.7 2001/03/09 05:44:40 smurph Exp $	*/
+/*	$OpenBSD: locore.h,v 1.8 2001/03/16 00:05:25 miod Exp $	*/
 
 #ifndef _MACHINE_LOCORE_H_
 #define _MACHINE_LOCORE_H_
@@ -6,37 +6,99 @@
 #include <vm/vm_param.h>
 
 /*
- * C prototypes for various routines defined in locore_*
+ * C prototypes for various routines defined in locore_* and friends
  */
 
-extern unsigned int do_load_word __P((vm_offset_t address,
+/* locore_asm_routines.S */
+
+unsigned int do_load_word __P((vm_offset_t address,
     boolean_t supervisor_mode));
-extern unsigned int do_load_half __P((vm_offset_t address,
+unsigned int do_load_half __P((vm_offset_t address,
     boolean_t supervisor_mode));
-extern unsigned int do_load_byte __P((vm_offset_t address,
+unsigned int do_load_byte __P((vm_offset_t address,
     boolean_t supervisor_mode));
 
-extern void do_store_word __P((vm_offset_t address, unsigned int data,
+void do_store_word __P((vm_offset_t address, unsigned int data,
     boolean_t supervisor_mode));
-extern void do_store_half __P((vm_offset_t address, unsigned int data,
+void do_store_half __P((vm_offset_t address, unsigned int data,
     boolean_t supervisor_mode));
-extern void do_store_byte __P((vm_offset_t address, unsigned int data,
+void do_store_byte __P((vm_offset_t address, unsigned int data,
     boolean_t supervisor_mode));
 
-extern unsigned do_xmem_word __P((vm_offset_t address, unsigned int data,
+unsigned do_xmem_word __P((vm_offset_t address, unsigned int data,
     boolean_t supervisor_mode));
-extern unsigned do_xmem_byte __P((vm_offset_t address, unsigned int data,
+unsigned do_xmem_byte __P((vm_offset_t address, unsigned int data,
     boolean_t supervisor_mode));
 
-extern unsigned read_processor_identification_register __P((void));
-extern int badaddr __P((vm_offset_t addr, int size));
-extern void set_cpu_number __P((unsigned number));
-extern void doboot __P((void));
+unsigned read_processor_identification_register __P((void));
+int badaddr __P((vm_offset_t addr, int size));
+#define badwordaddr(x) badaddr(x, 4)
+void set_cpu_number __P((unsigned number));
+void doboot __P((void));
+int db_are_interrupts_disabled __P((void));
+
+#if defined(MVME187) || defined(MVME188)
+int guarded_access __P((volatile unsigned char *address,
+    unsigned len, unsigned *vec));
+#endif 
+
+
+/* locore_c_routines.c */
+
+#if defined(MVME187) || defined(MVME188)
+void dae_print __P((unsigned *eframe));
+void data_access_emulation __P((unsigned *eframe));
+#endif 
+#ifdef MVME188
+unsigned int safe_level __P((unsigned mask, unsigned curlevel));
+void block_obio_interrupt __P((unsigned mask));
+void unblock_obio_interrupt __P((unsigned mask));
+#endif 
+unsigned spl __P((void));
+unsigned getipl __P((void));
+#ifdef DDB
+unsigned db_spl __P((void));
+unsigned db_getipl __P((void));
+#endif
+
+
+/* machdep.c */
+
+void _doboot __P((void));
+vm_offset_t get_slave_stack __P((void));
+void slave_pre_main __P((void));
+int slave_main __P((void));
+int intr_findvec __P((int start, int end));
+void bugsyscall __P((void));
+void myetheraddr __P((u_char *cp));
+void dosoftint __P((void));
+void MY_info __P((struct trapframe *f, caddr_t p, int flags, char *s));
+void MY_info_done __P((struct trapframe *f, int flags));
+void mvme_bootstrap __P((void));
+#ifdef MVME188
+void m188_reset __P((void));
+void m188_ext_int __P((u_int v, struct m88100_saved_state *eframe));
+#endif
+#if defined(MVME187) || defined(MVME197)
+void sbc_ext_int __P((u_int v, struct m88100_saved_state *eframe));
+#endif
+
+
+/* eh.S */
 
 #if defined(MVME187) || defined(MVME188)
-extern void dae_print __P((unsigned *eframe));
-extern void data_access_emulation __P((unsigned *eframe));
-extern int guarded_access( );
+void sigsys __P((void));
+void sigtrap __P((void));
+void stepbpt __P((void));
+void userbpt __P((void));
+void syscall_handler __P((void));
+#endif 
+#if defined(MVME197)
+void m197_sigsys __P((void));
+void m197_sigtrap __P((void));
+void m197_stepbpt __P((void));
+void m197_userbpt __P((void));
+void m197_syscall_handler __P((void));
 #endif 
 
 #endif /* _MACHINE_LOCORE_H_ */
diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h
index 1df205a0662..1fcd40f4485 100644
--- a/sys/arch/mvme88k/include/mvme188.h
+++ b/sys/arch/mvme88k/include/mvme188.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme188.h,v 1.4 2001/03/07 23:37:16 miod Exp $ */
+/*	$OpenBSD: mvme188.h,v 1.5 2001/03/16 00:05:25 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -379,11 +379,7 @@ extern unsigned int m188_curspl[MAX_CPUS];
 extern unsigned int int_mask_val[INT_LEVEL];
 extern unsigned int int_mask_shadow[MAX_CPUS];
 extern volatile unsigned int *int_mask_reg[MAX_CPUS];
-/*
- * Prototypes
- */
-void block_obio_interrupt(unsigned mask);
-void unblock_obio_interrupt(unsigned mask);
+
 #endif 
 
 #define M188_IACK		U(0xFFF85000)