From c6151e30b1f342db038baea021193c846e849b34 Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 19 Sep 2013 18:56:00 +0000 Subject: [PATCH] Regen. Approved by: re (delphij) --- sys/compat/freebsd32/freebsd32_proto.h | 39 +++++++- sys/compat/freebsd32/freebsd32_syscall.h | 6 +- sys/compat/freebsd32/freebsd32_syscalls.c | 7 +- sys/compat/freebsd32/freebsd32_sysent.c | 7 +- .../freebsd32/freebsd32_systrace_args.c | 89 +++++++++++++++++++ sys/kern/init_sysent.c | 3 +- sys/kern/syscalls.c | 3 +- sys/kern/systrace_args.c | 34 +++++++ sys/sys/syscall.h | 5 +- sys/sys/syscall.mk | 5 +- sys/sys/sysproto.h | 10 ++- 11 files changed, 196 insertions(+), 12 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h index 775227b981a..fd319d8e6cb 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 255657 2013-09-17 20:48:19Z jilles + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 255708 2013-09-19 18:53:42Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -670,6 +670,24 @@ struct freebsd32_cap_ioctls_get_args { struct freebsd32_aio_mlock_args { char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; }; +#ifdef PAD64_REQUIRED +struct freebsd32_procctl_args { + char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)]; + char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)]; + char com_l_[PADL_(int)]; int com; char com_r_[PADR_(int)]; + char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; +}; +#else +struct freebsd32_procctl_args { + char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)]; + char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)]; + char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)]; + char com_l_[PADL_(int)]; int com; char com_r_[PADR_(int)]; + char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; +}; +#endif #if !defined(PAD64_REQUIRED) && (defined(__powerpc__) || defined(__mips__)) #define PAD64_REQUIRED #endif @@ -797,6 +815,11 @@ int freebsd32_wait6(struct thread *, struct freebsd32_wait6_args *); int freebsd32_cap_ioctls_limit(struct thread *, struct freebsd32_cap_ioctls_limit_args *); int freebsd32_cap_ioctls_get(struct thread *, struct freebsd32_cap_ioctls_get_args *); int freebsd32_aio_mlock(struct thread *, struct freebsd32_aio_mlock_args *); +#ifdef PAD64_REQUIRED +int freebsd32_procctl(struct thread *, struct freebsd32_procctl_args *); +#else +int freebsd32_procctl(struct thread *, struct freebsd32_procctl_args *); +#endif #ifdef COMPAT_43 @@ -868,6 +891,9 @@ struct ofreebsd32_getdirentries_args { #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int ofreebsd32_lseek(struct thread *, struct ofreebsd32_lseek_args *); int ofreebsd32_stat(struct thread *, struct ofreebsd32_stat_args *); int ofreebsd32_lstat(struct thread *, struct ofreebsd32_lstat_args *); @@ -936,6 +962,9 @@ struct freebsd4_freebsd32_sigreturn_args { #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int freebsd4_freebsd32_getfsstat(struct thread *, struct freebsd4_freebsd32_getfsstat_args *); int freebsd4_freebsd32_statfs(struct thread *, struct freebsd4_freebsd32_statfs_args *); int freebsd4_freebsd32_fstatfs(struct thread *, struct freebsd4_freebsd32_fstatfs_args *); @@ -1006,6 +1035,9 @@ struct freebsd6_freebsd32_ftruncate_args { #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int freebsd6_freebsd32_pread(struct thread *, struct freebsd6_freebsd32_pread_args *); int freebsd6_freebsd32_pwrite(struct thread *, struct freebsd6_freebsd32_pwrite_args *); int freebsd6_freebsd32_mmap(struct thread *, struct freebsd6_freebsd32_mmap_args *); @@ -1046,6 +1078,9 @@ struct freebsd7_freebsd32_shmctl_args { #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int freebsd7_freebsd32_semctl(struct thread *, struct freebsd7_freebsd32_semctl_args *); int freebsd7_freebsd32_msgctl(struct thread *, struct freebsd7_freebsd32_msgctl_args *); int freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_args *); @@ -1198,6 +1233,8 @@ int freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_ #define FREEBSD32_SYS_AUE_freebsd32_cap_ioctls_limit AUE_CAP_IOCTLS_LIMIT #define FREEBSD32_SYS_AUE_freebsd32_cap_ioctls_get AUE_CAP_IOCTLS_GET #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 #undef PAD_ #undef PADL_ diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 3728b2e2b20..999e7572280 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 255657 2013-09-17 20:48:19Z jilles + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 255708 2013-09-19 18:53:42Z jhb */ #define FREEBSD32_SYS_syscall 0 @@ -452,4 +452,6 @@ #define FREEBSD32_SYS_accept4 541 #define FREEBSD32_SYS_pipe2 542 #define FREEBSD32_SYS_freebsd32_aio_mlock 543 -#define FREEBSD32_SYS_MAXSYSCALL 544 +#define FREEBSD32_SYS_freebsd32_procctl 544 +#define FREEBSD32_SYS_freebsd32_procctl 544 +#define FREEBSD32_SYS_MAXSYSCALL 545 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 5ebef41aa35..e2b5d2a2925 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 255657 2013-09-17 20:48:19Z jilles + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 255708 2013-09-19 18:53:42Z jhb */ const char *freebsd32_syscallnames[] = { @@ -573,4 +573,9 @@ const char *freebsd32_syscallnames[] = { "accept4", /* 541 = accept4 */ "pipe2", /* 542 = pipe2 */ "freebsd32_aio_mlock", /* 543 = freebsd32_aio_mlock */ +#ifdef PAD64_REQUIRED + "freebsd32_procctl", /* 544 = freebsd32_procctl */ +#else + "freebsd32_procctl", /* 544 = freebsd32_procctl */ +#endif }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 1324b21d376..c4512dd93ab 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 255657 2013-09-17 20:48:19Z jilles + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 255708 2013-09-19 18:53:42Z jhb */ #include "opt_compat.h" @@ -610,4 +610,9 @@ struct sysent freebsd32_sysent[] = { { 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 */ { AS(freebsd32_aio_mlock_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 543 = freebsd32_aio_mlock */ +#ifdef PAD64_REQUIRED + { AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = freebsd32_procctl */ +#else + { AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = freebsd32_procctl */ +#endif }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 0a6731072f5..a03eac3d692 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3287,6 +3287,32 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } +#ifdef PAD64_REQUIRED + /* freebsd32_procctl */ + case 544: { + struct freebsd32_procctl_args *p = params; + iarg[0] = p->idtype; /* int */ + iarg[1] = p->pad; /* int */ + uarg[2] = p->id1; /* uint32_t */ + uarg[3] = p->id2; /* uint32_t */ + iarg[4] = p->com; /* int */ + uarg[5] = (intptr_t) p->data; /* void * */ + *n_args = 6; + break; + } +#else + /* freebsd32_procctl */ + case 544: { + struct freebsd32_procctl_args *p = params; + iarg[0] = p->idtype; /* int */ + uarg[1] = p->id1; /* uint32_t */ + uarg[2] = p->id2; /* uint32_t */ + iarg[3] = p->com; /* int */ + uarg[4] = (intptr_t) p->data; /* void * */ + *n_args = 5; + break; + } +#endif default: *n_args = 0; break; @@ -8802,6 +8828,56 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; +#ifdef PAD64_REQUIRED + /* freebsd32_procctl */ + case 544: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "uint32_t"; + break; + case 3: + p = "uint32_t"; + break; + case 4: + p = "int"; + break; + case 5: + p = "void *"; + break; + default: + break; + }; + break; +#else + /* freebsd32_procctl */ + case 544: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "uint32_t"; + break; + case 2: + p = "uint32_t"; + break; + case 3: + p = "int"; + break; + case 4: + p = "void *"; + break; + default: + break; + }; + break; +#endif default: break; }; @@ -10672,6 +10748,19 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; +#ifdef PAD64_REQUIRED + /* freebsd32_procctl */ + case 544: + if (ndx == 0 || ndx == 1) + p = "int"; + break; +#else + /* freebsd32_procctl */ + case 544: + if (ndx == 0 || ndx == 1) + p = "int"; + break; +#endif default: break; }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 261b659cfcb..14292e72b2d 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 255490 2013-09-12 17:52:18Z jhb + * created from FreeBSD: head/sys/kern/syscalls.master 255708 2013-09-19 18:53:42Z jhb */ #include "opt_compat.h" @@ -578,4 +578,5 @@ struct sysent sysent[] = { { 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 */ { 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 */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index fb6194e3e73..f2bdea7a836 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 255490 2013-09-12 17:52:18Z jhb + * created from FreeBSD: head/sys/kern/syscalls.master 255708 2013-09-19 18:53:42Z jhb */ const char *syscallnames[] = { @@ -551,4 +551,5 @@ const char *syscallnames[] = { "accept4", /* 541 = accept4 */ "pipe2", /* 542 = pipe2 */ "aio_mlock", /* 543 = aio_mlock */ + "procctl", /* 544 = procctl */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index f3d4363be3a..c05d03be8e9 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3376,6 +3376,16 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } + /* procctl */ + case 544: { + struct procctl_args *p = params; + iarg[0] = p->idtype; /* idtype_t */ + iarg[1] = p->id; /* id_t */ + iarg[2] = p->com; /* int */ + uarg[3] = (intptr_t) p->data; /* void * */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -8995,6 +9005,25 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* procctl */ + case 544: + switch(ndx) { + case 0: + p = "idtype_t"; + break; + case 1: + p = "id_t"; + break; + case 2: + p = "int"; + break; + case 3: + p = "void *"; + break; + default: + break; + }; + break; default: break; }; @@ -10938,6 +10967,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* procctl */ + case 544: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index e7b9b1329d5..6068949b4cf 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 255490 2013-09-12 17:52:18Z jhb + * created from FreeBSD: head/sys/kern/syscalls.master 255708 2013-09-19 18:53:42Z jhb */ #define SYS_syscall 0 @@ -463,4 +463,5 @@ #define SYS_accept4 541 #define SYS_pipe2 542 #define SYS_aio_mlock 543 -#define SYS_MAXSYSCALL 544 +#define SYS_procctl 544 +#define SYS_MAXSYSCALL 545 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 73834607a8b..47a56575d41 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 255490 2013-09-12 17:52:18Z jhb +# created from FreeBSD: head/sys/kern/syscalls.master 255708 2013-09-19 18:53:42Z jhb MIASM = \ syscall.o \ exit.o \ @@ -410,4 +410,5 @@ MIASM = \ chflagsat.o \ accept4.o \ pipe2.o \ - aio_mlock.o + aio_mlock.o \ + procctl.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 897a2985686..2595c9d65ac 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 255490 2013-09-12 17:52:18Z jhb + * created from FreeBSD: head/sys/kern/syscalls.master 255708 2013-09-19 18:53:42Z jhb */ #ifndef _SYS_SYSPROTO_H_ @@ -1813,6 +1813,12 @@ struct pipe2_args { struct aio_mlock_args { char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)]; }; +struct procctl_args { + char idtype_l_[PADL_(idtype_t)]; idtype_t idtype; char idtype_r_[PADR_(idtype_t)]; + char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)]; + char com_l_[PADL_(int)]; int com; char com_r_[PADR_(int)]; + char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; +}; 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 *); @@ -2205,6 +2211,7 @@ int sys_chflagsat(struct thread *, struct chflagsat_args *); int sys_accept4(struct thread *, struct accept4_args *); 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 *); #ifdef COMPAT_43 @@ -2911,6 +2918,7 @@ int freebsd7_shmctl(struct thread *, struct freebsd7_shmctl_args *); #define SYS_AUE_accept4 AUE_ACCEPT #define SYS_AUE_pipe2 AUE_PIPE #define SYS_AUE_aio_mlock AUE_NULL +#define SYS_AUE_procctl AUE_NULL #undef PAD_ #undef PADL_ -- 2.45.0