From 49a5937b778f9c306f795bab7e276888c7c3dfb9 Mon Sep 17 00:00:00 2001 From: jilles Date: Wed, 1 May 2013 22:45:04 +0000 Subject: Regenerate files for pipe2(). --- sys/compat/freebsd32/freebsd32_proto.h | 2 +- sys/compat/freebsd32/freebsd32_syscall.h | 5 +++-- sys/compat/freebsd32/freebsd32_syscalls.c | 3 ++- sys/compat/freebsd32/freebsd32_sysent.c | 3 ++- sys/compat/freebsd32/freebsd32_systrace_args.c | 26 ++++++++++++++++++++++++++ sys/kern/init_sysent.c | 3 ++- sys/kern/syscalls.c | 3 ++- sys/kern/systrace_args.c | 26 ++++++++++++++++++++++++++ sys/sys/syscall.h | 5 +++-- sys/sys/syscall.mk | 5 +++-- sys/sys/sysproto.h | 8 +++++++- 11 files changed, 77 insertions(+), 12 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h index 3785d04..6960173 100644 --- a/sys/compat/freebsd32/freebsd32_proto.h +++ b/sys/compat/freebsd32/freebsd32_proto.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250154 2013-05-01 20:10:21Z jilles + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250159 2013-05-01 22:42:42Z jilles */ #ifndef _FREEBSD32_SYSPROTO_H_ diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 94dd1fc..fe20ca6 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250154 2013-05-01 20:10:21Z jilles + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250159 2013-05-01 22:42:42Z jilles */ #define FREEBSD32_SYS_syscall 0 @@ -439,4 +439,5 @@ #define FREEBSD32_SYS_connectat 539 #define FREEBSD32_SYS_chflagsat 540 #define FREEBSD32_SYS_accept4 541 -#define FREEBSD32_SYS_MAXSYSCALL 542 +#define FREEBSD32_SYS_pipe2 542 +#define FREEBSD32_SYS_MAXSYSCALL 543 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 0f3787c..1363c16 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250154 2013-05-01 20:10:21Z jilles + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250159 2013-05-01 22:42:42Z jilles */ const char *freebsd32_syscallnames[] = { @@ -565,4 +565,5 @@ const char *freebsd32_syscallnames[] = { "connectat", /* 539 = connectat */ "chflagsat", /* 540 = chflagsat */ "accept4", /* 541 = accept4 */ + "pipe2", /* 542 = pipe2 */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index d9b641f..13b5de4 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250154 2013-05-01 20:10:21Z jilles + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250159 2013-05-01 22:42:42Z jilles */ #include "opt_compat.h" @@ -602,4 +602,5 @@ struct sysent freebsd32_sysent[] = { { AS(connectat_args), (sy_call_t *)sys_connectat, AUE_CONNECTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 539 = connectat */ { AS(chflagsat_args), (sy_call_t *)sys_chflagsat, AUE_CHFLAGSAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 540 = chflagsat */ { AS(accept4_args), (sy_call_t *)sys_accept4, AUE_ACCEPT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 541 = accept4 */ + { AS(pipe2_args), (sy_call_t *)sys_pipe2, AUE_PIPE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 542 = pipe2 */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index c60afe4..54e90c9 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3170,6 +3170,14 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 4; break; } + /* pipe2 */ + case 542: { + struct pipe2_args *p = params; + uarg[0] = (intptr_t) p->fildes; /* int * */ + iarg[1] = p->flags; /* int */ + *n_args = 2; + break; + } default: *n_args = 0; break; @@ -8472,6 +8480,19 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* pipe2 */ + case 542: + switch(ndx) { + case 0: + p = "int *"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -10279,6 +10300,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* pipe2 */ + case 542: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 285ff85..abb93a4 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 250154 2013-05-01 20:10:21Z jilles + * created from FreeBSD: head/sys/kern/syscalls.master 250159 2013-05-01 22:42:42Z jilles */ #include "opt_compat.h" @@ -576,4 +576,5 @@ struct sysent sysent[] = { { AS(connectat_args), (sy_call_t *)sys_connectat, AUE_CONNECTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 539 = connectat */ { AS(chflagsat_args), (sy_call_t *)sys_chflagsat, AUE_CHFLAGSAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 540 = chflagsat */ { AS(accept4_args), (sy_call_t *)sys_accept4, AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 541 = accept4 */ + { AS(pipe2_args), (sy_call_t *)sys_pipe2, AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 542 = pipe2 */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index c2a3dd4..acf0144 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 250154 2013-05-01 20:10:21Z jilles + * created from FreeBSD: head/sys/kern/syscalls.master 250159 2013-05-01 22:42:42Z jilles */ const char *syscallnames[] = { @@ -549,4 +549,5 @@ const char *syscallnames[] = { "connectat", /* 539 = connectat */ "chflagsat", /* 540 = chflagsat */ "accept4", /* 541 = accept4 */ + "pipe2", /* 542 = pipe2 */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 4f4ffda..cbace7a 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3368,6 +3368,14 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 4; break; } + /* pipe2 */ + case 542: { + struct pipe2_args *p = params; + uarg[0] = (intptr_t) p->fildes; /* int * */ + iarg[1] = p->flags; /* int */ + *n_args = 2; + break; + } default: *n_args = 0; break; @@ -8974,6 +8982,19 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* pipe2 */ + case 542: + switch(ndx) { + case 0: + p = "int *"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -10912,6 +10933,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* pipe2 */ + case 542: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 8db096f..b234558 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 250154 2013-05-01 20:10:21Z jilles + * created from FreeBSD: head/sys/kern/syscalls.master 250159 2013-05-01 22:42:42Z jilles */ #define SYS_syscall 0 @@ -461,4 +461,5 @@ #define SYS_connectat 539 #define SYS_chflagsat 540 #define SYS_accept4 541 -#define SYS_MAXSYSCALL 542 +#define SYS_pipe2 542 +#define SYS_MAXSYSCALL 543 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index fb71fe2..9f7b194 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -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 250154 2013-05-01 20:10:21Z jilles +# created from FreeBSD: head/sys/kern/syscalls.master 250159 2013-05-01 22:42:42Z jilles MIASM = \ syscall.o \ exit.o \ @@ -409,4 +409,5 @@ MIASM = \ bindat.o \ connectat.o \ chflagsat.o \ - accept4.o + accept4.o \ + pipe2.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 9f8620a..4b1ac24 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 250154 2013-05-01 20:10:21Z jilles + * created from FreeBSD: head/sys/kern/syscalls.master 250159 2013-05-01 22:42:42Z jilles */ #ifndef _SYS_SYSPROTO_H_ @@ -1808,6 +1808,10 @@ struct accept4_args { char anamelen_l_[PADL_(__socklen_t *__restrict)]; __socklen_t *__restrict anamelen; char anamelen_r_[PADR_(__socklen_t *__restrict)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; +struct pipe2_args { + char fildes_l_[PADL_(int *)]; int * fildes; char fildes_r_[PADR_(int *)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; 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 *); @@ -2199,6 +2203,7 @@ int sys_bindat(struct thread *, struct bindat_args *); int sys_connectat(struct thread *, struct connectat_args *); int sys_chflagsat(struct thread *, struct chflagsat_args *); int sys_accept4(struct thread *, struct accept4_args *); +int sys_pipe2(struct thread *, struct pipe2_args *); #ifdef COMPAT_43 @@ -2904,6 +2909,7 @@ int freebsd7_shmctl(struct thread *, struct freebsd7_shmctl_args *); #define SYS_AUE_connectat AUE_CONNECTAT #define SYS_AUE_chflagsat AUE_CHFLAGSAT #define SYS_AUE_accept4 AUE_ACCEPT +#define SYS_AUE_pipe2 AUE_PIPE #undef PAD_ #undef PADL_ -- cgit v1.1