diff options
| author | erh <erh@NetBSD.org> | 1998-10-01 02:11:00 +0000 |
|---|---|---|
| committer | erh <erh@NetBSD.org> | 1998-10-01 02:11:00 +0000 |
| commit | 2637ab656d49467756d98fbdeddfbaf4daafc036 (patch) | |
| tree | 9d5d27f5ff2566c7b17004073d5553e23b436e47 /sys/compat/linux | |
| parent | 0b412af4e16d1552919cbc9a4d31cf8b15fbe4a6 (diff) | |
Move compat/linux/linux_exec.h to common.
Diffstat (limited to 'sys/compat/linux')
| -rw-r--r-- | sys/compat/linux/common/linux_exec.h | 64 | ||||
| -rw-r--r-- | sys/compat/linux/include/linux_exec.h | 75 | ||||
| -rw-r--r-- | sys/compat/linux/linux_exec.h | 75 |
3 files changed, 51 insertions, 163 deletions
diff --git a/sys/compat/linux/common/linux_exec.h b/sys/compat/linux/common/linux_exec.h index a0e02b4fe1a..a8330a0302b 100644 --- a/sys/compat/linux/common/linux_exec.h +++ b/sys/compat/linux/common/linux_exec.h @@ -1,4 +1,40 @@ -/* $NetBSD: linux_exec.h,v 1.8 1998/01/24 12:39:40 mycroft Exp $ */ +/* $NetBSD: linux_exec.h,v 1.9 1998/10/01 02:11:00 erh Exp $ */ + +/*- + * Copyright (c) 1998 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Eric Haszlakiewicz. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ /* * Copyright (c) 1995 Frank van der Linden @@ -32,17 +68,10 @@ * */ -#ifndef _LINUX_EXEC_H -#define _LINUX_EXEC_H - -#define LINUX_M_I386 100 -/* Sparc? Alpha? */ - -/* XXX linux_machdep.h ? */ -#ifdef i386 -#define LINUX_MID_MACHINE LINUX_M_I386 -#endif +#ifndef _COMMON_LINUX_EXEC_H +#define _COMMON_LINUX_EXEC_H +/* Defines for a.out executables */ #define LINUX_AOUT_HDR_SIZE (sizeof (struct exec)) #define LINUX_N_MAGIC(ep) ((ep)->a_midmag & 0xffff) @@ -65,11 +94,20 @@ #define LINUX_N_BSSADDR(x,m) (LINUX_N_DATADDR(x,m) + (x).a_data) +#ifdef _KERNEL +__BEGIN_DECLS void linux_setregs __P((struct proc *, struct exec_package *, u_long)); int exec_linux_aout_makecmds __P((struct proc *, struct exec_package *)); -int exec_linux_elf_makecmds __P((struct proc *, struct exec_package *)); +#ifdef EXEC_ELF32 int linux_elf32_probe __P((struct proc *, struct exec_package *, Elf32_Ehdr *, char *, Elf32_Addr *)); +#endif +#ifdef EXEC_ELF64 +int linux_elf64_probe __P((struct proc *, struct exec_package *, Elf64_Ehdr *, + char *, Elf64_Addr *)); +#endif +__END_DECLS +#endif /* !_KERNEL */ -#endif /* !_LINUX_EXEC_H */ +#endif /* !_COMMON_LINUX_EXEC_H */ diff --git a/sys/compat/linux/include/linux_exec.h b/sys/compat/linux/include/linux_exec.h deleted file mode 100644 index a0e02b4fe1a..00000000000 --- a/sys/compat/linux/include/linux_exec.h +++ /dev/null @@ -1,75 +0,0 @@ -/* $NetBSD: linux_exec.h,v 1.8 1998/01/24 12:39:40 mycroft Exp $ */ - -/* - * Copyright (c) 1995 Frank van der Linden - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed for the NetBSD Project - * by Frank van der Linden - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (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 _LINUX_EXEC_H -#define _LINUX_EXEC_H - -#define LINUX_M_I386 100 -/* Sparc? Alpha? */ - -/* XXX linux_machdep.h ? */ -#ifdef i386 -#define LINUX_MID_MACHINE LINUX_M_I386 -#endif - -#define LINUX_AOUT_HDR_SIZE (sizeof (struct exec)) - -#define LINUX_N_MAGIC(ep) ((ep)->a_midmag & 0xffff) -#define LINUX_N_MACHTYPE(ep) (((ep)->a_midmag >> 16) & 0xff) - -#define LINUX_N_TXTOFF(x,m) \ - ((m) == ZMAGIC ? 1024 : ((m) == QMAGIC ? 0 : sizeof (struct exec))) - -#define LINUX_N_DATOFF(x,m) (LINUX_N_TXTOFF(x,m) + (x).a_text) - -#define LINUX_N_TXTADDR(x,m) ((m) == QMAGIC ? PAGE_SIZE : 0) - -#define LINUX__N_SEGMENT_ROUND(x) (((x) + NBPG - 1) & ~(NBPG - 1)) - -#define LINUX__N_TXTENDADDR(x,m) (LINUX_N_TXTADDR(x,m)+(x).a_text) - -#define LINUX_N_DATADDR(x,m) \ - ((m)==OMAGIC? (LINUX__N_TXTENDADDR(x,m)) \ - : (LINUX__N_SEGMENT_ROUND (LINUX__N_TXTENDADDR(x,m)))) - -#define LINUX_N_BSSADDR(x,m) (LINUX_N_DATADDR(x,m) + (x).a_data) - -void linux_setregs __P((struct proc *, struct exec_package *, u_long)); -int exec_linux_aout_makecmds __P((struct proc *, struct exec_package *)); -int exec_linux_elf_makecmds __P((struct proc *, struct exec_package *)); - -int linux_elf32_probe __P((struct proc *, struct exec_package *, Elf32_Ehdr *, - char *, Elf32_Addr *)); - -#endif /* !_LINUX_EXEC_H */ diff --git a/sys/compat/linux/linux_exec.h b/sys/compat/linux/linux_exec.h deleted file mode 100644 index a0e02b4fe1a..00000000000 --- a/sys/compat/linux/linux_exec.h +++ /dev/null @@ -1,75 +0,0 @@ -/* $NetBSD: linux_exec.h,v 1.8 1998/01/24 12:39:40 mycroft Exp $ */ - -/* - * Copyright (c) 1995 Frank van der Linden - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed for the NetBSD Project - * by Frank van der Linden - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (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 _LINUX_EXEC_H -#define _LINUX_EXEC_H - -#define LINUX_M_I386 100 -/* Sparc? Alpha? */ - -/* XXX linux_machdep.h ? */ -#ifdef i386 -#define LINUX_MID_MACHINE LINUX_M_I386 -#endif - -#define LINUX_AOUT_HDR_SIZE (sizeof (struct exec)) - -#define LINUX_N_MAGIC(ep) ((ep)->a_midmag & 0xffff) -#define LINUX_N_MACHTYPE(ep) (((ep)->a_midmag >> 16) & 0xff) - -#define LINUX_N_TXTOFF(x,m) \ - ((m) == ZMAGIC ? 1024 : ((m) == QMAGIC ? 0 : sizeof (struct exec))) - -#define LINUX_N_DATOFF(x,m) (LINUX_N_TXTOFF(x,m) + (x).a_text) - -#define LINUX_N_TXTADDR(x,m) ((m) == QMAGIC ? PAGE_SIZE : 0) - -#define LINUX__N_SEGMENT_ROUND(x) (((x) + NBPG - 1) & ~(NBPG - 1)) - -#define LINUX__N_TXTENDADDR(x,m) (LINUX_N_TXTADDR(x,m)+(x).a_text) - -#define LINUX_N_DATADDR(x,m) \ - ((m)==OMAGIC? (LINUX__N_TXTENDADDR(x,m)) \ - : (LINUX__N_SEGMENT_ROUND (LINUX__N_TXTENDADDR(x,m)))) - -#define LINUX_N_BSSADDR(x,m) (LINUX_N_DATADDR(x,m) + (x).a_data) - -void linux_setregs __P((struct proc *, struct exec_package *, u_long)); -int exec_linux_aout_makecmds __P((struct proc *, struct exec_package *)); -int exec_linux_elf_makecmds __P((struct proc *, struct exec_package *)); - -int linux_elf32_probe __P((struct proc *, struct exec_package *, Elf32_Ehdr *, - char *, Elf32_Addr *)); - -#endif /* !_LINUX_EXEC_H */ |
