preliminary ecoff support, initially to support COMPAT_ULTRIX

This commit is contained in:
glass 1994-05-27 09:19:40 +00:00
parent 6b63c739f3
commit 7890c5a8cd
3 changed files with 334 additions and 1 deletions

View File

@ -27,12 +27,16 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: exec_conf.c,v 1.3 1994/02/05 02:24:56 cgd Exp $ * $Id: exec_conf.c,v 1.4 1994/05/27 09:20:13 glass Exp $
*/ */
#define EXEC_SCRIPT /* XXX */ #define EXEC_SCRIPT /* XXX */
#define EXEC_AOUT /* XXX */ #define EXEC_AOUT /* XXX */
#ifdef COMPAT_ULTRIX
#define EXEC_ECOFF
#endif
#include <sys/param.h> #include <sys/param.h>
#include <sys/exec.h> #include <sys/exec.h>
@ -44,6 +48,10 @@
#include <sys/exec_aout.h> #include <sys/exec_aout.h>
#endif #endif
#ifdef EXEC_ECOFF
#include <sys/exec_ecoff.h>
#endif
struct execsw execsw[] = { struct execsw execsw[] = {
#ifdef LKM #ifdef LKM
{ 0, NULL, }, /* entries for LKMs */ { 0, NULL, }, /* entries for LKMs */
@ -58,6 +66,9 @@ struct execsw execsw[] = {
#ifdef EXEC_AOUT #ifdef EXEC_AOUT
{ sizeof(struct exec), exec_aout_makecmds, }, /* a.out binaries */ { sizeof(struct exec), exec_aout_makecmds, }, /* a.out binaries */
#endif #endif
#ifdef EXEC_ECOFF
{ ECOFF_HDR_SIZE, exec_ecoff_makecmds, }, /* ecoff binaries */
#endif
}; };
int nexecs = (sizeof execsw / sizeof(*execsw)); int nexecs = (sizeof execsw / sizeof(*execsw));
int exec_maxhdrsz; int exec_maxhdrsz;

232
sys/kern/exec_ecoff.c Normal file
View File

@ -0,0 +1,232 @@
/*
* Copyright (c) 1994 Adam Glass
* 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.
*
* $Id: exec_ecoff.c,v 1.1 1994/05/27 09:20:21 glass Exp $
*/
#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 <vm/vm.h>
#include <sys/exec_ecoff.h>
int exec_ecoff_prep_zmagic __P((struct proc *, struct exec_package *,
struct ecoff_filehdr *,
struct ecoff_aouthdr *));
int exec_ecoff_prep_omagic __P((struct proc *, struct exec_package *,
struct ecoff_filehdr *,
struct ecoff_aouthdr *));
int exec_ecoff_setup_stack __P((struct proc *, struct exec_package *));
/*
* exec_ecoff_makecmds(): Check if it's an ecoff-format executable.
*
* Given a proc pointer and an exec package pointer, see if the referent
* of the epp is in ecoff format. Check 'standard' magic numbers for
* this architecture. If that fails, return failure.
*
* This function 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_ecoff_makecmds(p, epp)
struct proc *p;
struct exec_package *epp;
{
u_long midmag, magic;
u_short mid;
int error;
struct ecoff_filehdr *efp = epp->ep_hdr;
struct ecoff_aouthdr *eap;
if (epp->ep_hdrvalid < ECOFF_HDR_SIZE)
return ENOEXEC;
if (ECOFF_BADMAG(efp))
return ENOEXEC;
eap = epp->ep_hdr + sizeof(struct ecoff_filehdr);
switch (eap->ea_magic) {
case ECOFF_ZMAGIC:
error = exec_ecoff_prep_zmagic(p, epp, efp, eap);
break;
case ECOFF_OMAGIC:
error = exec_ecoff_prep_omagic(p, epp, efp, eap);
break;
default:
return ENOEXEC;
}
if (error == 0)
error = cpu_exec_ecoff_hook(p, epp, eap);
if (error)
kill_vmcmds(&epp->ep_vmcmds);
bad:
return error;
}
/*
* exec_ecoff_prep_zmagic(): Prepare a ECOFF ZMAGIC binary's exec package
*
* First, set 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_ecoff_prep_zmagic(p, epp, efp, eap)
struct proc *p;
struct exec_package *epp;
struct ecoff_filehdr *efp;
struct ecoff_aouthdr *eap;
{
epp->ep_taddr = eap->ea_text_start;
epp->ep_tsize = eap->ea_tsize;
epp->ep_daddr = eap->ea_data_start;
epp->ep_dsize = eap->ea_dsize;
epp->ep_entry = eap->ea_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 ((eap->ea_tsize != 0 || eap->ea_dsize != 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, eap->ea_tsize,
epp->ep_taddr, epp->ep_vp, ECOFF_TXTOFF(efp, eap),
VM_PROT_READ|VM_PROT_EXECUTE);
/* set up command for data segment */
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, eap->ea_dsize,
epp->ep_daddr, epp->ep_vp,
ECOFF_TXTOFF(efp, eap) + eap->ea_tsize,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
/* set up command for bss segment */
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, eap->ea_bsize,
eap->ea_bss_start, NULLVP, 0,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return exec_ecoff_setup_stack(p, epp);
}
/*
* exec_ecoff_prep_omagic(): Prepare a ECOFF OMAGIC binary's exec package
*/
int exec_ecoff_prep_omagic(p, epp, efp, eap)
struct proc *p;
struct exec_package *epp;
struct ecoff_filehdr *efp;
struct ecoff_aouthdr *eap;
{
epp->ep_taddr = eap->ea_text_start;
epp->ep_tsize = eap->ea_tsize;
epp->ep_daddr = eap->ea_data_start;
epp->ep_dsize = eap->ea_dsize;
epp->ep_entry = eap->ea_entry;
/* set up command for text and data segments */
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_readvn,
eap->ea_tsize + eap->ea_dsize, epp->ep_taddr, epp->ep_vp,
ECOFF_TXTOFF(efp, eap),
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
/* set up command for bss segment */
if (eap->ea_bsize > 0)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, eap->ea_bsize,
eap->ea_bss_start, NULLVP, 0,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return exec_ecoff_setup_stack(p, epp);
}
/*
* exec_ecoff_setup_stack(): Set up the stack segment for an ecoff
* executable.
*
* Note that the ep_ssize parameter must be set to be the current stack
* limit; this is adjusted in the body of execve() to yield the
* appropriate stack segment usage once the argument length is
* calculated.
*
* This function returns an int for uniformity with other (future) formats'
* stack setup functions. They might have errors to return.
*/
int
exec_ecoff_setup_stack(p, epp)
struct proc *p;
struct exec_package *epp;
{
epp->ep_maxsaddr = USRSTACK - MAXSSIZ;
epp->ep_minsaddr = USRSTACK;
epp->ep_ssize = p->p_rlimit[RLIMIT_STACK].rlim_cur;
/*
* set up commands for stack. note that this takes *two*, one to
* map the part of the stack which we can access, and one to map
* the part which we can't.
*
* arguably, it could be made into one, but that would require the
* addition of another mapping proc, which is unnecessary
*
* note that in memory, things assumed to be: 0 ....... ep_maxsaddr
* <stack> ep_minsaddr
*/
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero,
((epp->ep_minsaddr - epp->ep_ssize) - epp->ep_maxsaddr),
epp->ep_maxsaddr, NULLVP, 0, VM_PROT_NONE);
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, epp->ep_ssize,
(epp->ep_minsaddr - epp->ep_ssize), NULLVP, 0,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return 0;
}

