Remove duplicates with m68k/m68k/genassym.cf

5 files changed, 11 insertions, 190 deletions

diff --git a/sys/arch/amiga/amiga/genassym.cf b/sys/arch/amiga/amiga/genassym.cf
index ad2606cf8d9..7cb95e8d81b 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.6 2001/06/27 03:54:12 art Exp $
+#	$OpenBSD: genassym.cf,v 1.7 2001/08/30 22:10:45 miod Exp $
 #
 # Copyright (c) 1982, 1990, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -48,8 +48,6 @@ include <vm/vm.h>
 include <uvm/uvm_extern.h>
 
 include <machine/cpu.h>
-include <machine/trap.h>
-include <machine/psl.h>
 include <machine/reg.h>
 include <machine/vmparam.h>
 include <machine/pte.h>
@@ -97,34 +95,20 @@ define BB060STUPIDROM BB060STUPIDROM
 endif
 
 # proc structure fields and values
-define	P_FORW		offsetof(struct proc, p_forw)
-define	P_BACK		offsetof(struct proc, p_back)
 define	P_VMSPACE	offsetof(struct proc, p_vmspace)
 define	P_ADDR		offsetof(struct proc, p_addr)
-define	P_PRIORITY	offsetof(struct proc, p_priority)
-define	P_STAT		offsetof(struct proc, p_stat)
-define	P_WCHAN		offsetof(struct proc, p_wchan)
 define  P_MD_REGS	offsetof(struct proc, p_md.md_regs)
 
-define	SRUN		SRUN
-
 # interrupt/fault metering
 define	UVMEXP_INTRS	offsetof(struct uvmexp, intrs)
 
 # general constants
 define	UPAGES		UPAGES
 define	USPACE		USPACE
-define	NBPG		NBPG
 define	PGSHIFT		PGSHIFT
 define	USRSTACK	USRSTACK
 
-# PSL values (should just include psl.h?)
-define	PSL_S		PSL_S
-define	PSL_IPL7	PSL_IPL7
-define	PSL_IPL		PSL_IPL
-define	PSL_LOWIPL	PSL_LOWIPL
-define	PSL_HIGHIPL	PSL_HIGHIPL
-define	PSL_USER	PSL_USER
+# PSL values
 define	SPL1		PSL_S | PSL_IPL1
 define	SPL2		PSL_S | PSL_IPL2
 define	SPL3		PSL_S | PSL_IPL3
@@ -133,7 +117,6 @@ define	SPL5		PSL_S | PSL_IPL5
 define	SPL6		PSL_S | PSL_IPL6
 
 # magic
-define	FC_USERD	FC_USERD
 define	FC_SUPERD	FC_SUPERD
 define	CACHE_ON	CACHE_ON
 define	CACHE_OFF	CACHE_OFF
@@ -162,15 +145,9 @@ define	PCB_PS		offsetof(struct pcb, pcb_ps)
 define	PCB_USP		offsetof(struct pcb, pcb_usp)
 define	PCB_REGS	offsetof(struct pcb, pcb_regs)
 define	PCB_CMAP2	offsetof(struct pcb, pcb_cmap2)
-define	PCB_ONFAULT	offsetof(struct pcb, pcb_onfault)
 define	PCB_FPCTX	offsetof(struct pcb, pcb_fpregs)
 define	SIZEOF_PCB	sizeof(struct pcb)
 
-# exception frame offset/sizes
-define	FR_SP		offsetof(struct frame, f_regs[15])
-define	FR_HW		offsetof(struct frame, f_sr)
-define	FR_ADJ		offsetof(struct frame, f_stackadj)
-
 # isr fields
 define	ISR_FORW	offsetof(struct isr, isr_forw)
 define	ISR_INTR	offsetof(struct isr, isr_intr)
@@ -179,27 +156,10 @@ define	ISR_ARG		offsetof(struct isr, isr_arg)
 # system calls
 define	SYS_exit	SYS_exit
 define	SYS_execve	SYS_execve
-define	SYS_sigreturn	SYS_sigreturn
 
 # user fields
 define	U_PROF		offsetof(struct user, u_stats.p_prof)
 define	U_PROFSCALE	offsetof(struct user, u_stats.p_prof.pr_scale)
 
