put a.out/elf32 specific things in netbsd32_exec_{aout|elf32}.c
emul_netbsd32 was moved to netbsd32_netbsd.c g/c netbsd32_exec.c now
This commit is contained in:
jdolecek
parent
758d9354ff
commit
e53f148af5
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files.netbsd32,v 1.6 1999/10/11 01:36:21 eeh Exp $
|
||||
# $NetBSD: files.netbsd32,v 1.7 2000/12/01 21:51:08 jdolecek Exp $
|
||||
#
|
||||
# config file description for machine-independent netbsd32 compat code.
|
||||
# included by ports that need it.
|
||||
|
|
@ -6,7 +6,8 @@
|
|||
# ports should define any machine-specific files they need in their
|
||||
# own file lists.
|
||||
|
||||
file compat/netbsd32/netbsd32_exec.c compat_netbsd32
|
||||
file compat/netbsd32/netbsd32_exec_elf32.c compat_netbsd32 & exec_elf32
|
||||
file compat/netbsd32/netbsd32_exec_aout.c compat_netbsd32 & exec_aout
|
||||
file compat/netbsd32/netbsd32_netbsd.c compat_netbsd32
|
||||
file compat/netbsd32/netbsd32_ioctl.c compat_netbsd32
|
||||
file compat/netbsd32/netbsd32_sysent.c compat_netbsd32
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: netbsd32_exec.c,v 1.26 2000/12/01 12:28:33 jdolecek Exp $ */
|
||||
/* $NetBSD: netbsd32_exec_aout.c,v 1.1 2000/12/01 21:51:09 jdolecek Exp $ */
|
||||
/* from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */
|
||||
|
||||
/*
|
||||
|
|
@ -32,34 +32,25 @@
|
|||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#define ELFSIZE 32
|
||||
|
||||
#include "opt_compat_sunos.h"
|
||||
#include "opt_syscall_debug.h"
|
||||
|
||||
#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/exec_elf.h>
|
||||
#include <sys/resourcevar.h>
|
||||
#include <sys/signal.h>
|
||||
#include <sys/signalvar.h>
|
||||
|
||||
#include <compat/netbsd32/netbsd32.h>
|
||||
#ifndef EXEC_AOUT
|
||||
#define EXEC_AOUT
|
||||
#endif
|
||||
#include <compat/netbsd32/netbsd32_exec.h>
|
||||
#include <compat/netbsd32/netbsd32_syscall.h>
|
||||
|
||||
#include <machine/frame.h>
|
||||
#include <machine/netbsd32_machdep.h>
|
||||
|
||||
extern char netbsd32_sigcode[], netbsd32_esigcode[];
|
||||
extern struct sysent netbsd32_sysent[];
|
||||
#ifdef SYSCALL_DEBUG
|
||||
extern const char * const netbsd32_syscallnames[];
|
||||
#endif
|
||||
int netbsd32_copyinargs __P((struct exec_package *, struct ps_strings *,
|
||||
void *, size_t, const void *, const void *));
|
||||
|
||||
|
|
@ -70,58 +61,6 @@ static int netbsd32_exec_aout_prep_nmagic __P((struct proc *,
|
|||
static int netbsd32_exec_aout_prep_omagic __P((struct proc *,
|
||||
struct exec_package *));
|
||||
|
||||
const struct emul emul_netbsd32 = {
|
||||
"netbsd32",
|
||||
"/emul/netbsd32",
|
||||
NULL,
|
||||
netbsd32_sendsig,
|
||||
netbsd32_SYS_syscall,
|
||||
netbsd32_SYS_MAXSYSCALL,
|
||||
netbsd32_sysent,
|
||||
#ifdef SYSCALL_DEBUG
|
||||
netbsd32_syscallnames,
|
||||
#else
|
||||
NULL,
|
||||
#endif
|
||||
netbsd32_sigcode,
|
||||
netbsd32_esigcode,
|
||||
};
|
||||
|
||||
#ifdef EXEC_ELF32
|
||||
|
||||
extern int ELFNAME2(netbsd,signature) __P((struct proc *, struct exec_package *,
|
||||
Elf_Ehdr *));
|
||||
int
|
||||
ELFNAME2(netbsd32,probe)(p, epp, eh, itp, pos)
|
||||
struct proc *p;
|
||||
struct exec_package *epp;
|
||||
void *eh;
|
||||
char *itp;
|
||||
vaddr_t *pos;
|
||||
{
|
||||
int error;
|
||||
size_t i;
|
||||
const char *bp;
|
||||
|
||||
if ((error = ELFNAME2(netbsd,signature)(p, epp, eh)) != 0)
|
||||
return error;
|
||||
|
||||
if (itp[0]) {
|
||||
if ((error = emul_find(p, NULL, epp->ep_esch->es_emul->e_path,
|
||||
itp, &bp, 0)) &&
|
||||
(error = emul_find(p, NULL, "", itp, &bp, 0)))
|
||||
return error;
|
||||
if ((error = copystr(bp, itp, MAXPATHLEN, &i)) != 0)
|
||||
return error;
|
||||
free((void *)bp, M_TEMP);
|
||||
}
|
||||
epp->ep_flags |= EXEC_32;
|
||||
*(Elf_Addr *)pos = ELFDEFNNAME(NO_ADDR);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef EXEC_AOUT
|
||||
/*
|
||||
* exec_netbsd32_makecmds(): Check if it's an netbsd32 a.out format
|
||||
* executable.
|
||||
|
|
@ -317,129 +256,3 @@ netbsd32_exec_aout_prep_omagic(p, epp)
|
|||
epp->ep_dsize = (dsize > 0) ? dsize : 0;
|
||||
return exec_aout_setup_stack(p, epp);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* We need to copy out all pointers as 32-bit values.
|
||||
*/
|
||||
void *
|
||||
netbsd32_copyargs(pack, arginfo, stack, argp)
|
||||
struct exec_package *pack;
|
||||
struct ps_strings *arginfo;
|
||||
void *stack;
|
||||
void *argp;
|
||||
{
|
||||
u_int32_t *cpp = stack;
|
||||
u_int32_t dp;
|
||||
u_int32_t nullp = 0;
|
||||
char *sp;
|
||||
size_t len;
|
||||
int argc = arginfo->ps_nargvstr;
|
||||
int envc = arginfo->ps_nenvstr;
|
||||
|
||||
if (copyout(&argc, cpp++, sizeof(argc)))
|
||||
return NULL;
|
||||
|
||||
dp = (u_long) (cpp + argc + envc + 2 + pack->ep_esch->es_arglen);
|
||||
sp = argp;
|
||||
|
||||
/* XXX don't copy them out, remap them! */
|
||||
arginfo->ps_argvstr = (char **)(u_long)cpp; /* remember location of argv for later */
|
||||
|
||||
for (; --argc >= 0; sp += len, dp += len) {
|
||||
if (copyout(&dp, cpp++, sizeof(dp)) ||
|
||||
copyoutstr(sp, (char *)(u_long)dp, ARG_MAX, &len))
|
||||
return NULL;
|
||||
}
|
||||
if (copyout(&nullp, cpp++, sizeof(nullp)))
|
||||
return NULL;
|
||||
|
||||
arginfo->ps_envstr = (char **)(u_long)cpp; /* remember location of envp for later */
|
||||
|
||||
for (; --envc >= 0; sp += len, dp += len) {
|
||||
if (copyout(&dp, cpp++, sizeof(dp)) ||
|
||||
copyoutstr(sp, (char *)(u_long)dp, ARG_MAX, &len))
|
||||
return NULL;
|
||||
}
|
||||
if (copyout(&nullp, cpp++, sizeof(nullp)))
|
||||
return NULL;
|
||||
|
||||
return cpp;
|
||||
}
|
||||
|
||||
/* round up and down to page boundaries. */
|
||||
#define ELF_ROUND(a, b) (((a) + (b) - 1) & ~((b) - 1))
|
||||
#define ELF_TRUNC(a, b) ((a) & ~((b) - 1))
|
||||
|
||||
/*
|
||||
* Copy arguments onto the stack in the normal way, but add some
|
||||
* extra information in case of dynamic binding.
|
||||
*/
|
||||
void *
|
||||
netbsd32_elf32_copyargs(pack, arginfo, stack, argp)
|
||||
struct exec_package *pack;
|
||||
struct ps_strings *arginfo;
|
||||
void *stack;
|
||||
void *argp;
|
||||
{
|
||||
size_t len;
|
||||
AuxInfo ai[ELF_AUX_ENTRIES], *a;
|
||||
struct elf_args *ap;
|
||||
|
||||
stack = netbsd32_copyargs(pack, arginfo, stack, argp);
|
||||
if (!stack)
|
||||
return NULL;
|
||||
|
||||
a = ai;
|
||||
|
||||
/*
|
||||
* Push extra arguments on the stack needed by dynamically
|
||||
* linked binaries
|
||||
*/
|
||||
if ((ap = (struct elf_args *)pack->ep_emul_arg)) {
|
||||
|
||||
a->a_type = AT_PHDR;
|
||||
a->a_v = ap->arg_phaddr;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_PHENT;
|
||||
a->a_v = ap->arg_phentsize;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_PHNUM;
|
||||
a->a_v = ap->arg_phnum;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_PAGESZ;
|
||||
a->a_v = NBPG;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_BASE;
|
||||
a->a_v = ap->arg_interp;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_FLAGS;
|
||||
a->a_v = 0;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_ENTRY;
|
||||
a->a_v = ap->arg_entry;
|
||||
a++;
|
||||
|
||||
free((char *)ap, M_TEMP);
|
||||
pack->ep_emul_arg = NULL;
|
||||
}
|
||||
|
||||
a->a_type = AT_NULL;
|
||||
a->a_v = 0;
|
||||
a++;
|
||||
|
||||
len = (a - ai) * sizeof(AuxInfo);
|
||||
if (copyout(ai, stack, len))
|
||||
return NULL;
|
||||
stack = (caddr_t)stack + len;
|
||||
|
||||
return stack;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,162 @@
|
|||
/* $NetBSD: netbsd32_exec_elf32.c,v 1.1 2000/12/01 21:51:09 jdolecek Exp $ */
|
||||
/* from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 Matthew R. Green.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#define ELFSIZE 32
|
||||
|
||||
#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/exec_elf.h>
|
||||
#include <sys/resourcevar.h>
|
||||
#include <sys/signal.h>
|
||||
#include <sys/signalvar.h>
|
||||
|
||||
#include <compat/netbsd32/netbsd32.h>
|
||||
#include <compat/netbsd32/netbsd32_exec.h>
|
||||
|
||||
#include <machine/frame.h>
|
||||
#include <machine/netbsd32_machdep.h>
|
||||
|
||||
int netbsd32_copyinargs __P((struct exec_package *, struct ps_strings *,
|
||||
void *, size_t, const void *, const void *));
|
||||
|
||||
extern int ELFNAME2(netbsd,signature) __P((struct proc *, struct exec_package *,
|
||||
Elf_Ehdr *));
|
||||
|
||||
int
|
||||
ELFNAME2(netbsd32,probe)(p, epp, eh, itp, pos)
|
||||
struct proc *p;
|
||||
struct exec_package *epp;
|
||||
void *eh;
|
||||
char *itp;
|
||||
vaddr_t *pos;
|
||||
{
|
||||
int error;
|
||||
size_t i;
|
||||
const char *bp;
|
||||
|
||||
if ((error = ELFNAME2(netbsd,signature)(p, epp, eh)) != 0)
|
||||
return error;
|
||||
|
||||
if (itp[0]) {
|
||||
if ((error = emul_find(p, NULL, epp->ep_esch->es_emul->e_path,
|
||||
itp, &bp, 0)) &&
|
||||
(error = emul_find(p, NULL, "", itp, &bp, 0)))
|
||||
return error;
|
||||
if ((error = copystr(bp, itp, MAXPATHLEN, &i)) != 0)
|
||||
return error;
|
||||
free((void *)bp, M_TEMP);
|
||||
}
|
||||
epp->ep_flags |= EXEC_32;
|
||||
*pos = ELFDEFNNAME(NO_ADDR);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* round up and down to page boundaries. */
|
||||
#define ELF_ROUND(a, b) (((a) + (b) - 1) & ~((b) - 1))
|
||||
#define ELF_TRUNC(a, b) ((a) & ~((b) - 1))
|
||||
|
||||
/*
|
||||
* Copy arguments onto the stack in the normal way, but add some
|
||||
* extra information in case of dynamic binding.
|
||||
*/
|
||||
void *
|
||||
netbsd32_elf32_copyargs(pack, arginfo, stack, argp)
|
||||
struct exec_package *pack;
|
||||
struct ps_strings *arginfo;
|
||||
void *stack;
|
||||
void *argp;
|
||||
{
|
||||
size_t len;
|
||||
AuxInfo ai[ELF_AUX_ENTRIES], *a;
|
||||
struct elf_args *ap;
|
||||
|
||||
stack = netbsd32_copyargs(pack, arginfo, stack, argp);
|
||||
if (!stack)
|
||||
return NULL;
|
||||
|
||||
a = ai;
|
||||
|
||||
/*
|
||||
* Push extra arguments on the stack needed by dynamically
|
||||
* linked binaries
|
||||
*/
|
||||
if ((ap = (struct elf_args *)pack->ep_emul_arg)) {
|
||||
|
||||
a->a_type = AT_PHDR;
|
||||
a->a_v = ap->arg_phaddr;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_PHENT;
|
||||
a->a_v = ap->arg_phentsize;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_PHNUM;
|
||||
a->a_v = ap->arg_phnum;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_PAGESZ;
|
||||
a->a_v = NBPG;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_BASE;
|
||||
a->a_v = ap->arg_interp;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_FLAGS;
|
||||
a->a_v = 0;
|
||||
a++;
|
||||
|
||||
a->a_type = AT_ENTRY;
|
||||
a->a_v = ap->arg_entry;
|
||||
a++;
|
||||
|
||||
free((char *)ap, M_TEMP);
|
||||
pack->ep_emul_arg = NULL;
|
||||
}
|
||||
|
||||
a->a_type = AT_NULL;
|
||||
a->a_v = 0;
|
||||
a++;
|
||||
|
||||
len = (a - ai) * sizeof(AuxInfo);
|
||||
if (copyout(ai, stack, len))
|
||||
return NULL;
|
||||
stack = (caddr_t)stack + len;
|
||||
|
||||
return stack;
|
||||
}
|
||||
Loading…
Reference in New Issue