Mostly sync to NetBSD-current of 011196. Compiles, links, boots to single

user.

KNOWN NOT WORKING:
	* DIO-II devices
	* Dynamic executables

NOT EVEN TRIED:
	* New config support

30 files changed, 64 insertions, 85 deletions

diff --git a/sys/arch/hp300/include/ansi.h b/sys/arch/hp300/include/ansi.h
index 7a35c82f58e..a17e8bfcaf6 100644
--- a/sys/arch/hp300/include/ansi.h
+++ b/sys/arch/hp300/include/ansi.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ansi.h,v 1.2 1997/01/12 15:13:30 downsj Exp $	*/
 /*	$NetBSD: ansi.h,v 1.4 1994/10/26 07:26:16 cgd Exp $	*/
 
 /* Just use the common m68k definition */
diff --git a/sys/arch/hp300/include/asm.h b/sys/arch/hp300/include/asm.h
index a933e25f844..cf9ef23de52 100644
--- a/sys/arch/hp300/include/asm.h
+++ b/sys/arch/hp300/include/asm.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: asm.h,v 1.2 1997/01/12 15:13:31 downsj Exp $	*/
 /*	$NetBSD: asm.h,v 1.2 1994/10/26 07:26:18 cgd Exp $	*/
 
 #include <m68k/asm.h>
diff --git a/sys/arch/hp300/include/autoconf.h b/sys/arch/hp300/include/autoconf.h
index 01f3daf9125..2267128ad1e 100644
--- a/sys/arch/hp300/include/autoconf.h
+++ b/sys/arch/hp300/include/autoconf.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: autoconf.h,v 1.2 1997/01/12 15:13:31 downsj Exp $	*/
 /*	$NetBSD: autoconf.h,v 1.3 1996/03/03 16:49:17 thorpej Exp $	*/
 
 /*-
diff --git a/sys/arch/hp300/include/cdefs.h b/sys/arch/hp300/include/cdefs.h
index 3b2ffb44b55..ae4d3bb01f5 100644
--- a/sys/arch/hp300/include/cdefs.h
+++ b/sys/arch/hp300/include/cdefs.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cdefs.h,v 1.2 1997/01/12 15:13:32 downsj Exp $	*/
 /*	$NetBSD: cdefs.h,v 1.1 1995/01/19 01:41:56 jtc Exp $	*/
 
 #ifndef _MACHINE_CDEFS_H_
diff --git a/sys/arch/hp300/include/cpu.h b/sys/arch/hp300/include/cpu.h
index 0fa81ad6fdd..495520dbc2d 100644
--- a/sys/arch/hp300/include/cpu.h
+++ b/sys/arch/hp300/include/cpu.h
@@ -1,4 +1,5 @@
-/*	$NetBSD: cpu.h,v 1.19 1996/05/17 15:37:07 thorpej Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.5 1997/01/12 15:13:33 downsj Exp $	*/
+/*	$NetBSD: cpu.h,v 1.21 1996/10/07 06:29:30 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,6 +51,11 @@
  */
 
 /*
+ * Get common m68k CPU definitions.
+ */
+#include <m68k/cpu.h>
+
+/*
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
@@ -196,28 +202,25 @@ extern unsigned char ssir;
 #define	HP_380		7	/* 25Mhz 68040 */
 #define HP_433		8	/* 33Mhz 68040 */
 
-/* values for mmutype (assigned for quick testing) */
-#define	MMU_68040	-2	/* 68040 on-chip MMU */
-#define	MMU_68030	-1	/* 68030 on-chip subset of 68851 */
-#define	MMU_HP		0	/* HP proprietary */
-#define	MMU_68851	1	/* Motorola 68851 */
-
-/* values for ectype */
-#define	EC_PHYS		-1	/* external physical address cache */
-#define	EC_NONE		0	/* no external cache */
-#define	EC_VIRT		1	/* external virtual address cache */
-
 #ifdef _KERNEL
 extern	int machineid;		/* CPU model */
-extern	int mmutype;		/* MMU on this host */
-extern	int ectype;		/* External cache type */
 extern	int cpuspeed;		/* CPU speed, in MHz */
 
 extern	char *intiobase, *intiolimit;
 extern	void (*vectab[]) __P((void));
 
+struct	frame;
+
+/* locore.s functions */
 void	doboot __P((void))
 	__attribute__((__noreturn__));
