Factorize more common m68k definitions.

6 files changed, 56 insertions, 109 deletions

diff --git a/sys/arch/amiga/amiga/genassym.cf b/sys/arch/amiga/amiga/genassym.cf
index 795bcad81dc..58fae51b56f 100644
--- a/sys/arch/amiga/amiga/genassym.cf
+++ b/sys/arch/amiga/amiga/genassym.cf
@@ -1,5 +1,5 @@
 #	$NetBSD: genassym.cf,v 1.3 1997/07/16 00:01:49 is Exp $
-#	$OpenBSD: genassym.cf,v 1.12 2001/12/06 23:24:34 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.13 2002/04/25 22:31:59 miod Exp $
 #
 # Copyright (c) 1982, 1990, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -54,29 +54,9 @@ include <machine/pte.h>
 include <amiga/amiga/cia.h>
 include <amiga/amiga/isr.h>
 
-# values for mmutype
-export	MMU_68851
-export	MMU_68030
-export	MMU_68040
-export	MMU_68060
-
-# values for cputype
-export	CPU_68020
-export	CPU_68030
-export	CPU_68040
-export	CPU_68060
-
 # values for ectype
 export	EC_NONE
 
-# values for fputype
-export	FPU_NONE
-export	FPU_68881
-export	FPU_68882
-export	FPU_68040
-export	FPU_68060
-export	FPU_UNKNOWN
-
 ifdef FPU_EMULATE
 export	FPU_EMULATE
 endif
@@ -116,20 +96,6 @@ define	SPL4		PSL_S | PSL_IPL4
 define	SPL5		PSL_S | PSL_IPL5
 define	SPL6		PSL_S | PSL_IPL6
 
-# magic
-export	FC_SUPERD
-export	CACHE_ON
-export	CACHE_OFF
-export	CACHE_CLR
-export	IC_CLEAR
-export	DC_CLEAR
-export	CACHE40_ON
-export	CACHE40_OFF
-export	CACHE60_ON
-export	CACHE60_OFF
-export	IC60_CUBC
-export	IC60_CABC
-
 # pte/ste bits
 export	PG_V
 export	PG_NV
diff --git a/sys/arch/hp300/hp300/genassym.cf b/sys/arch/hp300/hp300/genassym.cf
index 78eaaf3c38c..1a1b23ae31f 100644
--- a/sys/arch/hp300/hp300/genassym.cf
+++ b/sys/arch/hp300/hp300/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.17 2002/01/16 20:50:16 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.18 2002/04/25 22:32:02 miod Exp $
 #	$NetBSD: genassym.cf,v 1.11 1998/02/16 20:58:29 thorpej Exp $
 
 #
@@ -54,22 +54,6 @@ include <machine/pte.h>
 
 include <hp300/hp300/clockreg.h>
 
-# values for mmutype
-export	MMU_68040
-export	MMU_68030
-export	MMU_HP
-export	MMU_68851
-
-# values for cputype
-export	CPU_68020
-export	CPU_68030
-export	CPU_68040
-
-# values for fputype
-export	FPU_68881
-export	FPU_68882
-export	FPU_68040
-
 # values for machineid
 export	HP_320
 export	HP_330
diff --git a/sys/arch/m68k/m68k/genassym.cf b/sys/arch/m68k/m68k/genassym.cf
index 9275e42d3a4..14a4177d283 100644
--- a/sys/arch/m68k/m68k/genassym.cf
+++ b/sys/arch/m68k/m68k/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.7 2001/12/15 00:57:35 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.8 2002/04/25 22:32:02 miod Exp $
 
 #
 # Copyright (c) 1995 Theo de Raadt
@@ -91,7 +91,8 @@ member	p_addr
 
 export	SRUN
 
-# magic
+# contexts
+export	FC_SUPERD
 export	FC_USERD
 
 # PSL values
@@ -125,3 +126,37 @@ export	SYS_sigreturn
 # errno
 export	EFAULT
 export	ENAMETOOLONG
+
+# MMU types
+export	MMU_HP
+export	MMU_68851
+export	MMU_68030
+export	MMU_68040
+export	MMU_68060
+
+# CPU types
+export	CPU_68020
+export	CPU_68030
+export	CPU_68040
+export	CPU_68060
+
+# FPU types
+export	FPU_NONE
+export	FPU_68881
+export	FPU_68882
+export	FPU_68040
+export	FPU_68060
+export	FPU_UNKNOWN
+
+# cache settings
+export	CACHE_ON
+export	CACHE_OFF
+export	CACHE_CLR
+export	CACHE40_ON
+export	CACHE40_OFF
+export	CACHE60_ON
+export	CACHE60_OFF
+export	IC_CLEAR
+export	DC_CLEAR
+export	IC60_CUBC
+export	IC60_CABC
diff --git a/sys/arch/mac68k/mac68k/genassym.cf b/sys/arch/mac68k/mac68k/genassym.cf
index 961d756ce9d..e6391d1bdf0 100644
--- a/sys/arch/mac68k/mac68k/genassym.cf
+++ b/sys/arch/mac68k/mac68k/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.11 2001/11/17 21:35:12 mickey Exp $
+#	$OpenBSD: genassym.cf,v 1.12 2002/04/25 22:32:02 miod Exp $
 #	$NetBSD: genassym.cf,v 1.7 1998/01/06 08:46:16 thorpej Exp $
 
 #
