Regenerate (with the correct #ifdef COMPAT_43 tests now)

This commit is contained in:
Peter Wemm 2005-10-26 22:21:03 +00:00
parent 767dfc44be
commit 946bca4fcd
4 changed files with 70 additions and 64 deletions

View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.56 2005/10/23 10:43:14 ps Exp
* created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.57 2005/10/26 22:19:51 peter Exp
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@ -56,16 +56,7 @@ struct freebsd32_recvfrom_args {
char from_l_[PADL_(u_int32_t)]; u_int32_t from; char from_r_[PADR_(u_int32_t)];
char fromlenaddr_l_[PADL_(u_int32_t)]; u_int32_t fromlenaddr; char fromlenaddr_r_[PADR_(u_int32_t)];
};
struct freebsd3_freebsd32_sigaction_args {
char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
char nsa_l_[PADL_(struct freebsd3_sigaction32 *)]; struct freebsd3_sigaction32 * nsa; char nsa_r_[PADR_(struct freebsd3_sigaction32 *)];
char osa_l_[PADL_(struct freebsd3_sigaction32 *)]; struct freebsd3_sigaction32 * osa; char osa_r_[PADR_(struct freebsd3_sigaction32 *)];
};
struct freebsd3_freebsd32_sigprocmask_args {
char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)];
char mask_l_[PADL_(osigset_t)]; osigset_t mask; char mask_r_[PADR_(osigset_t)];
};
struct freebsd3_freebsd32_sigpending_args {
struct ofreebsd32_sigpending_args {
register_t dummy;
};
struct freebsd32_sigaltstack_args {
@ -93,24 +84,6 @@ struct freebsd32_select_args {
char ex_l_[PADL_(fd_set *)]; fd_set * ex; char ex_r_[PADR_(fd_set *)];
char tv_l_[PADL_(struct timeval32 *)]; struct timeval32 * tv; char tv_r_[PADR_(struct timeval32 *)];
};
struct freebsd3_freebsd32_sigvec_args {
char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
char nsv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * nsv; char nsv_r_[PADR_(struct sigvec32 *)];
char osv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * osv; char osv_r_[PADR_(struct sigvec32 *)];
};
struct freebsd3_freebsd32_sigblock_args {
char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)];
};
struct freebsd3_freebsd32_sigsetmask_args {
char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)];
};
struct freebsd3_freebsd32_sigsuspend_args {
char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)];
};
struct freebsd3_freebsd32_sigstack_args {
char nss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * nss; char nss_r_[PADR_(struct sigstack32 *)];
char oss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * oss; char oss_r_[PADR_(struct sigstack32 *)];
};
struct freebsd32_gettimeofday_args {
char tp_l_[PADL_(struct timeval32 *)]; struct timeval32 * tp; char tp_r_[PADR_(struct timeval32 *)];
char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)];
@ -299,19 +272,11 @@ int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *);
int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *);
int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *);
int freebsd32_recvfrom(struct thread *, struct freebsd32_recvfrom_args *);
int freebsd3_freebsd32_sigaction(struct thread *, struct freebsd3_freebsd32_sigaction_args *);
int freebsd3_freebsd32_sigprocmask(struct thread *, struct freebsd3_freebsd32_sigprocmask_args *);
int freebsd3_freebsd32_sigpending(struct thread *, struct freebsd3_freebsd32_sigpending_args *);
int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *);
int freebsd32_execve(struct thread *, struct freebsd32_execve_args *);
int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *);
int freebsd32_getitimer(struct thread *, struct freebsd32_getitimer_args *);
int freebsd32_select(struct thread *, struct freebsd32_select_args *);
int freebsd3_freebsd32_sigvec(struct thread *, struct freebsd3_freebsd32_sigvec_args *);
int freebsd3_freebsd32_sigblock(struct thread *, struct freebsd3_freebsd32_sigblock_args *);
int freebsd3_freebsd32_sigsetmask(struct thread *, struct freebsd3_freebsd32_sigsetmask_args *);
int freebsd3_freebsd32_sigsuspend(struct thread *, struct freebsd3_freebsd32_sigsuspend_args *);
int freebsd3_freebsd32_sigstack(struct thread *, struct freebsd3_freebsd32_sigstack_args *);
int freebsd32_gettimeofday(struct thread *, struct freebsd32_gettimeofday_args *);
int freebsd32_getrusage(struct thread *, struct freebsd32_getrusage_args *);
int freebsd32_readv(struct thread *, struct freebsd32_readv_args *);
@ -349,6 +314,41 @@ int freebsd32_swapcontext(struct thread *, struct freebsd32_swapcontext_args *);
#ifdef COMPAT_43
struct ofreebsd32_sigaction_args {
char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
char nsa_l_[PADL_(struct osigaction32 *)]; struct osigaction32 * nsa; char nsa_r_[PADR_(struct osigaction32 *)];
char osa_l_[PADL_(struct osigaction32 *)]; struct osigaction32 * osa; char osa_r_[PADR_(struct osigaction32 *)];
};
struct ofreebsd32_sigprocmask_args {
char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)];
char mask_l_[PADL_(osigset_t)]; osigset_t mask; char mask_r_[PADR_(osigset_t)];
};
struct ofreebsd32_sigvec_args {
char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
char nsv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * nsv; char nsv_r_[PADR_(struct sigvec32 *)];
char osv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * osv; char osv_r_[PADR_(struct sigvec32 *)];
};
struct ofreebsd32_sigblock_args {
char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)];
};
struct ofreebsd32_sigsetmask_args {
char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)];
};
struct ofreebsd32_sigsuspend_args {
char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)];
};
struct ofreebsd32_sigstack_args {
char nss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * nss; char nss_r_[PADR_(struct sigstack32 *)];
char oss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * oss; char oss_r_[PADR_(struct sigstack32 *)];
};
int ofreebsd32_sigaction(struct thread *, struct ofreebsd32_sigaction_args *);
int ofreebsd32_sigprocmask(struct thread *, struct ofreebsd32_sigprocmask_args *);
int ofreebsd32_sigpending(struct thread *, struct ofreebsd32_sigpending_args *);
int ofreebsd32_sigvec(struct thread *, struct ofreebsd32_sigvec_args *);
int ofreebsd32_sigblock(struct thread *, struct ofreebsd32_sigblock_args *);
int ofreebsd32_sigsetmask(struct thread *, struct ofreebsd32_sigsetmask_args *);
int ofreebsd32_sigsuspend(struct thread *, struct ofreebsd32_sigsuspend_args *);
int ofreebsd32_sigstack(struct thread *, struct ofreebsd32_sigstack_args *);
#endif /* COMPAT_43 */