+void	ecacheon __P((void));
+void	ecacheoff __P((void));
+
+/* machdep.c functions */
+int	badaddr __P((caddr_t));
+int	badbaddr __P((caddr_t));
+void	regdump __P((struct frame *, int));
 
 /* what is this supposed to do? i.e. how is it different than startrtclock? */
 #define	enablertclock()
@@ -296,66 +299,4 @@ void	doboot __P((void))
 #define	MMU_FAULT	(MMU_PTF|MMU_PF|MMU_WPF|MMU_BERR)
 #define	MMU_ENAB	(MMU_UMEN|MMU_SMEN|MMU_IEN|MMU_FPE)
 
-/*
- * 68851 and 68030 MMU
- */
-#define	PMMU_LVLMASK	0x0007
-#define	PMMU_INV	0x0400
-#define	PMMU_WP		0x0800
-#define	PMMU_ALV	0x1000
-#define	PMMU_SO		0x2000
-#define	PMMU_LV		0x4000
-#define	PMMU_BE		0x8000
-#define	PMMU_FAULT	(PMMU_WP|PMMU_INV)
-
-/*
- * 68040 MMU
- */
-#define	MMU4_RES	0x001
-#define	MMU4_TTR	0x002
-#define	MMU4_WP		0x004
-#define	MMU4_MOD	0x010
-#define	MMU4_CMMASK	0x060
-#define	MMU4_SUP	0x080
-#define	MMU4_U0		0x100
-#define	MMU4_U1		0x200
-#define	MMU4_GLB	0x400
-#define	MMU4_BE		0x800
-
-/* 680X0 function codes */
-#define	FC_USERD	1	/* user data space */
-#define	FC_USERP	2	/* user program space */
-#define	FC_PURGE	3	/* HPMMU: clear TLB entries */
-#define	FC_SUPERD	5	/* supervisor data space */
-#define	FC_SUPERP	6	/* supervisor program space */
-#define	FC_CPU		7	/* CPU space */
-
-/* fields in the 68020 cache control register */
-#define	IC_ENABLE	0x0001	/* enable instruction cache */
-#define	IC_FREEZE	0x0002	/* freeze instruction cache */
-#define	IC_CE		0x0004	/* clear instruction cache entry */
-#define	IC_CLR		0x0008	/* clear entire instruction cache */
-
-/* additional fields in the 68030 cache control register */
-#define	IC_BE		0x0010	/* instruction burst enable */
-#define	DC_ENABLE	0x0100	/* data cache enable */
-#define	DC_FREEZE	0x0200	/* data cache freeze */
-#define	DC_CE		0x0400	/* clear data cache entry */
-#define	DC_CLR		0x0800	/* clear entire data cache */
-#define	DC_BE		0x1000	/* data burst enable */
-#define	DC_WA		0x2000	/* write allocate */
-
-#define	CACHE_ON	(DC_WA|DC_BE|DC_CLR|DC_ENABLE|IC_BE|IC_CLR|IC_ENABLE)
-#define	CACHE_OFF	(DC_CLR|IC_CLR)
-#define	CACHE_CLR	(CACHE_ON)
-#define	IC_CLEAR	(DC_WA|DC_BE|DC_ENABLE|IC_BE|IC_CLR|IC_ENABLE)
-#define	DC_CLEAR	(DC_WA|DC_BE|DC_CLR|DC_ENABLE|IC_BE|IC_ENABLE)
-
-/* 68040 cache control register */
-#define	IC4_ENABLE	0x8000		/* instruction cache enable bit */
-#define	DC4_ENABLE	0x80000000	/* data cache enable bit */
-
-#define	CACHE4_ON	(IC4_ENABLE|DC4_ENABLE)
-#define	CACHE4_OFF	(0)
-
 #endif /* _HP300_CPU_H_ */
diff --git a/sys/arch/hp300/include/db_machdep.h b/sys/arch/hp300/include/db_machdep.h
index 856c91dd32b..bf3b49e5752 100644
--- a/sys/arch/hp300/include/db_machdep.h
+++ b/sys/arch/hp300/include/db_machdep.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: db_machdep.h,v 1.2 1997/01/12 15:13:33 downsj Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.2 1994/10/26 07:26:21 cgd Exp $	*/
 
 /* Just use the common m68k definition */
