put aout specific sunos code from sunos_exec.c to separate file
sunos_exec_aout.c make LKM safe add EMUL_GETPID_PASS_PPID|EMUL_GETID_PASS_EID to emul_sunos flags
This commit is contained in:
jdolecek
parent
43ac5f6b81
commit
36e6e46132
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files.sunos,v 1.5 1998/08/06 02:58:44 mrg Exp $
|
||||
# $NetBSD: files.sunos,v 1.6 2000/12/01 19:24:36 jdolecek Exp $
|
||||
#
|
||||
# Config file description for machine-independent SunOS compat code.
|
||||
# Included by ports that need it.
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
# own file lists.
|
||||
|
||||
file compat/sunos/sunos_exec.c compat_sunos
|
||||
file compat/sunos/sunos_exec_aout.c compat_sunos & exec_aout
|
||||
file compat/sunos/sunos_sysent.c compat_sunos
|
||||
file compat/sunos/sunos_ioctl.c compat_sunos
|
||||
file compat/sunos/sunos_misc.c compat_sunos
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: sunos_exec.c,v 1.25 2000/12/01 13:21:37 jdolecek Exp $ */
|
||||
/* $NetBSD: sunos_exec.c,v 1.26 2000/12/01 19:24:36 jdolecek Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1993 Theo de Raadt
|
||||
|
|
@ -27,42 +27,20 @@
|
|||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if defined(_KERNEL) && !defined(_LKM)
|
||||
#include "opt_syscall_debug.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/filedesc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/mount.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/namei.h>
|
||||
#include <sys/signalvar.h>
|
||||
#include <sys/vnode.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/exec.h>
|
||||
#include <sys/resourcevar.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
#include <sys/mman.h>
|
||||
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/reg.h>
|
||||
|
||||
#include <compat/sunos/sunos.h>
|
||||
#include <compat/sunos/sunos_exec.h>
|
||||
#include <compat/sunos/sunos_syscall.h>
|
||||
|
||||
#ifdef __sparc__
|
||||
#define sunos_exec_aout_prep_zmagic exec_aout_prep_zmagic
|
||||
#define sunos_exec_aout_prep_nmagic exec_aout_prep_nmagic
|
||||
#define sunos_exec_aout_prep_omagic exec_aout_prep_omagic
|
||||
#endif
|
||||
|
||||
int sunos_exec_aout_prep_zmagic __P((struct proc *, struct exec_package *));
|
||||
int sunos_exec_aout_prep_nmagic __P((struct proc *, struct exec_package *));
|
||||
int sunos_exec_aout_prep_omagic __P((struct proc *, struct exec_package *));
|
||||
|
||||
extern int nsunos_sysent;
|
||||
extern struct sysent sunos_sysent[];
|
||||
#ifdef SYSCALL_DEBUG
|
||||
|
|
@ -85,170 +63,8 @@ struct emul emul_sunos = {
|
|||
#endif
|
||||
sunos_sigcode,
|
||||
sunos_esigcode,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
EMUL_GETPID_PASS_PPID|EMUL_GETID_PASS_EID,
|
||||
};
|
||||
|
||||
int
|
||||
exec_sunos_aout_makecmds(p, epp)
|
||||
struct proc *p;
|
||||
struct exec_package *epp;
|
||||
{
|
||||
struct sunos_exec *sunmag = epp->ep_hdr;
|
||||
int error = ENOEXEC;
|
||||
|
||||
if(sunmag->a_machtype != SUNOS_M_NATIVE)
|
||||
return (ENOEXEC);
|
||||
|
||||
switch (sunmag->a_magic) {
|
||||
case ZMAGIC:
|
||||
error = sunos_exec_aout_prep_zmagic(p, epp);
|
||||
break;
|
||||
case NMAGIC:
|
||||
error = sunos_exec_aout_prep_nmagic(p, epp);
|
||||
break;
|
||||
case OMAGIC:
|
||||
error = sunos_exec_aout_prep_omagic(p, epp);
|
||||
break;
|
||||
}
|
||||
return error;
|
||||
}
|
||||
|
||||
/*
|
||||
* the code below is only needed for sun3 emulation.
|
||||
*/
|
||||
#ifndef __sparc__
|
||||
|
||||
/* suns keep data seg aligned to SEGSIZ because of sun custom mmu */
|
||||
#define SEGSIZ 0x20000
|
||||
#define SUNOS_N_TXTADDR(x,m) __LDPGSZ
|
||||
#define SUNOS_N_DATADDR(x,m) (((m)==OMAGIC) ? \
|
||||
(SUNOS_N_TXTADDR(x,m) + (x).a_text) : \
|
||||
(SEGSIZ + ((SUNOS_N_TXTADDR(x,m) + (x).a_text - 1) & ~(SEGSIZ-1))))
|
||||
#define SUNOS_N_BSSADDR(x,m) (SUNOS_N_DATADDR(x,m)+(x).a_data)
|
||||
|
||||
#define SUNOS_N_TXTOFF(x,m) ((m)==ZMAGIC ? 0 : sizeof (struct exec))
|
||||
#define SUNOS_N_DATOFF(x,m) (SUNOS_N_TXTOFF(x,m) + (x).a_text)
|
||||
|
||||
/*
|
||||
* sunos_exec_aout_prep_zmagic(): Prepare a SunOS 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
|
||||
sunos_exec_aout_prep_zmagic(p, epp)
|
||||
struct proc *p;
|
||||
struct exec_package *epp;
|
||||
{
|
||||
struct exec *execp = epp->ep_hdr;
|
||||
|
||||
epp->ep_taddr = SUNOS_N_TXTADDR(*execp, ZMAGIC);
|
||||
epp->ep_tsize = execp->a_text;
|
||||
epp->ep_daddr = SUNOS_N_DATADDR(*execp, ZMAGIC);
|
||||
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;
|
||||
}
|
||||
vn_marktext(epp->ep_vp);
|
||||
|
||||
/* set up command for text segment */
|
||||
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, execp->a_text,
|
||||
epp->ep_taddr, epp->ep_vp, SUNOS_N_TXTOFF(*execp, ZMAGIC),
|
||||
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, SUNOS_N_DATOFF(*execp, ZMAGIC),
|
||||
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_aout_setup_stack(p, epp);
|
||||
}
|
||||
|
||||
/*
|
||||
* sunos_exec_aout_prep_nmagic(): Prepare a SunOS NMAGIC binary's exec package
|
||||
*/
|
||||
int
|
||||
sunos_exec_aout_prep_nmagic(p, epp)
|
||||
struct proc *p;
|
||||
struct exec_package *epp;
|
||||
{
|
||||
struct exec *execp = epp->ep_hdr;
|
||||
long bsize, baddr;
|
||||
|
||||
epp->ep_taddr = SUNOS_N_TXTADDR(*execp, NMAGIC);
|
||||
epp->ep_tsize = execp->a_text;
|
||||
epp->ep_daddr = SUNOS_N_DATADDR(*execp, NMAGIC);
|
||||
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, SUNOS_N_TXTOFF(*execp, NMAGIC),
|
||||
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, SUNOS_N_DATOFF(*execp, NMAGIC),
|
||||
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_aout_setup_stack(p, epp);
|
||||
}
|
||||
|
||||
/*
|
||||
* sunos_exec_aout_prep_omagic(): Prepare a SunOS OMAGIC binary's exec package
|
||||
*/
|
||||
int
|
||||
sunos_exec_aout_prep_omagic(p, epp)
|
||||
struct proc *p;
|
||||
struct exec_package *epp;
|
||||
{
|
||||
struct exec *execp = epp->ep_hdr;
|
||||
long bsize, baddr;
|
||||
|
||||
epp->ep_taddr = SUNOS_N_TXTADDR(*execp, OMAGIC);
|
||||
epp->ep_tsize = execp->a_text;
|
||||
epp->ep_daddr = SUNOS_N_DATADDR(*execp, OMAGIC);
|
||||
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,
|
||||
SUNOS_N_TXTOFF(*execp, OMAGIC), 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_aout_setup_stack(p, epp);
|
||||
}
|
||||
#endif /* !sparc */
|
||||
|
|
|
|||
Loading…
Reference in New Issue