From: niklas Date: Mon, 13 Jan 1997 11:07:47 +0000 (+0000) Subject: Import compat_m68k4k from NetBSD X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=48161905958d04e78c76d8403def9b19ea21f8c5;p=openbsd Import compat_m68k4k from NetBSD --- diff --git a/sys/arch/m68k/conf/files.m68k b/sys/arch/m68k/conf/files.m68k index 0612af701ae..a20d684a416 100644 --- a/sys/arch/m68k/conf/files.m68k +++ b/sys/arch/m68k/conf/files.m68k @@ -1,11 +1,13 @@ -# $OpenBSD: files.m68k,v 1.3 1996/04/19 06:18:12 niklas Exp $ -# $NetBSD: files.m68k,v 1.13 1996/02/24 12:59:47 briggs Exp $ +# $OpenBSD: files.m68k,v 1.4 1997/01/13 11:07:49 niklas Exp $ +# $NetBSD: files.m68k,v 1.14 1996/09/10 22:07:10 thorpej Exp $ # file arch/m68k/m68k/db_disasm.c ddb file arch/m68k/m68k/db_interface.c ddb file arch/m68k/m68k/db_trace.c ddb file arch/m68k/m68k/in_cksum.c inet -file arch/m68k/m68k/oc_cksum.s inet file arch/m68k/m68k/ns_cksum.c ns +file arch/m68k/m68k/oc_cksum.s inet file arch/m68k/m68k/process_machdep.c file arch/m68k/m68k/random.s + +include "../../../compat/m68k4k/files.m68k4k" diff --git a/sys/arch/m68k/conf/files.m68k.oldconf b/sys/arch/m68k/conf/files.m68k.oldconf index f0fb409feb0..a415f8c0ba7 100644 --- a/sys/arch/m68k/conf/files.m68k.oldconf +++ b/sys/arch/m68k/conf/files.m68k.oldconf @@ -1,5 +1,5 @@ -# $OpenBSD: files.m68k.oldconf,v 1.2 1996/05/29 21:05:12 niklas Exp $ -# $NetBSD: files.m68k.oldconf,v 1.10 1994/10/26 07:48:18 cgd Exp $ +# $OpenBSD: files.m68k.oldconf,v 1.3 1997/01/13 11:07:50 niklas Exp $ +# $NetBSD: files.m68k.oldconf,v 1.11 1996/09/10 22:07:10 thorpej Exp $ # arch/m68k/m68k/db_disasm.c optional ddb arch/m68k/m68k/db_interface.c optional ddb @@ -9,3 +9,5 @@ arch/m68k/m68k/ns_cksum.c optional ns arch/m68k/m68k/oc_cksum.s optional inet arch/m68k/m68k/process_machdep.c standard arch/m68k/m68k/random.s standard + +compat/m68k4k/m68k4k_exec.c optional compat_m68k4k diff --git a/sys/compat/m68k4k/files.m68k4k b/sys/compat/m68k4k/files.m68k4k new file mode 100644 index 00000000000..87a272ed9cf --- /dev/null +++ b/sys/compat/m68k4k/files.m68k4k @@ -0,0 +1,7 @@ +# $OpenBSD: files.m68k4k,v 1.1 1997/01/13 11:07:51 niklas Exp $ +# $NetBSD: files.m68k4k,v 1.1 1996/09/10 22:01:20 thorpej Exp $ +# +# Config.new file description for m68k4k compat code. Included by +# sys/arch/m68k/conf/files.m68k + +file compat/m68k4k/m68k4k_exec.c compat_m68k4k diff --git a/sys/compat/m68k4k/m68k4k_exec.c b/sys/compat/m68k4k/m68k4k_exec.c new file mode 100644 index 00000000000..a975d013c2c --- /dev/null +++ b/sys/compat/m68k4k/m68k4k_exec.c @@ -0,0 +1,256 @@ +/* $OpenBSD: m68k4k_exec.c,v 1.1 1997/01/13 11:07:52 niklas Exp $ */ +/* $NetBSD: m68k4k_exec.c,v 1.1 1996/09/10 22:01:20 thorpej Exp $ */ + +/* + * Copyright (c) 1993, 1994 Christopher G. Demetriou + * 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 by Christopher G. Demetriou. + * 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. + */ + +/* + * Exec glue to provide compatibility with older {Net,Open}BSD m68k4k + * exectuables. + * + * Taken directly from kern/exec_aout.c and frobbed to map text and + * data as m68k4k executables expect. + * + * This module only works on machines with NBPG == 4096. It's not clear + * that making it work on other machines is worth the trouble. + */ + +#if !defined(__m68k__) +#error YOU GOTTA BE KIDDING! +#endif + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +int exec_m68k4k_prep_zmagic __P((struct proc *, struct exec_package *)); +int exec_m68k4k_prep_nmagic __P((struct proc *, struct exec_package *)); +int exec_m68k4k_prep_omagic __P((struct proc *, struct exec_package *)); + +/* + * exec_m68k4k_makecmds(): Check if it's an a.out-format executable + * with an m68k4k magic number. + * + * Given a proc pointer and an exec package pointer, see if the referent + * of the epp is in a.out format. Just check 'standard' magic numbers for + * this architecture. + * + * This function, in the former case, or the hook, in the latter, is + * responsible for creating a set of vmcmds which can be used to build + * the process's vm space and inserting them into the exec package. + */ + +int +exec_m68k4k_makecmds(p, epp) + struct proc *p; + struct exec_package *epp; +{ + u_long midmag, magic; + u_short mid; + int error; + struct exec *execp = epp->ep_hdr; + + /* See note above... */ + if (M68K4K_LDPGSZ != NBPG) + return ENOEXEC; + + if (epp->ep_hdrvalid < sizeof(struct exec)) + return ENOEXEC; + + midmag = ntohl(execp->a_midmag); + mid = (midmag >> 16) & 0x3ff; + magic = midmag & 0xffff; + + midmag = mid << 16 | magic; + + switch (midmag) { + case (MID_M68K4K << 16) | ZMAGIC: + error = exec_m68k4k_prep_zmagic(p, epp); + break; + case (MID_M68K4K << 16) | NMAGIC: + error = exec_m68k4k_prep_nmagic(p, epp); + break; + case (MID_M68K4K << 16) | OMAGIC: + error = exec_m68k4k_prep_omagic(p, epp); + break; + default: + error = ENOEXEC; + } + + if (error) + kill_vmcmds(&epp->ep_vmcmds); + + return error; +} + +/* + * exec_m68k4k_prep_zmagic(): Prepare an m68k4k ZMAGIC binary's exec package + * + * First, set of the various offsets/lengths in the exec package. + * + * Then, mark the text image busy (so it can be demand paged) or error + * out if this is not possible. Finally, set up vmcmds for the + * text, data, bss, and stack segments. + */ + +int +exec_m68k4k_prep_zmagic(p, epp) + struct proc *p; + struct exec_package *epp; +{ + struct exec *execp = epp->ep_hdr; + + epp->ep_taddr = M68K4K_USRTEXT; + epp->ep_tsize = execp->a_text; + epp->ep_daddr = epp->ep_taddr + execp->a_text; + epp->ep_dsize = execp->a_data + execp->a_bss; + epp->ep_entry = execp->a_entry; + + /* + * check if vnode is in open for writing, because we want to + * demand-page out of it. if it is, don't do it, for various + * reasons + */ + if ((execp->a_text != 0 || execp->a_data != 0) && + epp->ep_vp->v_writecount != 0) { +#ifdef DIAGNOSTIC + if (epp->ep_vp->v_flag & VTEXT) + panic("exec: a VTEXT vnode has writecount != 0\n"); +#endif + return ETXTBSY; + } + epp->ep_vp->v_flag |= VTEXT; + + /* set up command for text segment */ + NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, execp->a_text, + epp->ep_taddr, epp->ep_vp, 0, VM_PROT_READ|VM_PROT_EXECUTE); + + /* set up command for data segment */ + NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, execp->a_data, + epp->ep_daddr, epp->ep_vp, execp->a_text, + VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE); + + /* set up command for bss segment */ + NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, execp->a_bss, + epp->ep_daddr + execp->a_data, NULLVP, 0, + VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE); + + return exec_setup_stack(p, epp); +} + +/* + * exec_m68k4k_prep_nmagic(): Prepare a m68k4k NMAGIC binary's exec package + */ + +int +exec_m68k4k_prep_nmagic(p, epp) + struct proc *p; + struct exec_package *epp; +{ + struct exec *execp = epp->ep_hdr; + long bsize, baddr; + + epp->ep_taddr = M68K4K_USRTEXT; + epp->ep_tsize = execp->a_text; + epp->ep_daddr = roundup(epp->ep_taddr + execp->a_text, + M68K4K_LDPGSZ); + epp->ep_dsize = execp->a_data + execp->a_bss; + epp->ep_entry = execp->a_entry; + + /* set up command for text segment */ + NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_readvn, execp->a_text, + epp->ep_taddr, epp->ep_vp, sizeof(struct exec), + VM_PROT_READ|VM_PROT_EXECUTE); + + /* set up command for data segment */ + NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_readvn, execp->a_data, + epp->ep_daddr, epp->ep_vp, execp->a_text + sizeof(struct exec), + VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE); + + /* set up command for bss segment */ + baddr = roundup(epp->ep_daddr + execp->a_data, NBPG); + bsize = epp->ep_daddr + epp->ep_dsize - baddr; + if (bsize > 0) + NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr, + NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE); + + return exec_setup_stack(p, epp); +} + +/* + * exec_m68k4k_prep_omagic(): Prepare a m68k4k OMAGIC binary's exec package + */ + +int +exec_m68k4k_prep_omagic(p, epp) + struct proc *p; + struct exec_package *epp; +{ + struct exec *execp = epp->ep_hdr; + long dsize, bsize, baddr; + + epp->ep_taddr = M68K4K_USRTEXT; + epp->ep_tsize = execp->a_text; + epp->ep_daddr = epp->ep_taddr + execp->a_text; + epp->ep_dsize = execp->a_data + execp->a_bss; + epp->ep_entry = execp->a_entry; + + /* set up command for text and data segments */ + NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_readvn, + execp->a_text + execp->a_data, epp->ep_taddr, epp->ep_vp, + sizeof(struct exec), VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE); + + /* set up command for bss segment */ + baddr = roundup(epp->ep_daddr + execp->a_data, NBPG); + bsize = epp->ep_daddr + epp->ep_dsize - baddr; + if (bsize > 0) + NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr, + NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE); + + /* + * Make sure (# of pages) mapped above equals (vm_tsize + vm_dsize); + * obreak(2) relies on this fact. Both `vm_tsize' and `vm_dsize' are + * computed (in execve(2)) by rounding *up* `ep_tsize' and `ep_dsize' + * respectively to page boundaries. + * Compensate `ep_dsize' for the amount of data covered by the last + * text page. + */ + dsize = epp->ep_dsize + execp->a_text - roundup(execp->a_text, NBPG); + epp->ep_dsize = (dsize > 0) ? dsize : 0; + return exec_setup_stack(p, epp); +} diff --git a/sys/compat/m68k4k/m68k4k_exec.h b/sys/compat/m68k4k/m68k4k_exec.h new file mode 100644 index 00000000000..3b50719cd2b --- /dev/null +++ b/sys/compat/m68k4k/m68k4k_exec.h @@ -0,0 +1,48 @@ +/* $OpenBSD: m68k4k_exec.h,v 1.1 1997/01/13 11:07:53 niklas Exp $ */ +/* $NetBSD: m68k4k_exec.h,v 1.1 1996/09/10 22:01:21 thorpej Exp $ */ + +/*- + * Copyright (c) 1996 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe. + * + * 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 REGENTS 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. + */ + +#ifndef _M68K4K_EXEC_H_ +#define _M68K4K_EXEC_H_ + +#define M68K4K_LDPGSZ 4096 +#define M68K4K_USRTEXT M68K4K_LDPGSZ + +int exec_m68k4k_makecmds __P((struct proc *, struct exec_package *)); + +#endif /* _M68K4K_EXEC_H_ */ diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c index f2b8fb4128b..df87c65e32f 100644 --- a/sys/kern/exec_conf.c +++ b/sys/kern/exec_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_conf.c,v 1.7 1996/12/23 02:42:42 deraadt Exp $ */ +/* $OpenBSD: exec_conf.c,v 1.8 1997/01/13 11:07:47 niklas Exp $ */ /* $NetBSD: exec_conf.c,v 1.16 1995/12/09 05:34:47 cgd Exp $ */ /* @@ -63,6 +63,10 @@ #include #endif +#ifdef COMPAT_M68K4K +#include +#endif + struct execsw execsw[] = { #ifdef LKM { 0, NULL, }, /* entries for LKMs */ @@ -94,6 +98,9 @@ struct execsw execsw[] = { #ifdef COMPAT_HPUX { HPUX_EXEC_HDR_SIZE, exec_hpux_makecmds, }, /* HP-UX a.out */ #endif +#ifdef COMPAT_M68K4K + { sizeof(struct exec), exec_m68k4k_makecmds, }, /* m68k4k a.out */ +#endif }; int nexecs = (sizeof execsw / sizeof(*execsw)); int exec_maxhdrsz;