More m68k common include files factorization.

3 files changed, 6 insertions, 84 deletions

diff --git a/sys/arch/mvme68k/include/exec.h b/sys/arch/mvme68k/include/exec.h
index fe72f195227..8d42927bff2 100644
--- a/sys/arch/mvme68k/include/exec.h
+++ b/sys/arch/mvme68k/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.7 2001/01/22 14:51:04 art Exp $ */
+/*	$OpenBSD: exec.h,v 1.8 2003/10/09 21:48:48 miod Exp $ */
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
@@ -26,37 +26,5 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef _MVME68K_EXEC_H_
-#define _MVME68K_EXEC_H_
 
-#define __LDPGSZ	8192
-
-/* Relocation format. */
-struct relocation_info_m68k {
-	int r_address;			/* offset in text or data segment */
-	unsigned int r_symbolnum : 24,	/* ordinal number of add symbol */
-			 r_pcrel :  1,	/* 1 if value should be pc-relative */
-			r_length :  2,	/* log base 2 of value's width */
-			r_extern :  1,	/* 1 if need to add symbol to value */
-		       r_baserel :  1,	/* linkage table relative */
-		      r_jmptable :  1,	/* relocate to jump table */
-		      r_relative :  1,	/* load address relative */
-			  r_copy :  1;	/* run time copy */
-};
-#define relocation_info	relocation_info_m68k
-
-#define ARCH_ELFSIZE		32
-
-#define ELF_TARG_CLASS		ELFCLASS32
-#define ELF_TARG_DATA		ELFDATA2MSB
-#define ELF_TARG_MACH		EM_68K
-
-#define _NLIST_DO_AOUT
-#define _NLIST_DO_ELF
-
-#define _KERN_DO_AOUT
-#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4)
-#define _KERN_DO_ELF
-#endif
-
-#endif  /* _MVME68K_EXEC_H_ */
+#include <m68k/exec.h>
diff --git a/sys/arch/mvme68k/include/pcb.h b/sys/arch/mvme68k/include/pcb.h
index d7b66947316..18fb2816c61 100644
--- a/sys/arch/mvme68k/include/pcb.h
+++ b/sys/arch/mvme68k/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.5 2003/06/02 23:27:50 millert Exp $ */
+/*	$OpenBSD: pcb.h,v 1.6 2003/10/09 21:48:48 miod Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -38,31 +38,4 @@
  *	@(#)pcb.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MVME68K_PCB_H_
-#define _MVME68K_PCB_H_
-
-#include <machine/frame.h>
-
-/*
- * mvme68k process control block
- */
-struct pcb {
-	short	pcb_flags;	/* misc. process flags */
-	short	pcb_ps; 	/* processor status word */
-	int	pcb_ustp;	/* user segment table pointer */
-	int	pcb_usp;	/* user stack pointer */
-	int	pcb_regs[12];	/* D2-D7, A2-A7 */
-	caddr_t	pcb_onfault;	/* for copyin/out faults */
-	struct	fpframe pcb_fpregs; /* 68881/2 context save area */
-};
-
-/*
- * The pcb is augmented with machine-dependent additional data for
- * core dumps. For the hp300, this includes an HP-UX exec header
- * which is dumped for HP-UX processes.
- */
-struct md_coredump {
-	int	md_exec[16];	/* exec structure for HP-UX core dumps */
-};
-
-#endif
+#include <m68k/pcb.h>
diff --git a/sys/arch/mvme68k/include/proc.h b/sys/arch/mvme68k/include/proc.h
index 29c59af72dd..614e168d332 100644
--- a/sys/arch/mvme68k/include/proc.h
+++ b/sys/arch/mvme68k/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.6 2003/06/02 23:27:50 millert Exp $ */
+/*	$OpenBSD: proc.h,v 1.7 2003/10/09 21:48:48 miod Exp $ */
 
 /*
  * Copyright (c) 1991, 1993
@@ -31,23 +31,4 @@
  *	@(#)proc.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MVME68K_PROC_H_
-#define _MVME68K_PROC_H_
-
-/*
- * Machine-dependent part of the proc structure for mvme68k.
- */
-struct mdproc {
-	int	*md_regs;		/* registers on current frame */
-	int	md_flags;		/* machine-dependent flags */
-};
-
-/* md_flags */
-#define MDP_STACKADJ	0x0002	/* frame SP adjusted; undo when syscall does ERESTART */
-#define	MDP_HPUXMMAP	0x0008	/* VA space is multiply mapped */
-#define	MDP_CCBDATA	0x0010	/* copyback caching of data (68040) */
-#define	MDP_CCBSTACK	0x0020	/* copyback caching of stack (68040) */
-#define MDP_UNCACHE_WX	0x0040	/* The process might modify code, so
-				   don't cache writeable executable pages.  */
-
-#endif
+#include <m68k/proc.h>