diff --git a/sys/arch/hp300/include/disklabel.h b/sys/arch/hp300/include/disklabel.h
index 8e008d95c3e..883ac3b1005 100644
--- a/sys/arch/hp300/include/disklabel.h
+++ b/sys/arch/hp300/include/disklabel.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: disklabel.h,v 1.2 1997/01/12 15:13:34 downsj Exp $	*/
 /*	$NetBSD: disklabel.h,v 1.1 1994/10/14 18:26:39 cgd Exp $	*/
 
 /*
diff --git a/sys/arch/hp300/include/exec.h b/sys/arch/hp300/include/exec.h
index c38c46f767e..393d2fe01f6 100644
--- a/sys/arch/hp300/include/exec.h
+++ b/sys/arch/hp300/include/exec.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: exec.h,v 1.7 1997/01/12 15:13:34 downsj Exp $	*/
 /*	$NetBSD: exec.h,v 1.10 1995/11/20 01:15:26 thorpej Exp $	*/
 
 /*
diff --git a/sys/arch/hp300/include/float.h b/sys/arch/hp300/include/float.h
index c9f45e98615..c0e220eac0e 100644
--- a/sys/arch/hp300/include/float.h
+++ b/sys/arch/hp300/include/float.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: float.h,v 1.2 1997/01/12 15:13:35 downsj Exp $	*/
 /*	$NetBSD: float.h,v 1.7 1995/06/20 20:45:34 jtc Exp $	*/
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/arch/hp300/include/frame.h b/sys/arch/hp300/include/frame.h
index cc15f6df635..fc372d5c7e8 100644
--- a/sys/arch/hp300/include/frame.h
+++ b/sys/arch/hp300/include/frame.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: frame.h,v 1.2 1997/01/12 15:13:35 downsj Exp $	*/
 /*	$NetBSD: frame.h,v 1.6 1994/10/26 07:26:26 cgd Exp $	*/
 
 #include <m68k/frame.h>
diff --git a/sys/arch/hp300/include/hpux_machdep.h b/sys/arch/hp300/include/hpux_machdep.h
index e56155c00bc..35dc0172934 100644
--- a/sys/arch/hp300/include/hpux_machdep.h
+++ b/sys/arch/hp300/include/hpux_machdep.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: hpux_machdep.h,v 1.3 1997/01/12 15:13:36 downsj Exp $	*/
 /*	$NetBSD: hpux_machdep.h,v 1.3 1996/02/28 01:05:57 thorpej Exp $	*/
 
 /*-
diff --git a/sys/arch/hp300/include/ieeefp.h b/sys/arch/hp300/include/ieeefp.h
index 8d6941e81b5..0f5193f345f 100644
--- a/sys/arch/hp300/include/ieeefp.h
+++ b/sys/arch/hp300/include/ieeefp.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ieeefp.h,v 1.2 1997/01/12 15:13:36 downsj Exp $	*/
 /*	$NetBSD: ieeefp.h,v 1.2 1995/04/16 16:47:08 jtc Exp $	*/
 
 /* Just use the common m68k definition */
diff --git a/sys/arch/hp300/include/limits.h b/sys/arch/hp300/include/limits.h
index b05789b6024..1ed49de2d47 100644
--- a/sys/arch/hp300/include/limits.h
+++ b/sys/arch/hp300/include/limits.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: limits.h,v 1.2 1997/01/12 15:13:37 downsj Exp $	*/
 /*	$NetBSD: limits.h,v 1.7 1994/10/26 07:26:27 cgd Exp $	*/
 
 /* Just use the common m68k definition */
diff --git a/sys/arch/hp300/include/mtpr.h b/sys/arch/hp300/include/mtpr.h
index b18f2a508a6..98a81be12be 100644
--- a/sys/arch/hp300/include/mtpr.h
+++ b/sys/arch/hp300/include/mtpr.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: mtpr.h,v 1.2 1997/01/12 15:13:37 downsj Exp $	*/
 /*	$NetBSD: mtpr.h,v 1.4 1994/10/26 07:26:29 cgd Exp $	*/
 
 /*
diff --git a/sys/arch/hp300/include/param.h b/sys/arch/hp300/include/param.h
index 6b7edddb9f9..d6f4b852f76 100644
--- a/sys/arch/hp300/include/param.h
+++ b/sys/arch/hp300/include/param.h
@@ -1,4 +1,5 @@
-/*	$NetBSD: param.h,v 1.26 1996/05/17 15:38:08 thorpej Exp $	*/
+/*	$OpenBSD: param.h,v 1.5 1997/01/12 15:13:38 downsj Exp $	*/
+/*	$NetBSD: param.h,v 1.27 1996/12/09 03:04:48 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -163,12 +164,23 @@
 #define spl6()  _spl(PSL_S|PSL_IPL6)
 #define spl7()  _spl(PSL_S|PSL_IPL7)
 
+#if defined(_KERNEL) && !defined(_LOCORE)
+/*
+ * These four globals contain the appropriate PSL_S|PSL_IPL? values
+ * to raise interrupt priority to the requested level.
+ */
+extern	unsigned short hp300_bioipl;
+extern	unsigned short hp300_netipl;
+extern	unsigned short hp300_ttyipl;
+extern	unsigned short hp300_impipl;
+#endif /* _KERNEL && !_LOCORE */
+
 #define splsoftclock()	spl1()
 #define splsoftnet()	spl1()