View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.56 2005/10/23 10:43:14 ps Exp
* created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.57 2005/10/26 22:19:51 peter Exp
*/
#define FREEBSD32_SYS_syscall 0
@ -50,13 +50,13 @@
#define FREEBSD32_SYS_getegid 43
#define FREEBSD32_SYS_profil 44
#define FREEBSD32_SYS_ktrace 45
#define FREEBSD32_SYS_freebsd3_freebsd32_sigaction 46
/* 46 is old freebsd32_sigaction */
#define FREEBSD32_SYS_getgid 47
#define FREEBSD32_SYS_freebsd3_freebsd32_sigprocmask 48
/* 48 is old freebsd32_sigprocmask */
#define FREEBSD32_SYS_getlogin 49
#define FREEBSD32_SYS_setlogin 50
#define FREEBSD32_SYS_acct 51
#define FREEBSD32_SYS_freebsd3_freebsd32_sigpending 52
/* 52 is old freebsd32_sigpending */
#define FREEBSD32_SYS_freebsd32_sigaltstack 53
#define FREEBSD32_SYS_ioctl 54
#define FREEBSD32_SYS_reboot 55
@ -110,11 +110,11 @@
#define FREEBSD32_SYS_setsockopt 105
#define FREEBSD32_SYS_listen 106
/* 107 is obsolete vtimes */
#define FREEBSD32_SYS_freebsd3_freebsd32_sigvec 108
#define FREEBSD32_SYS_freebsd3_freebsd32_sigblock 109
#define FREEBSD32_SYS_freebsd3_freebsd32_sigsetmask 110
#define FREEBSD32_SYS_freebsd3_freebsd32_sigsuspend 111
#define FREEBSD32_SYS_freebsd3_freebsd32_sigstack 112
/* 108 is old freebsd32_sigvec */
/* 109 is old freebsd32_sigblock */
/* 110 is old freebsd32_sigsetmask */
/* 111 is old freebsd32_sigsuspend */
/* 112 is old freebsd32_sigstack */
/* 113 is obsolete orecvmsg */
/* 114 is obsolete osendmsg */
/* 115 is obsolete vtrace */