-# Traps
-define	T_BUSERR	T_BUSERR
-define	T_ADDRERR	T_ADDRERR
-define	T_ILLINST	T_ILLINST
-define	T_ZERODIV	T_ZERODIV
-define	T_CHKINST	T_CHKINST
-define	T_TRAPVINST	T_TRAPVINST
-define	T_PRIVINST	T_PRIVINST
-define	T_TRACE		T_TRACE
-define	T_MMUFLT	T_MMUFLT
-define	T_FMTERR	T_FMTERR
-define	T_COPERR	T_COPERR
-define	T_FPERR		T_FPERR
-define	T_ASTFLT	T_ASTFLT
-define	T_TRAP15	T_TRAP15
-
 # miscellaneous custom chip register offsets
 define	CIAICR		offsetof(struct CIA, icr)
diff --git a/sys/arch/hp300/hp300/genassym.cf b/sys/arch/hp300/hp300/genassym.cf
index 26ee920df2a..d7103130e3a 100644
--- a/sys/arch/hp300/hp300/genassym.cf
+++ b/sys/arch/hp300/hp300/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.9 2001/06/27 04:05:45 art Exp $
+#	$OpenBSD: genassym.cf,v 1.10 2001/08/30 22:10:47 miod Exp $
 #	$NetBSD: genassym.cf,v 1.11 1998/02/16 20:58:29 thorpej Exp $
 
 #
@@ -51,7 +51,6 @@ include <uvm/uvm_extern.h>
 
 include <machine/hp300spu.h>
 include <machine/cpu.h>
-include <machine/psl.h>
 include <machine/reg.h>
 include <machine/pte.h>
 
@@ -136,34 +135,21 @@ endif
 # general constants
 define	UPAGES			UPAGES
 define	USPACE			USPACE
-define	NBPG			NBPG
 define	PGSHIFT			PGSHIFT
 define	USRSTACK		USRSTACK
 define	MAXADDR			MAXADDR
 
 # proc fields and values
-define	P_FORW			offsetof(struct proc, p_forw)
-define	P_BACK			offsetof(struct proc, p_back)
 define	P_VMSPACE		offsetof(struct proc, p_vmspace)
 define	P_ADDR			offsetof(struct proc, p_addr)
-define	P_PRIORITY		offsetof(struct proc, p_priority)
-define	P_STAT			offsetof(struct proc, p_stat)
-define	P_WCHAN			offsetof(struct proc, p_wchan)
 define	P_MD_FLAGS		offsetof(struct proc, p_md.md_flags)
 define	P_MD_REGS		offsetof(struct proc, p_md.md_regs)
 define	SSLEEP			SSLEEP
-define	SRUN			SRUN
 
 # interrupt/fault metering
 define UVMEXP_INTRS		offsetof(struct uvmexp, intrs)
 
-# PSL values (should just include psl.h?)
-define	PSL_S			PSL_S
-define	PSL_IPL7		PSL_IPL7
-define	PSL_LOWIPL		PSL_LOWIPL
-define	PSL_HIGHIPL		PSL_HIGHIPL
-define	PSL_USER		PSL_USER
-define	PSL_TS			PSL_T | PSL_S
+# PSL values
 define	SPL1			PSL_S | PSL_IPL1
 define	SPL2			PSL_S | PSL_IPL2
 define	SPL3			PSL_S | PSL_IPL3
@@ -172,7 +158,6 @@ define	SPL5			PSL_S | PSL_IPL5
 define	SPL6			PSL_S | PSL_IPL6
 
 # magic
-define	FC_USERD		FC_USERD
 define	FC_PURGE		FC_PURGE
 define	INTIOBASE		INTIOBASE
 define	MMUBASE			MMUBASE
@@ -211,24 +196,15 @@ define	SG_ISHIFT		SG_ISHIFT
 define	PCB_PS			offsetof(struct pcb, pcb_ps)
 define	PCB_USP			offsetof(struct pcb, pcb_usp)
 define	PCB_REGS		offsetof(struct pcb, pcb_regs)
-define	PCB_ONFAULT		offsetof(struct pcb, pcb_onfault)
 define	PCB_FPCTX		offsetof(struct pcb, pcb_fpregs)
 define	SIZEOF_PCB		sizeof(struct pcb)
 
-# exception frame offset/sizes
-define	FR_SP			offsetof(struct frame, f_regs[15])
-define	FR_HW			offsetof(struct frame, f_sr)
-define	FR_ADJ			offsetof(struct frame, f_stackadj)
+# exception frame size
 define	FR_SIZE			sizeof(struct trapframe)
 
 # system calls
 define	SYS_exit		SYS_exit
 define	SYS_execve		SYS_execve
