diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/compat/vax1k/files.vax1k | 8 | ||||
| -rw-r--r-- | sys/compat/vax1k/vax1k_exec.c | 144 | ||||
| -rw-r--r-- | sys/compat/vax1k/vax1k_exec.h | 41 | ||||
| -rw-r--r-- | sys/compat/vax1k/vax1k_subr.c | 96 |
4 files changed, 0 insertions, 289 deletions
diff --git a/sys/compat/vax1k/files.vax1k b/sys/compat/vax1k/files.vax1k deleted file mode 100644 index 359320c60ec..00000000000 --- a/sys/compat/vax1k/files.vax1k +++ /dev/null @@ -1,8 +0,0 @@ -# $OpenBSD: files.vax1k,v 1.1 2001/11/14 14:37:22 hugh Exp $ -# $NetBSD: files.vax1k,v 1.1 1998/08/21 13:25:47 ragge Exp $ -# -# Config file description for vax1k compat code. Included by -# sys/arch/vax/conf/files.vax - -file compat/vax1k/vax1k_exec.c compat_vax1k -file compat/vax1k/vax1k_subr.c compat_vax1k diff --git a/sys/compat/vax1k/vax1k_exec.c b/sys/compat/vax1k/vax1k_exec.c deleted file mode 100644 index dce545d8b0d..00000000000 --- a/sys/compat/vax1k/vax1k_exec.c +++ /dev/null @@ -1,144 +0,0 @@ -/* $OpenBSD: vax1k_exec.c,v 1.2 2002/03/14 01:26:51 millert Exp $ */ -/* $NetBSD: vax1k_exec.c,v 1.1 1998/08/21 13:25:47 ragge 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 NetBSD vax1k exectuables. - * - * Because NetBSD/vax now uses 4k page size, older binaries (that started - * on an 1k boundary) cannot be mmap'ed. Therefore they are read in - * (via vn_rdwr) as OMAGIC binaries and executed. This will use a little - * bit more memory, but otherwise won't affect the execution speed. - */ - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/proc.h> -#include <sys/malloc.h> -#include <sys/vnode.h> -#include <sys/exec.h> -#include <sys/resourcevar.h> - -#include <compat/vax1k/vax1k_exec.h> - -int exec_vax1k_prep_anymagic(struct proc *, struct exec_package *, int); - -/* - * exec_vax1k_makecmds(): Check if it's an a.out-format executable - * with an vax1k 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_vax1k_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; - - 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_VAX1K << 16) | ZMAGIC: - error = exec_vax1k_prep_anymagic(p, epp, 0); - break; - - case (MID_VAX1K << 16) | NMAGIC: - case (MID_VAX1K << 16) | OMAGIC: - error = exec_vax1k_prep_anymagic(p, epp, sizeof(struct exec)); - break; - - default: - error = ENOEXEC; - } - - if (error) - kill_vmcmds(&epp->ep_vmcmds); - - return error; -} - -/* - * exec_vax1k_prep_anymagic(): Prepare an vax1k ?MAGIC binary's exec package - * - * First, set of the various offsets/lengths in the exec package. - * Note that all code is mapped RW; no protection, but because it is - * only used for compatibility it won't hurt. - * - */ -int -exec_vax1k_prep_anymagic(p, epp, off) - struct proc *p; - struct exec_package *epp; - int off; -{ - long etmp, tmp; - struct exec *execp = epp->ep_hdr; - - epp->ep_taddr = execp->a_entry & ~(VAX1K_USRTEXT - 1); - epp->ep_tsize = execp->a_text + execp->a_data; - epp->ep_daddr = epp->ep_tsize + epp->ep_taddr; - epp->ep_dsize = execp->a_bss; - epp->ep_entry = execp->a_entry; - - /* set up command for text segment */ - NEW_VMCMD(&epp->ep_vmcmds, vax1k_map_readvn, - epp->ep_tsize, epp->ep_taddr, epp->ep_vp, off, - VM_PROT_WRITE|VM_PROT_READ|VM_PROT_EXECUTE); - - tmp = round_page(epp->ep_daddr); - etmp = execp->a_bss - (tmp - epp->ep_daddr); - - /* set up command for bss segment */ - if (etmp > 0) - NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, etmp, tmp, NULLVP, 0, - VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE); - - return exec_setup_stack(p, epp); -} diff --git a/sys/compat/vax1k/vax1k_exec.h b/sys/compat/vax1k/vax1k_exec.h deleted file mode 100644 index 0aad8121546..00000000000 --- a/sys/compat/vax1k/vax1k_exec.h +++ /dev/null @@ -1,41 +0,0 @@ -/* $OpenBSD: vax1k_exec.h,v 1.3 2008/06/26 05:42:14 ray Exp $ */ -/* $NetBSD: vax1k_exec.h,v 1.1 1998/08/21 13:25:47 ragge 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. - * - * 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. - */ - -#ifndef _VAX1K_EXEC_H_ -#define _VAX1K_EXEC_H_ - -#define VAX1K_LDPGSZ 1024 -#define VAX1K_USRTEXT VAX1K_LDPGSZ - -int exec_vax1k_makecmds(struct proc *, struct exec_package *); -int vax1k_map_readvn(struct proc *, struct exec_vmcmd *); -#endif /* _VAX1K_EXEC_H_ */ diff --git a/sys/compat/vax1k/vax1k_subr.c b/sys/compat/vax1k/vax1k_subr.c deleted file mode 100644 index a9dac2d5170..00000000000 --- a/sys/compat/vax1k/vax1k_subr.c +++ /dev/null @@ -1,96 +0,0 @@ -/* $OpenBSD: vax1k_subr.c,v 1.3 2005/11/06 22:21:33 miod Exp $ */ -/* $NetBSD: vax1k_subr.c,v 1.2 1999/03/24 05:51:20 mrg Exp $ */ - -/* - * Copyright (c) 1993, 1994, 1996 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. - */ - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/proc.h> -#include <sys/malloc.h> -#include <sys/vnode.h> -#include <sys/filedesc.h> -#include <sys/exec.h> -#include <sys/mman.h> - -#include <compat/vax1k/vax1k_exec.h> - -#include <uvm/uvm_extern.h> - -/* - * vax1k_map_readvn(): - * handle vmcmd which specifies that a vnode should be read from. - * This is used to be able to read in and execute vax1k binaries - * even if the page size is bigger. (cannot mmap). - */ -int -vax1k_map_readvn(p, cmd) - struct proc *p; - struct exec_vmcmd *cmd; -{ - vaddr_t oaddr; - int error; - - if (cmd->ev_len == 0) - return (0); - - oaddr = cmd->ev_addr; - cmd->ev_addr = trunc_page(cmd->ev_addr); /* required by uvm_map */ - error = uvm_map(&p->p_vmspace->vm_map, &cmd->ev_addr, - round_page(cmd->ev_len + (oaddr - cmd->ev_addr)), - NULL, UVM_UNKNOWN_OFFSET, 0, - UVM_MAPFLAG(UVM_PROT_ALL, UVM_PROT_ALL, UVM_INH_COPY, - UVM_ADV_NORMAL, - UVM_FLAG_FIXED|UVM_FLAG_OVERLAY|UVM_FLAG_COPYONW)); - - if (error) - return error; - - error = vn_rdwr(UIO_READ, cmd->ev_vp, (caddr_t)oaddr, - cmd->ev_len, cmd->ev_offset, UIO_USERSPACE, IO_UNIT, - p->p_ucred, NULL, p); - if (error) - return error; - - if (cmd->ev_prot != (VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)) { - /* - * we had to map in the area at PROT_ALL so that vn_rdwr() - * could write to it. however, the caller seems to want - * it mapped read-only, so now we are going to have to call - * uvm_map_protect() to fix up the protection. ICK. - */ - return(uvm_map_protect(&p->p_vmspace->vm_map, - trunc_page(cmd->ev_addr), - round_page(cmd->ev_addr + cmd->ev_len), - cmd->ev_prot, FALSE)); - } - - return (0); -} |