Remove duplicates with m68k/m68k/genassym.cf

1 files changed, 2 insertions, 42 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)