-#define splbio()	spl5()
-#define splnet()	spl5()
-#define spltty()	spl5()
-#define splimp()	spl5()
+#define splbio()	_spl(hp300_bioipl)
+#define splnet()	_spl(hp300_netipl)
+#define spltty()	_spl(hp300_ttyipl)
+#define splimp()	_spl(hp300_impipl)
 #define splclock()	spl6()
 #define splstatclock()	spl6()
 #define splvm()		spl6()
diff --git a/sys/arch/hp300/include/pcb.h b/sys/arch/hp300/include/pcb.h
index 796cca53790..01f3fe17664 100644
--- a/sys/arch/hp300/include/pcb.h
+++ b/sys/arch/hp300/include/pcb.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: pcb.h,v 1.2 1997/01/12 15:13:38 downsj Exp $	*/
 /*	$NetBSD: pcb.h,v 1.8 1995/05/12 12:55:17 mycroft Exp $	*/
 
 /*
diff --git a/sys/arch/hp300/include/pmap.h b/sys/arch/hp300/include/pmap.h
index 13de98c2a0d..3637780c2a0 100644
--- a/sys/arch/hp300/include/pmap.h
+++ b/sys/arch/hp300/include/pmap.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: pmap.h,v 1.3 1997/01/12 15:13:39 downsj Exp $	*/
 /*	$NetBSD: pmap.h,v 1.10 1995/12/11 17:09:23 thorpej Exp $	*/
 
 /* 
diff --git a/sys/arch/hp300/include/proc.h b/sys/arch/hp300/include/proc.h
index 5eb1cad8d9c..ce6790006e0 100644
--- a/sys/arch/hp300/include/proc.h
+++ b/sys/arch/hp300/include/proc.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: proc.h,v 1.2 1997/01/12 15:13:40 downsj Exp $	*/
 /*	$NetBSD: proc.h,v 1.6 1994/10/26 07:26:35 cgd Exp $	*/
 
 /*
diff --git a/sys/arch/hp300/include/profile.h b/sys/arch/hp300/include/profile.h
index 82294239a1b..644a9fdfeaa 100644
--- a/sys/arch/hp300/include/profile.h
+++ b/sys/arch/hp300/include/profile.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: profile.h,v 1.2 1997/01/12 15:13:40 downsj Exp $	*/
 /*	$NetBSD: profile.h,v 1.2 1994/10/26 07:26:38 cgd Exp $	*/
 
 #include <m68k/profile.h>
diff --git a/sys/arch/hp300/include/psl.h b/sys/arch/hp300/include/psl.h
index 970687c2315..12ece870daa 100644
--- a/sys/arch/hp300/include/psl.h
+++ b/sys/arch/hp300/include/psl.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: psl.h,v 1.2 1997/01/12 15:13:41 downsj Exp $	*/
 /*	$NetBSD: psl.h,v 1.5 1994/10/26 07:26:39 cgd Exp $	*/
 
 #include <m68k/psl.h>
diff --git a/sys/arch/hp300/include/pte.h b/sys/arch/hp300/include/pte.h
index 65c526ce5af..188c36a10c0 100644
--- a/sys/arch/hp300/include/pte.h
+++ b/sys/arch/hp300/include/pte.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: pte.h,v 1.2 1997/01/12 15:13:41 downsj Exp $	*/
 /*	$NetBSD: pte.h,v 1.4 1994/10/26 07:26:40 cgd Exp $	*/
 
 /*
diff --git a/sys/arch/hp300/include/ptrace.h b/sys/arch/hp300/include/ptrace.h
index 76f781843e3..d7682944e9e 100644
--- a/sys/arch/hp300/include/ptrace.h
+++ b/sys/arch/hp300/include/ptrace.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ptrace.h,v 1.2 1997/01/12 15:13:42 downsj Exp $	*/
 /*	$NetBSD: ptrace.h,v 1.2 1994/10/26 07:26:42 cgd Exp $	*/
 
 /* Just use the common m68k definition */