@@ -53,33 +53,29 @@ include	<machine/psl.h>
 include	<machine/reg.h>
 include	<machine/pte.h>
 
+# proc fields and values
 struct	proc
 member	P_MD_REGS		p_md.md_regs
 member	P_MD_FLAGS		p_md.md_flags
 
-export	USPACE
-export	PGSHIFT
-export	USRSTACK
-
+# PSL values
 export	PSL_S
 export	PSL_IPL7
 export	PSL_LOWIPL	
 export	PSL_USER
-define	SPL1			(PSL_S | PSL_IPL1)
-define	SPL2			(PSL_S | PSL_IPL2)
-
-export	FC_SUPERD
-
-export	CACHE_ON
-export	CACHE_OFF
-export	CACHE_CLR
-export	CACHE40_ON
-export	CACHE40_OFF
-export	IC_CLEAR
-export	DC_CLEAR
+define	PSL_TS			PSL_T | PSL_S
+define	SPL1			PSL_S | PSL_IPL1
+define	SPL2			PSL_S | PSL_IPL2
 
+# pte/ste bits
 export	PG_FRAME
 
+# general constants
+export	USPACE
+export	PGSHIFT
+export	USRSTACK
+
+# pcb fields
 struct	pcb
 member	pcb_ps
 member	pcb_usp
@@ -87,18 +83,9 @@ member	pcb_regs
 member	PCB_FPCTX		pcb_fpregs
 define	SIZEOF_PCB		sizeof(struct pcb)
 
+# exception frame size
 define	FR_SIZE			sizeof(struct trapframe)
 
+# mac68k-specific
 define	CPUINFO_CLASS		offsetof(struct cpu_model_info, class)
 export	MACH_CLASSAV
-
-export	CPU_68020
-export	CPU_68030
-export	CPU_68040
-
-export	MMU_68851
-export	MMU_68030
-export	MMU_68040
-
-export	FPU_68882
-export	FPU_68040
diff --git a/sys/arch/mvme68k/mvme68k/genassym.cf b/sys/arch/mvme68k/mvme68k/genassym.cf
index 36dcf896e99..c0aa27039ef 100644
--- a/sys/arch/mvme68k/mvme68k/genassym.cf
+++ b/sys/arch/mvme68k/mvme68k/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.15 2002/04/18 21:41:01 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.16 2002/04/25 22:32:02 miod Exp $
 
 #
 # Copyright (c) 1995 Theo de Raadt
@@ -100,17 +100,6 @@ export	PSL_LOWIPL
 export	PSL_USER
 define	SPL1			PSL_S | PSL_IPL1
 
-# magic
-export	CACHE_ON
-export	CACHE_OFF
-export	CACHE_CLR
-export	IC_CLEAR
-export	DC_CLEAR
-export	CACHE40_ON
-export	CACHE60_ON
-export	IC60_CUBC
-export	IC60_CABC
-
 # pte/ste bits
 export	PG_FRAME
 
@@ -144,18 +133,6 @@ export	CPU_167
 export	CPU_172
 export	CPU_177
 
-export	MMU_68030
-export	MMU_68040
-export	MMU_68060
-
-export	CPU_68030
-export	CPU_68040
-export	CPU_68060
-
-export	FPU_68881
-export	FPU_68040
-export	FPU_68060
-
 struct	prom_netctrl		NETCTRL_
 member	dev
 member	ctrl
diff --git a/sys/arch/sun3/sun3/genassym.cf b/sys/arch/sun3/sun3/genassym.cf
index 5eaf77cb41e..cd88dedb988 100644
--- a/sys/arch/sun3/sun3/genassym.cf
+++ b/sys/arch/sun3/sun3/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.8 2001/11/17 21:35:12 mickey Exp $
+#	$OpenBSD: genassym.cf,v 1.9 2002/04/25 22:32:02 miod Exp $
 #	$NetBSD: genassym.c,v 1.32 1996/10/23 16:39:27 gwr Exp $
 
 #
@@ -85,8 +85,6 @@ export	PSL_USER
 
 # magic
 export	FC_CONTROL
-export	FC_SUPERD
-export	IC_CLEAR
 
 # sun3 control space
 export	CONTEXT_0