This commit is contained in:
christos 2003-09-23 14:33:34 +00:00
parent cf3a45c8c1
commit 24915aa1a2
5 changed files with 67 additions and 31 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: aout_exec.c,v 1.16 2003/08/24 17:52:40 chs Exp $ */
/* $NetBSD: aout_exec.c,v 1.17 2003/09/23 14:33:34 christos Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -37,10 +37,11 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aout_exec.c,v 1.16 2003/08/24 17:52:40 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: aout_exec.c,v 1.17 2003/09/23 14:33:34 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
#include "opt_compat_netbsd.h"
#endif
#include <sys/param.h>
@ -55,7 +56,9 @@ extern struct sysent aout_sysent[];
#ifdef SYSCALL_DEBUG
extern const char * const aout_syscallnames[];
#endif
#ifdef COMPAT_16
extern char sigcode[], esigcode[];
#endif
#ifdef __HAVE_SYSCALL_INTERN
void syscall_intern __P((struct proc *));
#else
@ -81,8 +84,13 @@ const struct emul emul_netbsd_aout = {
#endif
sendsig,
trapsignal,
#ifdef COMPAT_16
sigcode,
esigcode,
#else
NULL,
NULL,
#endif
&emul_netbsd_aout_object,
setregs,
NULL,

View File

@ -1,10 +1,10 @@
/* $NetBSD: aout_syscall.h,v 1.23 2003/09/12 12:47:00 christos Exp $ */
/* $NetBSD: aout_syscall.h,v 1.24 2003/09/23 14:33:34 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
* created from NetBSD: syscalls.master,v 1.18 2003/09/12 12:46:47 christos Exp
* created from NetBSD: syscalls.master,v 1.19 2003/09/23 14:33:24 christos Exp
*/
/* syscall: "syscall" ret: "int" args: "int" "..." */
@ -770,9 +770,13 @@
/* syscall: "pwritev" ret: "ssize_t" args: "int" "const struct iovec *" "int" "int" "off_t" */
#define AOUT_SYS_pwritev 290
#ifdef COMPAT_16
/* syscall: "__sigaction14" ret: "int" args: "int" "const struct sigaction *" "struct sigaction *" */
#define AOUT_SYS___sigaction14 291
#else
/* 291 is excluded compat_16_sys___sigaction14 */
#endif
/* syscall: "__sigpending14" ret: "int" args: "sigset_t *" */
#define AOUT_SYS___sigpending14 292
@ -783,9 +787,13 @@
#define AOUT_SYS___sigsuspend14 294
#if defined(__HAVE_SIGINFO)
/* syscall: "COMPAT_16___sigreturn14" ret: "int" args: "struct sigcontext *" */
#define AOUT_SYS_COMPAT_16___sigreturn14 295
#ifdef COMPAT_16
/* syscall: "__sigreturn14" ret: "int" args: "struct sigcontext *" */
#define AOUT_SYS___sigreturn14 295
#else
/* 295 is excluded compat_16_sys___sigreturn14 */
#endif
#else
/* syscall: "__sigreturn14" ret: "int" args: "struct sigcontext *" */
#define AOUT_SYS___sigreturn14 295

View File