-define	SYS_sigreturn		SYS_sigreturn
-
-# errno
-define	EFAULT			EFAULT
-define	ENAMETOOLONG		ENAMETOOLONG
 
 # clock registers
 define	CLKSR			CLKSR
diff --git a/sys/arch/mac68k/mac68k/genassym.cf b/sys/arch/mac68k/mac68k/genassym.cf
index fea36fb2c91..1a5f4b1d400 100644
--- a/sys/arch/mac68k/mac68k/genassym.cf
+++ b/sys/arch/mac68k/mac68k/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.6 2001/08/20 22:37:46 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.7 2001/08/30 22:10:48 miod Exp $
 #	$NetBSD: genassym.cf,v 1.7 1998/01/06 08:46:16 thorpej Exp $
 
 #
@@ -51,56 +51,23 @@ include	<vm/vm.h>
 include <uvm/uvm_extern.h>
 
 include	<machine/cpu.h>
-include	<machine/trap.h>
-include	<machine/psl.h>
 include	<machine/reg.h>
 include	<machine/pte.h>
 
-define	P_FORW			offsetof(struct proc, p_forw)
-define	P_BACK			offsetof(struct proc, p_back)
 define	P_ADDR			offsetof(struct proc, p_addr)
-define	P_PRIORITY		offsetof(struct proc, p_priority)
-define	P_STAT			offsetof(struct proc, p_stat)
-define	P_WCHAN 		offsetof(struct proc, p_wchan)
 define	P_MD_REGS		offsetof(struct proc, p_md.md_regs)
 define	P_MD_FLAGS		offsetof(struct proc, p_md.md_flags)
-define	SRUN			SRUN
 
 # interrupt/fault metering
 define	UVMEXP_INTRS		offsetof(struct uvmexp, intrs)
 
 define	USPACE			USPACE
-define	NBPG			NBPG
 define	PGSHIFT 		PGSHIFT
 define	USRSTACK		USRSTACK
 
-define	T_BUSERR		T_BUSERR
-define	T_ADDRERR		T_ADDRERR
-define	T_ILLINST		T_ILLINST
-define	T_ZERODIV		T_ZERODIV
-define	T_CHKINST		T_CHKINST
-define	T_TRAPVINST		T_TRAPVINST
-define	T_PRIVINST		T_PRIVINST
-define	T_TRACE 		T_TRACE
-define	T_MMUFLT		T_MMUFLT
-define	T_SSIR			T_SSIR
-define	T_FMTERR		T_FMTERR
-define	T_COPERR		T_COPERR
-define	T_FPERR 		T_FPERR
-define	T_ASTFLT		T_ASTFLT
-define	T_TRAP15		T_TRAP15
-define	T_FPEMULI		T_FPEMULI
-define	T_FPEMULD		T_FPEMULD
-
-define	PSL_S			PSL_S
-define	PSL_IPL7		PSL_IPL7
-define	PSL_LOWIPL		PSL_LOWIPL
-define	PSL_HIGHIPL		PSL_HIGHIPL
-define	PSL_USER		PSL_USER
 define	SPL1			(PSL_S | PSL_IPL1)
 define	SPL2			(PSL_S | PSL_IPL2)
 
-define	FC_USERD		FC_USERD
 define	FC_SUPERD		FC_SUPERD
 
 define	CACHE_ON		CACHE_ON
@@ -116,20 +83,11 @@ define	PG_FRAME		PG_FRAME
 define	PCB_PS			offsetof(struct pcb, pcb_ps)
 define	PCB_USP			offsetof(struct pcb, pcb_usp)
 define	PCB_REGS		offsetof(struct pcb, pcb_regs)
-define	PCB_ONFAULT		offsetof(struct pcb, pcb_onfault)
 define	PCB_FPCTX		offsetof(struct pcb, pcb_fpregs)
 define	SIZEOF_PCB		sizeof(struct pcb)
 
-define	FR_SP			offsetof(struct frame, f_regs[15])
-define	FR_HW			offsetof(struct frame, f_sr)
-define	FR_ADJ			offsetof(struct frame, f_stackadj)
 define	FR_SIZE			sizeof(struct trapframe)
 
-define	EFAULT			EFAULT
-define	ENAMETOOLONG		ENAMETOOLONG
-
-define	SYS_sigreturn		SYS_sigreturn
-
 define	CPUINFO_CLASS		offsetof(struct cpu_model_info, class)
 define	MACH_CLASSAV		MACH_CLASSAV
 