diff --git a/sys/arch/hp300/include/reg.h b/sys/arch/hp300/include/reg.h
index 492b059d862..125fddf9825 100644
--- a/sys/arch/hp300/include/reg.h
+++ b/sys/arch/hp300/include/reg.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: reg.h,v 1.2 1997/01/12 15:13:42 downsj Exp $	*/
 /*	$NetBSD: reg.h,v 1.9 1994/10/26 07:26:43 cgd Exp $	*/
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/arch/hp300/include/setjmp.h b/sys/arch/hp300/include/setjmp.h
index 0e4a4b56978..d3e4e17d501 100644
--- a/sys/arch/hp300/include/setjmp.h
+++ b/sys/arch/hp300/include/setjmp.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: setjmp.h,v 1.2 1997/01/12 15:13:43 downsj Exp $	*/
 /*	$NetBSD: setjmp.h,v 1.1 1994/12/20 10:36:38 cgd Exp $	*/
 
 #include <m68k/setjmp.h>
diff --git a/sys/arch/hp300/include/signal.h b/sys/arch/hp300/include/signal.h
index 5787071f7aa..3703f702862 100644
--- a/sys/arch/hp300/include/signal.h
+++ b/sys/arch/hp300/include/signal.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: signal.h,v 1.2 1997/01/12 15:13:43 downsj Exp $	*/
 /*	$NetBSD: signal.h,v 1.3 1994/10/26 07:26:44 cgd Exp $	*/
 
 /* Just use the common m68k definition */
diff --git a/sys/arch/hp300/include/stdarg.h b/sys/arch/hp300/include/stdarg.h
index 07f10c65ee5..89cf018016a 100644
--- a/sys/arch/hp300/include/stdarg.h
+++ b/sys/arch/hp300/include/stdarg.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: stdarg.h,v 1.2 1997/01/12 15:13:44 downsj Exp $	*/
 /*	$NetBSD: stdarg.h,v 1.4 1994/10/26 07:26:45 cgd Exp $	*/
 
 /* Just use the common m68k definition */
diff --git a/sys/arch/hp300/include/trap.h b/sys/arch/hp300/include/trap.h
index 071e33d0575..bd17be38436 100644
--- a/sys/arch/hp300/include/trap.h
+++ b/sys/arch/hp300/include/trap.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: trap.h,v 1.2 1997/01/12 15:13:44 downsj Exp $	*/
 /*	$NetBSD: trap.h,v 1.6 1994/10/26 07:26:47 cgd Exp $	*/
 
 #include <m68k/trap.h>
diff --git a/sys/arch/hp300/include/types.h b/sys/arch/hp300/include/types.h
index 6f78747c1a6..17526a9e308 100644
--- a/sys/arch/hp300/include/types.h
+++ b/sys/arch/hp300/include/types.h
@@ -1,10 +1,9 @@
-/*	$NetBSD: types.h,v 1.5 1995/06/26 05:13:46 cgd Exp $	*/
+/*	$OpenBSD: types.h,v 1.2 1997/01/12 15:13:45 downsj Exp $	*/
+/*	$NetBSD: types.h,v 1.8 1996/12/17 08:11:50 thorpej Exp $	*/
 
 #ifndef _MACHINE_TYPES_H_
 #define _MACHINE_TYPES_H_
 
 #include <m68k/types.h>
 
-#define	__BDEVSW_DUMP_OLD_TYPE
-
 #endif
diff --git a/sys/arch/hp300/include/varargs.h b/sys/arch/hp300/include/varargs.h
index 1ed0916752d..c6c7fbecba6 100644
--- a/sys/arch/hp300/include/varargs.h
+++ b/sys/arch/hp300/include/varargs.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: varargs.h,v 1.2 1997/01/12 15:13:45 downsj Exp $	*/
 /*	$NetBSD: varargs.h,v 1.2 1994/10/26 07:26:50 cgd Exp $	*/
 
 /* Just use the common m68k definition */
diff --git a/sys/arch/hp300/include/vmparam.h b/sys/arch/hp300/include/vmparam.h
index 85f9bf25311..d33af98b429 100644
--- a/sys/arch/hp300/include/vmparam.h
+++ b/sys/arch/hp300/include/vmparam.h
@@ -1,4 +1,5 @@
-/*	$NetBSD: vmparam.h,v 1.7 1994/10/26 07:26:52 cgd Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.2 1997/01/12 15:13:46 downsj Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.9 1996/10/20 23:23:28 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.