@ -1,10 +1,10 @@
/* $NetBSD: aout_syscallargs.h,v 1.24 2003/09/12 12:47:01 christos Exp $ */
/* $NetBSD: aout_syscallargs.h,v 1.25 2003/09/23 14:33:34 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
* created from NetBSD: syscalls.master,v 1.18 2003/09/12 12:46:47 christos Exp
* created from NetBSD: syscalls.master,v 1.19 2003/09/23 14:33:24 christos Exp
*/
#ifndef _AOUT_SYS__SYSCALLARGS_H_
@ -235,11 +235,13 @@ struct aout_sys___posix_chown_args {
#if defined(KTRACE) || !defined(_KERNEL)
#else
#endif
#ifdef COMPAT_16
#else
#endif
#if defined(__HAVE_SIGINFO)
struct COMPAT_16_sys___sigreturn14_args {
syscallarg(struct sigcontext *) sigcntxp;
};
#ifdef COMPAT_16
#else
#endif
#else
#endif
#if defined(SYSVSEM) || !defined(_KERNEL)
@ -535,12 +537,18 @@ int sys_fktrace(struct lwp *, void *, register_t *);
#endif
int sys_preadv(struct lwp *, void *, register_t *);
int sys_pwritev(struct lwp *, void *, register_t *);
int sys___sigaction14(struct lwp *, void *, register_t *);
#ifdef COMPAT_16
int compat_16_sys___sigaction14(struct lwp *, void *, register_t *);
#else
#endif
int sys___sigpending14(struct lwp *, void *, register_t *);
int sys___sigprocmask14(struct lwp *, void *, register_t *);
int sys___sigsuspend14(struct lwp *, void *, register_t *);
#if defined(__HAVE_SIGINFO)
int COMPAT_16_sys___sigreturn14(struct lwp *, void *, register_t *);
#ifdef COMPAT_16
int compat_16_sys___sigreturn14(struct lwp *, void *, register_t *);
#else
#endif
#else
int sys___sigreturn14(struct lwp *, void *, register_t *);
#endif

View File

@ -1,14 +1,14 @@
/* $NetBSD: aout_syscalls.c,v 1.24 2003/09/12 12:47:01 christos Exp $ */
/* $NetBSD: aout_syscalls.c,v 1.25 2003/09/23 14:33:34 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
* created from NetBSD: syscalls.master,v 1.18 2003/09/12 12:46:47 christos Exp
* created from NetBSD: syscalls.master,v 1.19 2003/09/23 14:33:24 christos Exp
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aout_syscalls.c,v 1.24 2003/09/12 12:47:01 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: aout_syscalls.c,v 1.25 2003/09/23 14:33:34 christos Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@ -407,12 +407,20 @@ const char *const aout_syscallnames[] = {
#endif
"preadv", /* 289 = preadv */
"pwritev", /* 290 = pwritev */
#ifdef COMPAT_16
"__sigaction14", /* 291 = __sigaction14 */
#else
"#291 (excluded compat_16_sys___sigaction14)", /* 291 = excluded compat_16_sys___sigaction14 */
#endif
"__sigpending14", /* 292 = __sigpending14 */
"__sigprocmask14", /* 293 = __sigprocmask14 */
"__sigsuspend14", /* 294 = __sigsuspend14 */
#if defined(__HAVE_SIGINFO)
"COMPAT_16___sigreturn14", /* 295 = COMPAT_16 __sigreturn14 */
#ifdef COMPAT_16
"__sigreturn14", /* 295 = __sigreturn14 */
#else
"#295 (excluded compat_16_sys___sigreturn14)", /* 295 = excluded compat_16_sys___sigreturn14 */
#endif
#else
"__sigreturn14", /* 295 = __sigreturn14 */
#endif

View File

@ -1,14 +1,14 @@
/* $NetBSD: aout_sysent.c,v 1.23 2003/09/12 12:47:01 christos Exp $ */
/* $NetBSD: aout_sysent.c,v 1.24 2003/09/23 14:33:34 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
* created from NetBSD: syscalls.master,v 1.18 2003/09/12 12:46:47 christos Exp
* created from NetBSD: syscalls.master,v 1.19 2003/09/23 14:33:24 christos Exp
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aout_sysent.c,v 1.23 2003/09/12 12:47:01 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: aout_sysent.c,v 1.24 2003/09/23 14:33:34 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@ -28,12 +28,6 @@ __KERNEL_RCSID(0, "$NetBSD: aout_sysent.c,v 1.23 2003/09/12 12:47:01 christos Ex
#include <sys/syscallargs.h>
#include <compat/aout/aout_syscallargs.h>
#ifdef COMPAT_16
#define COMPAT_16(func) __CONCAT(COMPAT_16_,func)
#else
#define COMPAT_16(func) sys_nosys
#endif
#define s(type) sizeof(type)
struct sysent aout_sysent[] = {
@ -741,8 +735,13 @@ struct sysent aout_sysent[] = {
sys_preadv }, /* 289 = preadv */
{ 5, s(struct sys_pwritev_args), 0,
sys_pwritev }, /* 290 = pwritev */
{ 3, s(struct sys___sigaction14_args), 0,
sys___sigaction14 }, /* 291 = __sigaction14 */
#ifdef COMPAT_16
{ 3, s(struct compat_16_sys___sigaction14_args), 0,
compat_16_sys___sigaction14 }, /* 291 = __sigaction14 */
#else
{ 0, 0, 0,
sys_nosys }, /* 291 = excluded compat_16_sys___sigaction14 */
#endif
{ 1, s(struct sys___sigpending14_args), 0,
sys___sigpending14 }, /* 292 = __sigpending14 */
{ 3, s(struct sys___sigprocmask14_args), 0,
@ -750,8 +749,13 @@ struct sysent aout_sysent[] = {
{ 1, s(struct sys___sigsuspend14_args), 0,
sys___sigsuspend14 }, /* 294 = __sigsuspend14 */
#if defined(__HAVE_SIGINFO)
{ 1, s(struct COMPAT_16_sys___sigreturn14_args), 0,
COMPAT_16(sys___sigreturn14) }, /* 295 = COMPAT_16 __sigreturn14 */
#ifdef COMPAT_16
{ 1, s(struct compat_16_sys___sigreturn14_args), 0,
compat_16_sys___sigreturn14 }, /* 295 = __sigreturn14 */
#else
{ 0, 0, 0,
sys_nosys }, /* 295 = excluded compat_16_sys___sigreturn14 */
#endif
#else
{ 1, s(struct sys___sigreturn14_args), 0,
sys___sigreturn14 }, /* 295 = __sigreturn14 */