diff options
Diffstat (limited to 'sys/arch/hp300')
| -rw-r--r-- | sys/arch/hp300/include/exec.h | 37 | ||||
| -rw-r--r-- | sys/arch/hp300/include/pcb.h | 31 | ||||
| -rw-r--r-- | sys/arch/hp300/include/proc.h | 19 |
3 files changed, 6 insertions, 81 deletions
diff --git a/sys/arch/hp300/include/exec.h b/sys/arch/hp300/include/exec.h index df79c23895b..efcb5a0d14f 100644 --- a/sys/arch/hp300/include/exec.h +++ b/sys/arch/hp300/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.8 2001/01/22 14:51:03 art Exp $ */ +/* $OpenBSD: exec.h,v 1.9 2003/10/09 21:48:45 miod Exp $ */ /* $NetBSD: exec.h,v 1.10 1995/11/20 01:15:26 thorpej Exp $ */ /* @@ -28,37 +28,4 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MACHINE_EXEC_H_ -#define _MACHINE_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 /* _MACHINE_EXEC_H_ */ +#include <m68k/exec.h> diff --git a/sys/arch/hp300/include/pcb.h b/sys/arch/hp300/include/pcb.h index 5e1113e0934..6ae98b579bb 100644 --- a/sys/arch/hp300/include/pcb.h +++ b/sys/arch/hp300/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.4 2003/06/02 23:27:45 millert Exp $ */ +/* $OpenBSD: pcb.h,v 1.5 2003/10/09 21:48:45 miod Exp $ */ /* $NetBSD: pcb.h,v 1.8 1995/05/12 12:55:17 mycroft Exp $ */ /* @@ -39,31 +39,4 @@ * @(#)pcb.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _HP300_PCB_H_ -#define _HP300_PCB_H_ - -#include <machine/frame.h> - -/* - * HP300 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 /* _HP300_PCB_H_ */ +#include <m68k/pcb.h> diff --git a/sys/arch/hp300/include/proc.h b/sys/arch/hp300/include/proc.h index 862bd4ae41b..ccdd88ff0ee 100644 --- a/sys/arch/hp300/include/proc.h +++ b/sys/arch/hp300/include/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.5 2003/06/02 23:27:45 millert Exp $ */ +/* $OpenBSD: proc.h,v 1.6 2003/10/09 21:48:45 miod Exp $ */ /* $NetBSD: proc.h,v 1.7 1997/03/16 09:41:36 thorpej Exp $ */ /* @@ -32,19 +32,4 @@ * @(#)proc.h 8.1 (Berkeley) 6/10/93 */ -/* - * Machine-dependent part of the proc structure for hp300. - */ -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 ERE -START */ -#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. */ +#include <m68k/proc.h> |