View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.56 2005/10/23 10:43:14 ps Exp
* created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.57 2005/10/26 22:19:51 peter Exp
*/
const char *freebsd32_syscallnames[] = {
@ -53,13 +53,13 @@ const char *freebsd32_syscallnames[] = {
"getegid", /* 43 = getegid */
"profil", /* 44 = profil */
"ktrace", /* 45 = ktrace */
"freebsd3_freebsd32_sigaction", /* 46 = freebsd3_freebsd32_sigaction */
"old.freebsd32_sigaction", /* 46 = old freebsd32_sigaction */
"getgid", /* 47 = getgid */
"freebsd3_freebsd32_sigprocmask", /* 48 = freebsd3_freebsd32_sigprocmask */
"old.freebsd32_sigprocmask", /* 48 = old freebsd32_sigprocmask */
"getlogin", /* 49 = getlogin */
"setlogin", /* 50 = setlogin */
"acct", /* 51 = acct */
"freebsd3_freebsd32_sigpending", /* 52 = freebsd3_freebsd32_sigpending */
"old.freebsd32_sigpending", /* 52 = old freebsd32_sigpending */
"freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */
"ioctl", /* 54 = ioctl */
"reboot", /* 55 = reboot */
@ -115,11 +115,11 @@ const char *freebsd32_syscallnames[] = {
"setsockopt", /* 105 = setsockopt */
"listen", /* 106 = listen */
"obs_vtimes", /* 107 = obsolete vtimes */
"freebsd3_freebsd32_sigvec", /* 108 = freebsd3_freebsd32_sigvec */
"freebsd3_freebsd32_sigblock", /* 109 = freebsd3_freebsd32_sigblock */
"freebsd3_freebsd32_sigsetmask", /* 110 = freebsd3_freebsd32_sigsetmask */
"freebsd3_freebsd32_sigsuspend", /* 111 = freebsd3_freebsd32_sigsuspend */
"freebsd3_freebsd32_sigstack", /* 112 = freebsd3_freebsd32_sigstack */
"old.freebsd32_sigvec", /* 108 = old freebsd32_sigvec */
"old.freebsd32_sigblock", /* 109 = old freebsd32_sigblock */
"old.freebsd32_sigsetmask", /* 110 = old freebsd32_sigsetmask */
"old.freebsd32_sigsuspend", /* 111 = old freebsd32_sigsuspend */
"old.freebsd32_sigstack", /* 112 = old freebsd32_sigstack */
"obs_orecvmsg", /* 113 = obsolete orecvmsg */
"obs_osendmsg", /* 114 = obsolete osendmsg */
"obs_vtrace", /* 115 = obsolete vtrace */

View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.56 2005/10/23 10:43:14 ps Exp
* created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.57 2005/10/26 22:19:51 peter Exp
*/
#include "opt_compat.h"
@ -18,6 +18,12 @@
#define AS(name) (sizeof(struct name) / sizeof(register_t))
#ifdef COMPAT_43
#define compat(n, name) n, (sy_call_t *)__CONCAT(o,name)
#else
#define compat(n, name) 0, (sy_call_t *)nosys
#endif
#ifdef COMPAT_FREEBSD4
#define compat4(n, name) n, (sy_call_t *)__CONCAT(freebsd4_,name)
#else
@ -72,13 +78,13 @@ struct sysent freebsd32_sysent[] = {
{ SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_NULL }, /* 43 = getegid */
{ SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_NULL }, /* 44 = profil */
{ SYF_MPSAFE | AS(ktrace_args), (sy_call_t *)ktrace, AUE_NULL }, /* 45 = ktrace */
{ SYF_MPSAFE | AS(freebsd3_freebsd32_sigaction_args), (sy_call_t *)freebsd3_freebsd32_sigaction, AUE_NULL }, /* 46 = freebsd3_freebsd32_sigaction */
{ compat(SYF_MPSAFE | AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_NULL }, /* 46 = old freebsd32_sigaction */
{ SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */
{ SYF_MPSAFE | AS(freebsd3_freebsd32_sigprocmask_args), (sy_call_t *)freebsd3_freebsd32_sigprocmask, AUE_NULL }, /* 48 = freebsd3_freebsd32_sigprocmask */
{ compat(SYF_MPSAFE | AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_NULL }, /* 48 = old freebsd32_sigprocmask */
{ SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin, AUE_NULL }, /* 49 = getlogin */
{ SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin, AUE_NULL }, /* 50 = setlogin */
{ SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */
{ SYF_MPSAFE | 0, (sy_call_t *)freebsd3_freebsd32_sigpending, AUE_NULL }, /* 52 = freebsd3_freebsd32_sigpending */
{ compat(SYF_MPSAFE | 0,freebsd32_sigpending), AUE_NULL }, /* 52 = old freebsd32_sigpending */
{ SYF_MPSAFE | AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_NULL }, /* 53 = freebsd32_sigaltstack */
{ SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl, AUE_NULL }, /* 54 = ioctl */
{ SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot, AUE_NULL }, /* 55 = reboot */
@ -134,11 +140,11 @@ struct sysent freebsd32_sysent[] = {
{ SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */
{ SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = obsolete vtimes */
{ SYF_MPSAFE | AS(freebsd3_freebsd32_sigvec_args), (sy_call_t *)freebsd3_freebsd32_sigvec, AUE_NULL }, /* 108 = freebsd3_freebsd32_sigvec */
{ SYF_MPSAFE | AS(freebsd3_freebsd32_sigblock_args), (sy_call_t *)freebsd3_freebsd32_sigblock, AUE_NULL }, /* 109 = freebsd3_freebsd32_sigblock */
{ SYF_MPSAFE | AS(freebsd3_freebsd32_sigsetmask_args), (sy_call_t *)freebsd3_freebsd32_sigsetmask, AUE_NULL }, /* 110 = freebsd3_freebsd32_sigsetmask */
{ SYF_MPSAFE | AS(freebsd3_freebsd32_sigsuspend_args), (sy_call_t *)freebsd3_freebsd32_sigsuspend, AUE_NULL }, /* 111 = freebsd3_freebsd32_sigsuspend */
{ SYF_MPSAFE | AS(freebsd3_freebsd32_sigstack_args), (sy_call_t *)freebsd3_freebsd32_sigstack, AUE_NULL }, /* 112 = freebsd3_freebsd32_sigstack */
{ compat(SYF_MPSAFE | AS(ofreebsd32_sigvec_args),freebsd32_sigvec), AUE_NULL }, /* 108 = old freebsd32_sigvec */
{ compat(SYF_MPSAFE | AS(ofreebsd32_sigblock_args),freebsd32_sigblock), AUE_NULL }, /* 109 = old freebsd32_sigblock */
{ compat(SYF_MPSAFE | AS(ofreebsd32_sigsetmask_args),freebsd32_sigsetmask), AUE_NULL }, /* 110 = old freebsd32_sigsetmask */
{ compat(SYF_MPSAFE | AS(ofreebsd32_sigsuspend_args),freebsd32_sigsuspend), AUE_NULL }, /* 111 = old freebsd32_sigsuspend */
{ compat(SYF_MPSAFE | AS(ofreebsd32_sigstack_args),freebsd32_sigstack), AUE_NULL }, /* 112 = old freebsd32_sigstack */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = obsolete orecvmsg */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 114 = obsolete osendmsg */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = obsolete vtrace */