90
sys/sys/exec_ecoff.h Normal file
View File

@ -0,0 +1,90 @@
/*
* Copyright (c) 1994 Adam Glass
* 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 Adam Glass
* 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.
*
* $Id: exec_ecoff.h,v 1.1 1994/05/27 09:19:40 glass Exp $
*/
#ifndef _SYS_EXEC_ECOFF_H_
#define _SYS_EXEC_ECOFF_H_
#ifdef KERNEL
#include <machine/ecoff.h>
struct ecoff_filehdr {
u_short ef_magic; /* magic number */
u_short ef_nsecs; /* # of sections */
u_int ef_timestamp; /* time and date stamp */
u_long ef_symptr; /* file offset of symbol table */
u_int ef_syms; /* # of symbol table entries */
u_short ef_opthdr; /* sizeof the optional header */
u_short ef_flags; /* flags??? */
};
struct ecoff_aouthdr {
u_short ea_magic;
u_short ea_vstamp;
ECOFF_PAD
u_long ea_tsize;
u_long ea_dsize;
u_long ea_bsize;
u_long ea_entry;
u_long ea_text_start;
u_long ea_data_start;
u_long ea_bss_start;
ECOFF_MACHDEP;
};
struct ecoff_scnhdr { /* needed for size info */
char es_name[8]; /* name */
u_long es_physaddr; /* physical addr? for ROMing?*/
u_long es_virtaddr; /* virtual addr? */
u_long es_size; /* size */
u_long es_raw_offset; /* file offset of raw data */
u_long es_reloc_offset; /* file offset of reloc data */
u_long es_line_offset; /* file offset of line data */
u_short es_nreloc; /* # of relocation entries */
u_short es_nline; /* # of line entries */
u_int es_flags; /* flags */
};
#define ECOFF_HDR_SIZE (sizeof(struct ecoff_filehdr) + \
sizeof(struct ecoff_aouthdr))
#define ECOFF_OMAGIC 0407
#define ECOFF_ZMAGIC 0413
#define ECOFF_TXTOFF(efp, eap) \
(eap->ea_magic == ECOFF_ZMAGIC ? 0 : \
((ECOFF_HDR_SIZE + efp->ef_nsecs * sizeof(struct ecoff_scnhdr) + \
ECOFF_TXTOFF_ROUND(eap)) & ~ECOFF_TXTOFF_ROUND(eap)))
int exec_ecoff_makecmds __P((struct proc *, struct exec_package *));
#endif /* KERNEL */
#endif /* !_SYS_EXEC_ECOFF_H_ */