Replace gazillions of badvaddr() or badwordaddr() calls with badaddr() calls.

With a few prototype declarations shuffling, this finally allows
<machine/locore.h> to die.

2 files changed, 8 insertions, 43 deletions

diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h
index bdf7ab52cea..d4e1cfdd316 100644
--- a/sys/arch/mvme88k/include/cpu.h
+++ b/sys/arch/mvme88k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.33 2006/04/15 15:43:36 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.34 2006/05/08 14:36:10 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -46,12 +46,12 @@
 #ifdef _KERNEL
 
 /* board dependent pointers */
-extern void (*md_interrupt_func_ptr)(u_int, struct trapframe *);
+extern void	(*md_interrupt_func_ptr)(u_int, struct trapframe *);
 #define	md_interrupt_func	(*md_interrupt_func_ptr)
-extern u_int (*md_getipl)(void);
-extern u_int (*md_setipl)(u_int);
-extern u_int (*md_raiseipl)(u_int);
-extern void (*md_init_clocks)(void);
+extern u_int	(*md_getipl)(void);
+extern u_int	(*md_setipl)(u_int);
+extern u_int	(*md_raiseipl)(u_int);
+extern void	(*md_init_clocks)(void);
 
 struct intrhand {
 	SLIST_ENTRY(intrhand) ih_link;
@@ -74,7 +74,8 @@ int	intr_establish(int, struct intrhand *, const char *);
 typedef SLIST_HEAD(, intrhand) intrhand_t;
 extern intrhand_t intr_handlers[NVMEINTR];
 
-void nmihand(void *);
+void	doboot(void);
+void	nmihand(void *);
 
 #endif /* _KERNEL */
 
diff --git a/sys/arch/mvme88k/include/locore.h b/sys/arch/mvme88k/include/locore.h
deleted file mode 100644
index 7b54c5bad32..00000000000
--- a/sys/arch/mvme88k/include/locore.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$OpenBSD: locore.h,v 1.32 2006/05/08 14:03:35 miod Exp $	*/
-
-#ifndef _MACHINE_LOCORE_H_
-#define _MACHINE_LOCORE_H_
-
-/*
- * C prototypes for various routines defined in locore_* and friends
- */
-
-/* subr.S */
-
-int badaddr(vaddr_t addr, int size);
-#define badwordaddr(x) badaddr(x, 4)
-void doboot(void);
-
-/* machdep.c */
-
-unsigned getipl(void);
-int intr_findvec(int, int, int);
-void myetheraddr(u_char *);
-void set_cpu_number(cpuid_t);
-
-/* eh.S */
-
-void sigsys(void);
-void stepbpt(void);
-void userbpt(void);
-void syscall_handler(void);
-void cache_flush_handler(void);
-void m88110_sigsys(void);
-void m88110_stepbpt(void);
-void m88110_userbpt(void);
-void m88110_syscall_handler(void);
-void m88110_cache_flush_handler(void);
-
-#endif /* _MACHINE_LOCORE_H_ */