diff --git a/sys/arch/mvme68k/mvme68k/genassym.cf b/sys/arch/mvme68k/mvme68k/genassym.cf
index 4ee5ef3cb0c..4e9b2c1167b 100644
--- a/sys/arch/mvme68k/mvme68k/genassym.cf
+++ b/sys/arch/mvme68k/mvme68k/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.9 2001/08/21 00:26:28 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.10 2001/08/30 22:10:50 miod Exp $
 
 #
 # Copyright (c) 1995 Theo de Raadt
@@ -78,8 +78,6 @@ include <vm/vm.h>
 include <uvm/uvm_extern.h>
 
 include <machine/cpu.h>
-include <machine/trap.h>
-include <machine/psl.h>
 include <machine/nvram.h>
 include <machine/reg.h>
 include <machine/autoconf.h>
@@ -88,54 +86,21 @@ include <machine/pte.h>
 
 # general constants
 define	USPACE			USPACE
-define	NBPG			NBPG
 define	PGSHIFT			PGSHIFT
 define	USRSTACK		USRSTACK
 
 # proc fields and values
-define	P_FORW			offsetof(struct proc, p_forw)
-define	P_BACK			offsetof(struct proc, p_back)
 define	P_ADDR			offsetof(struct proc, p_addr)
-define	P_PRIORITY		offsetof(struct proc, p_priority)
-define	P_STAT			offsetof(struct proc, p_stat)
-define	P_WCHAN			offsetof(struct proc, p_wchan)
 define	P_MD_FLAGS		offsetof(struct proc, p_md.md_flags)
 define	P_MD_REGS		offsetof(struct proc, p_md.md_regs)
 
-define	SRUN			SRUN
-
 # interrupt/fault metering
 define	UVMEXP_INTRS		offsetof(struct uvmexp, intrs)
 
-# trap types (should just include trap.h?)
-define	T_BUSERR		T_BUSERR
-define	T_ADDRERR		T_ADDRERR
-define	T_ILLINST		T_ILLINST
-define	T_ZERODIV		T_ZERODIV
-define	T_CHKINST		T_CHKINST
-define	T_TRAPVINST		T_TRAPVINST
-define	T_PRIVINST		T_PRIVINST
-define	T_TRACE			T_TRACE
-define	T_MMUFLT		T_MMUFLT
-define	T_SSIR			T_SSIR
-define	T_FMTERR		T_FMTERR
-define	T_COPERR		T_COPERR
-define	T_FPERR			T_FPERR
-define	T_ASTFLT		T_ASTFLT
-define	T_TRAP15		T_TRAP15
-define	T_FPEMULI		T_FPEMULI
-define	T_FPEMULD		T_FPEMULD
-
-# PSL values (should just include psl.h?)
-define	PSL_S			PSL_S
-define	PSL_IPL7		PSL_IPL7
-define	PSL_LOWIPL		PSL_LOWIPL
-define	PSL_HIGHIPL		PSL_HIGHIPL
-define	PSL_USER		PSL_USER
+# PSL values
 define	SPL1			PSL_S | PSL_IPL1
 
 # magic
-define	FC_USERD		FC_USERD
 define	CACHE_ON		CACHE_ON
 define	CACHE_OFF		CACHE_OFF
 define	CACHE_CLR		CACHE_CLR
@@ -152,22 +117,12 @@ define	PG_FRAME		PG_FRAME
 define	PCB_PS			offsetof(struct pcb, pcb_ps)
 define	PCB_USP			offsetof(struct pcb, pcb_usp)
 define	PCB_REGS		offsetof(struct pcb, pcb_regs)
-define	PCB_ONFAULT		offsetof(struct pcb, pcb_onfault)
 define	PCB_FPCTX		offsetof(struct pcb, pcb_fpregs)
 define	SIZEOF_PCB		sizeof(struct pcb)
 
-# exception frame offset/sizes
-define	FR_SP			offsetof(struct frame, f_regs[15])
-define	FR_HW			offsetof(struct frame, f_sr)
-define	FR_ADJ			offsetof(struct frame, f_stackadj)
+# exception frame size
 define	FR_SIZE			sizeof(struct trapframe)
 
