Date: Fri, 7 Nov 2014 23:14:12 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r274258 - in user/dchagin/lemul/sys: compat/freebsd32 kern sys Message-ID: <201411072314.sA7NECRj017716@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Fri Nov 7 23:14:11 2014 New Revision: 274258 URL: https://svnweb.freebsd.org/changeset/base/274258 Log: Regen for r274257. Modified: user/dchagin/lemul/sys/compat/freebsd32/freebsd32_proto.h user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscall.h user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscalls.c user/dchagin/lemul/sys/compat/freebsd32/freebsd32_sysent.c user/dchagin/lemul/sys/compat/freebsd32/freebsd32_systrace_args.c user/dchagin/lemul/sys/kern/init_sysent.c user/dchagin/lemul/sys/kern/syscalls.c user/dchagin/lemul/sys/kern/systrace_args.c user/dchagin/lemul/sys/sys/syscall.h user/dchagin/lemul/sys/sys/syscall.mk user/dchagin/lemul/sys/sys/sysproto.h Modified: user/dchagin/lemul/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- user/dchagin/lemul/sys/compat/freebsd32/freebsd32_proto.h Fri Nov 7 23:12:07 2014 (r274257) +++ user/dchagin/lemul/sys/compat/freebsd32/freebsd32_proto.h Fri Nov 7 23:14:11 2014 (r274258) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 272823 2014-10-09 15:16:52Z marcel + * created from FreeBSD: user/dchagin/lemul/sys/compat/freebsd32/syscalls.master 274257 2014-11-07 23:12:07Z dchagin */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -687,6 +687,12 @@ struct freebsd32_procctl_args { char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; }; #endif +struct freebsd32_ppoll_args { + char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)]; + char nfds_l_[PADL_(u_int)]; u_int nfds; char nfds_r_[PADR_(u_int)]; + char ts_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * ts; char ts_r_[PADR_(const struct timespec32 *)]; + char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; +}; #if !defined(PAD64_REQUIRED) && (defined(__powerpc__) || defined(__mips__)) #define PAD64_REQUIRED #endif @@ -818,6 +824,7 @@ int freebsd32_procctl(struct thread *, s #else int freebsd32_procctl(struct thread *, struct freebsd32_procctl_args *); #endif +int freebsd32_ppoll(struct thread *, struct freebsd32_ppoll_args *); #ifdef COMPAT_43 @@ -1232,6 +1239,7 @@ int freebsd7_freebsd32_shmctl(struct thr #define FREEBSD32_SYS_AUE_freebsd32_aio_mlock AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_procctl AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_procctl AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_ppoll AUE_POLL #undef PAD_ #undef PADL_ Modified: user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscall.h Fri Nov 7 23:12:07 2014 (r274257) +++ user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscall.h Fri Nov 7 23:14:11 2014 (r274258) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 272823 2014-10-09 15:16:52Z marcel + * created from FreeBSD: user/dchagin/lemul/sys/compat/freebsd32/syscalls.master 274257 2014-11-07 23:12:07Z dchagin */ #define FREEBSD32_SYS_syscall 0 @@ -452,4 +452,5 @@ #define FREEBSD32_SYS_freebsd32_aio_mlock 543 #define FREEBSD32_SYS_freebsd32_procctl 544 #define FREEBSD32_SYS_freebsd32_procctl 544 -#define FREEBSD32_SYS_MAXSYSCALL 545 +#define FREEBSD32_SYS_freebsd32_ppoll 545 +#define FREEBSD32_SYS_MAXSYSCALL 546 Modified: user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscalls.c Fri Nov 7 23:12:07 2014 (r274257) +++ user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscalls.c Fri Nov 7 23:14:11 2014 (r274258) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 272823 2014-10-09 15:16:52Z marcel + * created from FreeBSD: user/dchagin/lemul/sys/compat/freebsd32/syscalls.master 274257 2014-11-07 23:12:07Z dchagin */ const char *freebsd32_syscallnames[] = { @@ -578,4 +578,5 @@ const char *freebsd32_syscallnames[] = { #else "freebsd32_procctl", /* 544 = freebsd32_procctl */ #endif + "freebsd32_ppoll", /* 545 = freebsd32_ppoll */ }; Modified: user/dchagin/lemul/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- user/dchagin/lemul/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 7 23:12:07 2014 (r274257) +++ user/dchagin/lemul/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 7 23:14:11 2014 (r274258) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 272823 2014-10-09 15:16:52Z marcel + * created from FreeBSD: user/dchagin/lemul/sys/compat/freebsd32/syscalls.master 274257 2014-11-07 23:12:07Z dchagin */ #include "opt_compat.h" @@ -615,4 +615,5 @@ struct sysent freebsd32_sysent[] = { #else { AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = freebsd32_procctl */ #endif + { AS(freebsd32_ppoll_args), (sy_call_t *)freebsd32_ppoll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 545 = freebsd32_ppoll */ }; Modified: user/dchagin/lemul/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- user/dchagin/lemul/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Nov 7 23:12:07 2014 (r274257) +++ user/dchagin/lemul/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Nov 7 23:14:11 2014 (r274258) @@ -3299,6 +3299,16 @@ systrace_args(int sysnum, void *params, break; } #endif + /* freebsd32_ppoll */ + case 545: { + struct freebsd32_ppoll_args *p = params; + uarg[0] = (intptr_t) p->fds; /* struct pollfd * */ + uarg[1] = p->nfds; /* u_int */ + uarg[2] = (intptr_t) p->ts; /* const struct timespec32 * */ + uarg[3] = (intptr_t) p->set; /* const sigset_t * */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -8844,6 +8854,25 @@ systrace_entry_setargdesc(int sysnum, in }; break; #endif + /* freebsd32_ppoll */ + case 545: + switch(ndx) { + case 0: + p = "struct pollfd *"; + break; + case 1: + p = "u_int"; + break; + case 2: + p = "const struct timespec32 *"; + break; + case 3: + p = "const sigset_t *"; + break; + default: + break; + }; + break; default: break; }; @@ -10717,6 +10746,11 @@ systrace_return_setargdesc(int sysnum, i p = "int"; break; #endif + /* freebsd32_ppoll */ + case 545: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; Modified: user/dchagin/lemul/sys/kern/init_sysent.c ============================================================================== --- user/dchagin/lemul/sys/kern/init_sysent.c Fri Nov 7 23:12:07 2014 (r274257) +++ user/dchagin/lemul/sys/kern/init_sysent.c Fri Nov 7 23:14:11 2014 (r274258) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 272823 2014-10-09 15:16:52Z marcel + * created from FreeBSD: user/dchagin/lemul/sys/kern/syscalls.master 274257 2014-11-07 23:12:07Z dchagin */ #include "opt_compat.h" @@ -579,4 +579,5 @@ struct sysent sysent[] = { { AS(pipe2_args), (sy_call_t *)sys_pipe2, AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 542 = pipe2 */ { AS(aio_mlock_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 543 = aio_mlock */ { AS(procctl_args), (sy_call_t *)sys_procctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = procctl */ + { AS(ppoll_args), (sy_call_t *)sys_ppoll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 545 = ppoll */ }; Modified: user/dchagin/lemul/sys/kern/syscalls.c ============================================================================== --- user/dchagin/lemul/sys/kern/syscalls.c Fri Nov 7 23:12:07 2014 (r274257) +++ user/dchagin/lemul/sys/kern/syscalls.c Fri Nov 7 23:14:11 2014 (r274258) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 272823 2014-10-09 15:16:52Z marcel + * created from FreeBSD: user/dchagin/lemul/sys/kern/syscalls.master 274257 2014-11-07 23:12:07Z dchagin */ const char *syscallnames[] = { @@ -552,4 +552,5 @@ const char *syscallnames[] = { "pipe2", /* 542 = pipe2 */ "aio_mlock", /* 543 = aio_mlock */ "procctl", /* 544 = procctl */ + "ppoll", /* 545 = ppoll */ }; Modified: user/dchagin/lemul/sys/kern/systrace_args.c ============================================================================== --- user/dchagin/lemul/sys/kern/systrace_args.c Fri Nov 7 23:12:07 2014 (r274257) +++ user/dchagin/lemul/sys/kern/systrace_args.c Fri Nov 7 23:14:11 2014 (r274258) @@ -3372,6 +3372,16 @@ systrace_args(int sysnum, void *params, *n_args = 4; break; } + /* ppoll */ + case 545: { + struct ppoll_args *p = params; + uarg[0] = (intptr_t) p->fds; /* struct pollfd * */ + uarg[1] = p->nfds; /* u_int */ + uarg[2] = (intptr_t) p->ts; /* const struct timespec * */ + uarg[3] = (intptr_t) p->set; /* const sigset_t * */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -8990,6 +9000,25 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* ppoll */ + case 545: + switch(ndx) { + case 0: + p = "struct pollfd *"; + break; + case 1: + p = "u_int"; + break; + case 2: + p = "const struct timespec *"; + break; + case 3: + p = "const sigset_t *"; + break; + default: + break; + }; + break; default: break; }; @@ -10928,6 +10957,11 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; + /* ppoll */ + case 545: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; Modified: user/dchagin/lemul/sys/sys/syscall.h ============================================================================== --- user/dchagin/lemul/sys/sys/syscall.h Fri Nov 7 23:12:07 2014 (r274257) +++ user/dchagin/lemul/sys/sys/syscall.h Fri Nov 7 23:14:11 2014 (r274258) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 272823 2014-10-09 15:16:52Z marcel + * created from FreeBSD: user/dchagin/lemul/sys/kern/syscalls.master 274257 2014-11-07 23:12:07Z dchagin */ #define SYS_syscall 0 @@ -462,4 +462,5 @@ #define SYS_pipe2 542 #define SYS_aio_mlock 543 #define SYS_procctl 544 -#define SYS_MAXSYSCALL 545 +#define SYS_ppoll 545 +#define SYS_MAXSYSCALL 546 Modified: user/dchagin/lemul/sys/sys/syscall.mk ============================================================================== --- user/dchagin/lemul/sys/sys/syscall.mk Fri Nov 7 23:12:07 2014 (r274257) +++ user/dchagin/lemul/sys/sys/syscall.mk Fri Nov 7 23:14:11 2014 (r274258) @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. # $FreeBSD$ -# created from FreeBSD: head/sys/kern/syscalls.master 272823 2014-10-09 15:16:52Z marcel +# created from FreeBSD: user/dchagin/lemul/sys/kern/syscalls.master 274257 2014-11-07 23:12:07Z dchagin MIASM = \ syscall.o \ exit.o \ @@ -409,4 +409,5 @@ MIASM = \ accept4.o \ pipe2.o \ aio_mlock.o \ - procctl.o + procctl.o \ + ppoll.o Modified: user/dchagin/lemul/sys/sys/sysproto.h ============================================================================== --- user/dchagin/lemul/sys/sys/sysproto.h Fri Nov 7 23:12:07 2014 (r274257) +++ user/dchagin/lemul/sys/sys/sysproto.h Fri Nov 7 23:14:11 2014 (r274258) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 272823 2014-10-09 15:16:52Z marcel + * created from FreeBSD: user/dchagin/lemul/sys/kern/syscalls.master 274257 2014-11-07 23:12:07Z dchagin */ #ifndef _SYS_SYSPROTO_H_ @@ -1813,6 +1813,12 @@ struct procctl_args { char com_l_[PADL_(int)]; int com; char com_r_[PADR_(int)]; char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; }; +struct ppoll_args { + char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)]; + char nfds_l_[PADL_(u_int)]; u_int nfds; char nfds_r_[PADR_(u_int)]; + char ts_l_[PADL_(const struct timespec *)]; const struct timespec * ts; char ts_r_[PADR_(const struct timespec *)]; + char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_sys_exit(struct thread *, struct sys_exit_args *); int sys_fork(struct thread *, struct fork_args *); @@ -2204,6 +2210,7 @@ int sys_accept4(struct thread *, struct int sys_pipe2(struct thread *, struct pipe2_args *); int sys_aio_mlock(struct thread *, struct aio_mlock_args *); int sys_procctl(struct thread *, struct procctl_args *); +int sys_ppoll(struct thread *, struct ppoll_args *); #ifdef COMPAT_43 @@ -2909,6 +2916,7 @@ int freebsd7_shmctl(struct thread *, str #define SYS_AUE_pipe2 AUE_PIPE #define SYS_AUE_aio_mlock AUE_NULL #define SYS_AUE_procctl AUE_NULL +#define SYS_AUE_ppoll AUE_POLL #undef PAD_ #undef PADL_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411072314.sA7NECRj017716>