From c177f59bbf98d9966aa3cbf268a5aaae91b2e6fb Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 14 May 2003 04:11:25 +0000 Subject: Regen Approved by: re (amd64 blanket) --- sys/amd64/ia32/ia32_proto.h | 35 +++++++++++++++++++++++++++++------ sys/amd64/ia32/ia32_syscall.h | 10 ++++++---- sys/amd64/ia32/ia32_sysent.c | 16 ++++++++-------- 3 files changed, 43 insertions(+), 18 deletions(-) (limited to 'sys/amd64/ia32') diff --git a/sys/amd64/ia32/ia32_proto.h b/sys/amd64/ia32/ia32_proto.h index 3dde3a2..5252e88 100644 --- a/sys/amd64/ia32/ia32_proto.h +++ b/sys/amd64/ia32/ia32_proto.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp + * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.22 2003/05/14 04:10:49 peter Exp */ #ifndef _IA32_SYSPROTO_H_ @@ -201,10 +201,13 @@ struct ia32_sysctl_args { char new_l_[PADL_(void *)]; void * new; char new_r_[PADR_(void *)]; char newlen_l_[PADL_(u_int32_t)]; u_int32_t newlen; char newlen_r_[PADR_(u_int32_t)]; }; -struct ia32_sigaction_args { - char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; - char act_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * act; char act_r_[PADR_(struct sigaction32 *)]; - char oact_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * oact; char oact_r_[PADR_(struct sigaction32 *)]; +struct ia32_kevent_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char changelist_l_[PADL_(const struct kevent *)]; const struct kevent * changelist; char changelist_r_[PADR_(const struct kevent *)]; + char nchanges_l_[PADL_(int)]; int nchanges; char nchanges_r_[PADR_(int)]; + char eventlist_l_[PADL_(struct kevent *)]; struct kevent * eventlist; char eventlist_r_[PADR_(struct kevent *)]; + char nevents_l_[PADL_(int)]; int nevents; char nevents_r_[PADR_(int)]; + char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)]; }; struct ia32_sendfile_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; @@ -216,6 +219,14 @@ struct ia32_sendfile_args { char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; +struct ia32_sigreturn_args { + char sigcntxp_l_[PADL_(const struct ia32_ucontext *)]; const struct ia32_ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct ia32_ucontext *)]; +}; +struct ia32_sigaction_args { + char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; + char act_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * act; char act_r_[PADR_(struct sigaction32 *)]; + char oact_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * oact; char oact_r_[PADR_(struct sigaction32 *)]; +}; int ia32_open(struct thread *, struct ia32_open_args *); int ia32_wait4(struct thread *, struct ia32_wait4_args *); int ia32_getfsstat(struct thread *, struct ia32_getfsstat_args *); @@ -247,8 +258,10 @@ int ia32_lseek(struct thread *, struct ia32_lseek_args *); int ia32_truncate(struct thread *, struct ia32_truncate_args *); int ia32_ftruncate(struct thread *, struct ia32_ftruncate_args *); int ia32_sysctl(struct thread *, struct ia32_sysctl_args *); -int ia32_sigaction(struct thread *, struct ia32_sigaction_args *); +int ia32_kevent(struct thread *, struct ia32_kevent_args *); int ia32_sendfile(struct thread *, struct ia32_sendfile_args *); +int ia32_sigreturn(struct thread *, struct ia32_sigreturn_args *); +int ia32_sigaction(struct thread *, struct ia32_sigaction_args *); #ifdef COMPAT_43 @@ -268,7 +281,17 @@ struct freebsd4_ia32_sendfile_args { char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; +struct freebsd4_ia32_sigaction_args { + char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; + char act_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * act; char act_r_[PADR_(struct sigaction32 *)]; + char oact_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * oact; char oact_r_[PADR_(struct sigaction32 *)]; +}; +struct freebsd4_ia32_sigreturn_args { + char sigcntxp_l_[PADL_(const struct __ucontext *)]; const struct __ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct __ucontext *)]; +}; int freebsd4_ia32_sendfile(struct thread *, struct freebsd4_ia32_sendfile_args *); +int freebsd4_ia32_sigaction(struct thread *, struct freebsd4_ia32_sigaction_args *); +int freebsd4_ia32_sigreturn(struct thread *, struct freebsd4_ia32_sigreturn_args *); #endif /* COMPAT_FREEBSD4 */ diff --git a/sys/amd64/ia32/ia32_syscall.h b/sys/amd64/ia32/ia32_syscall.h index 8047bd1..6699f41 100644 --- a/sys/amd64/ia32/ia32_syscall.h +++ b/sys/amd64/ia32/ia32_syscall.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp + * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.22 2003/05/14 04:10:49 peter Exp */ #define IA32_SYS_syscall 0 @@ -252,9 +252,9 @@ #define IA32_SYS_jail 338 #define IA32_SYS_sigprocmask 340 #define IA32_SYS_sigsuspend 341 -#define IA32_SYS_ia32_sigaction 342 + /* 342 is old ia32_sigaction */ #define IA32_SYS_sigpending 343 -#define IA32_SYS_sigreturn 344 + /* 344 is old ia32_sigreturn */ #define IA32_SYS___acl_get_file 347 #define IA32_SYS___acl_set_file 348 #define IA32_SYS___acl_get_fd 349 @@ -270,7 +270,7 @@ #define IA32_SYS_getresuid 360 #define IA32_SYS_getresgid 361 #define IA32_SYS_kqueue 362 -#define IA32_SYS_kevent 363 +#define IA32_SYS_ia32_kevent 363 #define IA32_SYS_extattr_set_fd 371 #define IA32_SYS_extattr_get_fd 372 #define IA32_SYS_extattr_delete_fd 373 @@ -286,6 +286,8 @@ #define IA32_SYS_lchflags 391 #define IA32_SYS_uuidgen 392 #define IA32_SYS_ia32_sendfile 393 +#define IA32_SYS_ia32_sigreturn 416 +#define IA32_SYS_ia32_sigaction 417 #define IA32_SYS_thr_create 430 #define IA32_SYS_thr_exit 431 #define IA32_SYS_thr_self 432 diff --git a/sys/amd64/ia32/ia32_sysent.c b/sys/amd64/ia32/ia32_sysent.c index c3d5e6f..4c3f6c7 100644 --- a/sys/amd64/ia32/ia32_sysent.c +++ b/sys/amd64/ia32/ia32_sysent.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp + * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.22 2003/05/14 04:10:49 peter Exp */ #include "opt_compat.h" @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include #define AS(name) (sizeof(struct name) / sizeof(register_t)) @@ -367,9 +367,9 @@ struct sysent ia32_sysent[] = { { 0, (sy_call_t *)nosys }, /* 339 = pioctl */ { SYF_MPSAFE | AS(sigprocmask_args), (sy_call_t *)sigprocmask }, /* 340 = sigprocmask */ { SYF_MPSAFE | AS(sigsuspend_args), (sy_call_t *)sigsuspend }, /* 341 = sigsuspend */ - { AS(ia32_sigaction_args), (sy_call_t *)ia32_sigaction }, /* 342 = ia32_sigaction */ + { compat4(AS(freebsd4_ia32_sigaction_args),ia32_sigaction) }, /* 342 = old ia32_sigaction */ { SYF_MPSAFE | AS(sigpending_args), (sy_call_t *)sigpending }, /* 343 = sigpending */ - { SYF_MPSAFE | AS(sigreturn_args), (sy_call_t *)sigreturn }, /* 344 = sigreturn */ + { compat4(SYF_MPSAFE | AS(freebsd4_ia32_sigreturn_args),ia32_sigreturn) }, /* 344 = old ia32_sigreturn */ { 0, (sy_call_t *)nosys }, /* 345 = sigtimedwait */ { 0, (sy_call_t *)nosys }, /* 346 = sigwaitinfo */ { SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file }, /* 347 = __acl_get_file */ @@ -388,7 +388,7 @@ struct sysent ia32_sysent[] = { { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid }, /* 360 = getresuid */ { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid }, /* 361 = getresgid */ { SYF_MPSAFE | 0, (sy_call_t *)kqueue }, /* 362 = kqueue */ - { SYF_MPSAFE | AS(kevent_args), (sy_call_t *)kevent }, /* 363 = kevent */ + { SYF_MPSAFE | AS(ia32_kevent_args), (sy_call_t *)ia32_kevent }, /* 363 = ia32_kevent */ { 0, (sy_call_t *)nosys }, /* 364 = __cap_get_proc */ { 0, (sy_call_t *)nosys }, /* 365 = __cap_set_proc */ { 0, (sy_call_t *)nosys }, /* 366 = __cap_get_fd */ @@ -441,8 +441,8 @@ struct sysent ia32_sysent[] = { { 0, (sy_call_t *)nosys }, /* 413 = extattr_get_link */ { 0, (sy_call_t *)nosys }, /* 414 = extattr_delete_link */ { 0, (sy_call_t *)nosys }, /* 415 = __mac_execve */ - { 0, (sy_call_t *)nosys }, /* 416 = newsigreturn */ - { 0, (sy_call_t *)nosys }, /* 417 = newsigaction */ + { SYF_MPSAFE | AS(ia32_sigreturn_args), (sy_call_t *)ia32_sigreturn }, /* 416 = ia32_sigreturn */ + { AS(ia32_sigaction_args), (sy_call_t *)ia32_sigaction }, /* 417 = ia32_sigaction */ { 0, (sy_call_t *)nosys }, /* 418 = __xstat */ { 0, (sy_call_t *)nosys }, /* 419 = __xfstat */ { 0, (sy_call_t *)nosys }, /* 420 = __xlstat */ -- cgit v1.1