-# system calls
-define	SYS_sigreturn		SYS_sigreturn
-
-# errno
-define	EFAULT			EFAULT
-define	ENAMETOOLONG		ENAMETOOLONG
 
 define	SIZEOF_MVMEPROM_BRDID	sizeof(struct mvmeprom_brdid)
 define	MVMEPROM_BRDID_MODEL	offsetof(struct mvmeprom_brdid, model)
diff --git a/sys/arch/sun3/sun3/genassym.cf b/sys/arch/sun3/sun3/genassym.cf
index 34957579202..80b5360ff17 100644
--- a/sys/arch/sun3/sun3/genassym.cf
+++ b/sys/arch/sun3/sun3/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.3 2001/06/27 04:44:02 art Exp $
+#	$OpenBSD: genassym.cf,v 1.4 2001/08/30 22:10:52 miod Exp $
 #	$NetBSD: genassym.c,v 1.32 1996/10/23 16:39:27 gwr Exp $
 
 #
@@ -53,7 +53,6 @@ include <machine/control.h>
 include <machine/cpu.h>
 include <machine/dvma.h>
 include <machine/pcb.h>
-include <machine/psl.h>
 include <machine/pte.h>
 include <machine/machdep.h>
 include <machine/mon.h>
@@ -64,7 +63,6 @@ include <sun3/sun3/interreg.h>
 include <sun3/sun3/buserr.h>
 
 # general constants
-define	NBPG			NBPG
 define	NBSG			NBSG
 define	KERNBASE		KERNBASE
 define	USPACE			USPACE
@@ -79,17 +77,9 @@ define	INTERSIL_INTER_CSECONDS	INTERSIL_INTER_CSECONDS
 define	BUSERR_REG		BUSERR_REG
 define	BUSERR_MMU		BUSERR_MMU
 
-# PSL values
-define	PSL_LOWIPL		PSL_LOWIPL
-define	PSL_HIGHIPL		PSL_HIGHIPL
-define	PSL_USER		PSL_USER
-define	PSL_S			PSL_S
-define	PSL_IPL7		PSL_IPL7
-
 # magic
 define	FC_CONTROL		FC_CONTROL
 define	FC_SUPERD		FC_SUPERD
-define	FC_USERD		FC_USERD
 define	IC_CLEAR		IC_CLEAR
 
 # sun3 control space
@@ -105,27 +95,13 @@ define	DVMA_SPACE_START	DVMA_SPACE_START
 define	MONSTART		MONSTART
 define	PROM_BASE		PROM_BASE
 
-# system calls
-define	SYS_sigreturn		SYS_sigreturn
-
-# errno
-define	EFAULT			EFAULT
-define	ENAMETOOLONG		ENAMETOOLONG
-
 # proc fields and values
-define	P_FORW			offsetof(struct proc, p_forw)
-define	P_BACK			offsetof(struct proc, p_back)
 define	P_VMSPACE		offsetof(struct proc, p_vmspace)
 define	P_ADDR			offsetof(struct proc, p_addr)
-define	P_PRIORITY		offsetof(struct proc, p_priority)
-define	P_STAT			offsetof(struct proc, p_stat)
-define	P_WCHAN			offsetof(struct proc, p_wchan)
 define	P_FLAG			offsetof(struct proc, p_flag)
 define	P_MD_FLAGS		offsetof(struct proc, p_md.md_flags)
 define	P_MD_REGS		offsetof(struct proc, p_md.md_regs)
 
-define	SRUN			SRUN
-
 # VM structure fields
 define	VM_PMAP			offsetof(struct vmspace, vm_map.pmap)
 
@@ -134,14 +110,10 @@ define	PCB_FLAGS		offsetof(struct pcb, pcb_flags)
 define	PCB_PS			offsetof(struct pcb, pcb_ps)
 define	PCB_USP			offsetof(struct pcb, pcb_usp)
 define	PCB_REGS		offsetof(struct pcb, pcb_regs)
-define	PCB_ONFAULT		offsetof(struct pcb, pcb_onfault)
 define	PCB_FPCTX		offsetof(struct pcb, pcb_fpregs)
 define	SIZEOF_PCB		sizeof(struct pcb)
 
-# exception frame offset/sizes
-define	FR_SP			offsetof(struct trapframe, tf_regs[15])
-define	FR_HW			offsetof(struct trapframe, tf_sr)
-define	FR_ADJ			offsetof(struct trapframe, tf_stackadj)
+# exception frame size
 define	CFSIZE			CFSIZE
 
 # FP frame offset