Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prelim svr4 stuff from <christos@deshaw.com>

Browse Source
This commit is contained in:
deraadt 1994-05-22 10:17:26 +00:00
parent a0ca154be4
commit 4e1ceb4238
2 changed files with 69 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
sys/arch/i386/i386/machdep.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.106 1994/05/19 06:33:49 mycroft Exp $
* $Id: machdep.c,v 1.107 1994/05/22 10:17:26 deraadt Exp $
*/
#include <sys/param.h>
@ -1188,22 +1188,13 @@ _remque(elem)
elem->q_prev = 0;
}
/*
* cpu_exec_aout_makecmds():
* cpu-dependent a.out format hook for execve().
*
* Determine of the given exec package refers to something which we
* understand and, if so, set up the vmcmds for it.
*
* On the i386, old (386bsd) ZMAGIC binaries and BSDI QMAGIC binaries
* if COMPAT_NOMID is given as a kernel option.
*/
int
cpu_exec_aout_makecmds(p, epp)
#ifdef COMPAT_NOMID
static int
exec_nomid(p, epp)
struct proc *p;
struct exec_package *epp;
{
#ifdef COMPAT_NOMID
int error;
u_long midmag, magic;
u_short mid;
@ -1243,9 +1234,41 @@ cpu_exec_aout_makecmds(p, epp)
}
return error;
#else /* ! COMPAT_NOMID */
return ENOEXEC;
}
#endif
/*
* cpu_exec_aout_makecmds():
* cpu-dependent a.out format hook for execve().
*
* Determine of the given exec package refers to something which we
* understand and, if so, set up the vmcmds for it.
*
* On the i386, old (386bsd) ZMAGIC binaries and BSDI QMAGIC binaries
* if COMPAT_NOMID is given as a kernel option.
*/
int
cpu_exec_aout_makecmds(p, epp)
struct proc *p;
struct exec_package *epp;
{
int error = ENOEXEC;
#ifdef COMPAT_SVR4
extern int svr4_exec_elf_makecmds __P((struct proc *,
struct exec_package *));
#endif /* ! COMPAT_SVR4 */
#ifdef COMPAT_NOMID
if ((error = exec_nomid(p, epp)) == 0)
return error;
#endif /* ! COMPAT_NOMID */
#ifdef COMPAT_SVR4
if ((error = svr4_exec_elf_makecmds(p, epp)) == 0)
return error;
#endif /* ! COMPAT_SVR4 */
return error;
}
#ifdef COMPAT_NOMID

36
sys/arch/i386/i386/trap.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
* $Id: trap.c,v 1.43 1994/05/21 04:00:37 cgd Exp $
* $Id: trap.c,v 1.44 1994/05/22 10:17:31 deraadt Exp $
*/
/*
@ -450,8 +450,12 @@ syscall(frame)
int error, opc;
u_int argsize;
int args[8], rval[2];
int code;
int code, nsys;
u_quad_t sticks;
#ifdef COMPAT_SVR4
extern int nsvr4_sysent;
extern struct sysent svr4_sysent[];
#endif
cnt.v_syscall++;
if (ISPL(frame.tf_cs) != SEL_UPL)
@ -462,6 +466,23 @@ syscall(frame)
opc = frame.tf_eip;
code = frame.tf_eax;
params = (caddr_t)frame.tf_esp + sizeof(int);
switch (p->p_emul) {
case EMUL_NETBSD:
nsys = nsysent;
callp = sysent;
break;
#ifdef COMPAT_SVR4
case EMUL_IBCS2:
nsys = nsvr4_sysent;
callp = svr4_sysent;
#ifdef DEBUG_SVR4
printf("svr4_syscall(%d)\n", code);
#endif
break;
#endif
}
switch (code) {
case SYS_syscall:
code = fuword(params);
@ -469,7 +490,10 @@ syscall(frame)
break;
case SYS___syscall:
code = fuword(params + _QUAD_LOWWORD * sizeof(int));
if (p->p_emul != EMUL_NETBSD)
code = 0;
else
code = fuword(params + _QUAD_LOWWORD * sizeof(int));
params += sizeof(quad_t);
break;
@ -477,10 +501,10 @@ syscall(frame)
/* do nothing by default */
break;
}
if (code < 0 || code >= nsysent)
callp = &sysent[0]; /* illegal */
if (code < 0 || code >= nsys)
callp = &callp[0]; /* illegal */
else
callp = &sysent[code];
callp = &callp[code];
argsize = callp->sy_narg * sizeof(int);
if (argsize && (error = copyin(params, (caddr_t)args, argsize))) {
#ifdef SYSCALL_DEBUG