From 93e56de0835a9cd0a98aa79bbbd7009f60120d59 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Wed, 7 Aug 2024 00:00:28 +0100 Subject: [PATCH] sysent: regen --- lib/libsys/_libsys.h | 12 ++-- sys/compat/freebsd32/freebsd32_proto.h | 24 +++---- .../freebsd32/freebsd32_systrace_args.c | 48 ++++++------- sys/compat/freebsd64/freebsd64_proto.h | 27 ------- sys/compat/freebsd64/freebsd64_syscall.h | 6 +- sys/compat/freebsd64/freebsd64_syscall.mk | 6 +- sys/compat/freebsd64/freebsd64_syscalls.c | 6 +- sys/compat/freebsd64/freebsd64_sysent.c | 6 +- .../freebsd64/freebsd64_systrace_args.c | 72 +++++++++---------- sys/kern/systrace_args.c | 48 ++++++------- sys/sys/sysargmap.h | 6 +- sys/sys/sysproto.h | 24 +++---- 12 files changed, 129 insertions(+), 156 deletions(-) diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h index ded4fed83528..04de1f17ed50 100644 --- a/lib/libsys/_libsys.h +++ b/lib/libsys/_libsys.h @@ -168,9 +168,9 @@ typedef int (__sys_lgetfh_t)(const char * __kerncap, struct fhandle * __kerncap) typedef int (__sys_getfh_t)(const char * __kerncap, struct fhandle * __kerncap); typedef int (__sys_sysarch_t)(int, char * __kerncap); typedef int (__sys_rtprio_t)(int, pid_t, struct rtprio * __kerncap); -typedef int (__sys_semsys_t)(int, intcap_t, intcap_t, intcap_t, intcap_t); -typedef int (__sys_msgsys_t)(int, intcap_t, intcap_t, intcap_t, intcap_t, intcap_t); -typedef int (__sys_shmsys_t)(int, intcap_t, intcap_t, intcap_t); +typedef int (__sys_semsys_t)(int, int, int, int, int); +typedef int (__sys_msgsys_t)(int, int, int, int, int, int); +typedef int (__sys_shmsys_t)(int, int, int, int); typedef int (__sys_setfib_t)(int); typedef int (__sys_ntp_adjtime_t)(struct timex * __kerncap); typedef int (__sys_setgid_t)(gid_t); @@ -572,9 +572,9 @@ int __sys_lgetfh(const char * __kerncap fname, struct fhandle * __kerncap fhp); int __sys_getfh(const char * __kerncap fname, struct fhandle * __kerncap fhp); int __sys_sysarch(int op, char * __kerncap parms); int __sys_rtprio(int function, pid_t pid, struct rtprio * __kerncap rtp); -int __sys_semsys(int which, intcap_t a2, intcap_t a3, intcap_t a4, intcap_t a5); -int __sys_msgsys(int which, intcap_t a2, intcap_t a3, intcap_t a4, intcap_t a5, intcap_t a6); -int __sys_shmsys(int which, intcap_t a2, intcap_t a3, intcap_t a4); +int __sys_semsys(int which, int a2, int a3, int a4, int a5); +int __sys_msgsys(int which, int a2, int a3, int a4, int a5, int a6); +int __sys_shmsys(int which, int a2, int a3, int a4); int __sys_setfib(int fibnum); int __sys_ntp_adjtime(struct timex * __kerncap tp); int __sys_setgid(gid_t gid); diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h index dc9df9553b87..74ecfb31cac9 100644 --- a/sys/compat/freebsd32/freebsd32_proto.h +++ b/sys/compat/freebsd32/freebsd32_proto.h @@ -134,24 +134,24 @@ struct freebsd32_sysarch_args { }; struct freebsd32_semsys_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)]; - char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)]; - char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)]; - char a5_l_[PADL_(intptr_t)]; intptr_t a5; char a5_r_[PADR_(intptr_t)]; + char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; + char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; + char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; + char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)]; }; struct freebsd32_msgsys_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)]; - char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)]; - char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)]; - char a5_l_[PADL_(intptr_t)]; intptr_t a5; char a5_r_[PADR_(intptr_t)]; - char a6_l_[PADL_(intptr_t)]; intptr_t a6; char a6_r_[PADR_(intptr_t)]; + char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; + char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; + char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; + char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)]; + char a6_l_[PADL_(int)]; int a6; char a6_r_[PADR_(int)]; }; struct freebsd32_shmsys_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)]; - char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)]; - char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)]; + char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; + char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; + char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; }; struct freebsd32_ntp_adjtime_args { char tp_l_[PADL_(struct timex32 *)]; struct timex32 * tp; char tp_r_[PADR_(struct timex32 *)]; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index d31755127581..83e48ff32129 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -827,10 +827,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 169: { struct freebsd32_semsys_args *p = params; iarg[a++] = p->which; /* int */ - uarg[a++] = (intptr_t)p->a2; /* intptr_t */ - uarg[a++] = (intptr_t)p->a3; /* intptr_t */ - uarg[a++] = (intptr_t)p->a4; /* intptr_t */ - uarg[a++] = (intptr_t)p->a5; /* intptr_t */ + iarg[a++] = p->a2; /* int */ + iarg[a++] = p->a3; /* int */ + iarg[a++] = p->a4; /* int */ + iarg[a++] = p->a5; /* int */ *n_args = 5; break; } @@ -838,11 +838,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 170: { struct freebsd32_msgsys_args *p = params; iarg[a++] = p->which; /* int */ - uarg[a++] = (intptr_t)p->a2; /* intptr_t */ - uarg[a++] = (intptr_t)p->a3; /* intptr_t */ - uarg[a++] = (intptr_t)p->a4; /* intptr_t */ - uarg[a++] = (intptr_t)p->a5; /* intptr_t */ - uarg[a++] = (intptr_t)p->a6; /* intptr_t */ + iarg[a++] = p->a2; /* int */ + iarg[a++] = p->a3; /* int */ + iarg[a++] = p->a4; /* int */ + iarg[a++] = p->a5; /* int */ + iarg[a++] = p->a6; /* int */ *n_args = 6; break; } @@ -850,9 +850,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 171: { struct freebsd32_shmsys_args *p = params; iarg[a++] = p->which; /* int */ - uarg[a++] = (intptr_t)p->a2; /* intptr_t */ - uarg[a++] = (intptr_t)p->a3; /* intptr_t */ - uarg[a++] = (intptr_t)p->a4; /* intptr_t */ + iarg[a++] = p->a2; /* int */ + iarg[a++] = p->a3; /* int */ + iarg[a++] = p->a4; /* int */ *n_args = 4; break; } @@ -4706,16 +4706,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "intptr_t"; + p = "int"; break; case 2: - p = "intptr_t"; + p = "int"; break; case 3: - p = "intptr_t"; + p = "int"; break; case 4: - p = "intptr_t"; + p = "int"; break; default: break; @@ -4728,19 +4728,19 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "intptr_t"; + p = "int"; break; case 2: - p = "intptr_t"; + p = "int"; break; case 3: - p = "intptr_t"; + p = "int"; break; case 4: - p = "intptr_t"; + p = "int"; break; case 5: - p = "intptr_t"; + p = "int"; break; default: break; @@ -4753,13 +4753,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "intptr_t"; + p = "int"; break; case 2: - p = "intptr_t"; + p = "int"; break; case 3: - p = "intptr_t"; + p = "int"; break; default: break; diff --git a/sys/compat/freebsd64/freebsd64_proto.h b/sys/compat/freebsd64/freebsd64_proto.h index 1e201abc5272..36053d52678c 100644 --- a/sys/compat/freebsd64/freebsd64_proto.h +++ b/sys/compat/freebsd64/freebsd64_proto.h @@ -359,27 +359,6 @@ struct freebsd64_rtprio_args { char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; char rtp_l_[PADL_(struct rtprio *)]; struct rtprio * rtp; char rtp_r_[PADR_(struct rtprio *)]; }; -struct freebsd64_semsys_args { - char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)]; - char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)]; - char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)]; - char a5_l_[PADL_(intptr_t)]; intptr_t a5; char a5_r_[PADR_(intptr_t)]; -}; -struct freebsd64_msgsys_args { - char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)]; - char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)]; - char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)]; - char a5_l_[PADL_(intptr_t)]; intptr_t a5; char a5_r_[PADR_(intptr_t)]; - char a6_l_[PADL_(intptr_t)]; intptr_t a6; char a6_r_[PADR_(intptr_t)]; -}; -struct freebsd64_shmsys_args { - char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)]; - char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)]; - char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)]; -}; struct freebsd64_ntp_adjtime_args { char tp_l_[PADL_(struct timex *)]; struct timex * tp; char tp_r_[PADR_(struct timex *)]; }; @@ -1607,9 +1586,6 @@ int freebsd64_lgetfh(struct thread *, struct freebsd64_lgetfh_args *); int freebsd64_getfh(struct thread *, struct freebsd64_getfh_args *); int freebsd64_sysarch(struct thread *, struct freebsd64_sysarch_args *); int freebsd64_rtprio(struct thread *, struct freebsd64_rtprio_args *); -int freebsd64_semsys(struct thread *, struct freebsd64_semsys_args *); -int freebsd64_msgsys(struct thread *, struct freebsd64_msgsys_args *); -int freebsd64_shmsys(struct thread *, struct freebsd64_shmsys_args *); int freebsd64_ntp_adjtime(struct thread *, struct freebsd64_ntp_adjtime_args *); int freebsd64_pathconf(struct thread *, struct freebsd64_pathconf_args *); int freebsd64_getrlimit(struct thread *, struct freebsd64_getrlimit_args *); @@ -2153,9 +2129,6 @@ int freebsd13_freebsd64_swapoff(struct thread *, struct freebsd13_freebsd64_swap #define FREEBSD64_SYS_AUE_freebsd64_getfh AUE_NFS_GETFH #define FREEBSD64_SYS_AUE_freebsd64_sysarch AUE_SYSARCH #define FREEBSD64_SYS_AUE_freebsd64_rtprio AUE_RTPRIO -#define FREEBSD64_SYS_AUE_freebsd64_semsys AUE_SEMSYS -#define FREEBSD64_SYS_AUE_freebsd64_msgsys AUE_MSGSYS -#define FREEBSD64_SYS_AUE_freebsd64_shmsys AUE_SHMSYS #define FREEBSD64_SYS_AUE_freebsd6_freebsd64_pread AUE_PREAD #define FREEBSD64_SYS_AUE_freebsd6_freebsd64_pwrite AUE_PWRITE #define FREEBSD64_SYS_AUE_freebsd64_ntp_adjtime AUE_NTP_ADJTIME diff --git a/sys/compat/freebsd64/freebsd64_syscall.h b/sys/compat/freebsd64/freebsd64_syscall.h index 2f059a1be5e5..ba6bf95ec6e2 100644 --- a/sys/compat/freebsd64/freebsd64_syscall.h +++ b/sys/compat/freebsd64/freebsd64_syscall.h @@ -165,9 +165,9 @@ /* 164 is obsolete freebsd4_uname */ #define FREEBSD64_SYS_freebsd64_sysarch 165 #define FREEBSD64_SYS_freebsd64_rtprio 166 -#define FREEBSD64_SYS_freebsd64_semsys 169 -#define FREEBSD64_SYS_freebsd64_msgsys 170 -#define FREEBSD64_SYS_freebsd64_shmsys 171 +#define FREEBSD64_SYS_semsys 169 +#define FREEBSD64_SYS_msgsys 170 +#define FREEBSD64_SYS_shmsys 171 /* 173 is freebsd6 freebsd64_pread */ /* 174 is freebsd6 freebsd64_pwrite */ #define FREEBSD64_SYS_setfib 175 diff --git a/sys/compat/freebsd64/freebsd64_syscall.mk b/sys/compat/freebsd64/freebsd64_syscall.mk index ef4299a69449..acaeed1ec7fd 100644 --- a/sys/compat/freebsd64/freebsd64_syscall.mk +++ b/sys/compat/freebsd64/freebsd64_syscall.mk @@ -109,9 +109,9 @@ MIASM = \ freebsd64_getfh.o \ freebsd64_sysarch.o \ freebsd64_rtprio.o \ - freebsd64_semsys.o \ - freebsd64_msgsys.o \ - freebsd64_shmsys.o \ + semsys.o \ + msgsys.o \ + shmsys.o \ setfib.o \ freebsd64_ntp_adjtime.o \ setgid.o \ diff --git a/sys/compat/freebsd64/freebsd64_syscalls.c b/sys/compat/freebsd64/freebsd64_syscalls.c index 4b0dbc89ab5e..456d3a395d80 100644 --- a/sys/compat/freebsd64/freebsd64_syscalls.c +++ b/sys/compat/freebsd64/freebsd64_syscalls.c @@ -174,9 +174,9 @@ const char *freebsd64_syscallnames[] = { "freebsd64_rtprio", /* 166 = freebsd64_rtprio */ "#167", /* 167 = reserved for local use */ "#168", /* 168 = reserved for local use */ - "freebsd64_semsys", /* 169 = freebsd64_semsys */ - "freebsd64_msgsys", /* 170 = freebsd64_msgsys */ - "freebsd64_shmsys", /* 171 = freebsd64_shmsys */ + "semsys", /* 169 = semsys */ + "msgsys", /* 170 = msgsys */ + "shmsys", /* 171 = shmsys */ "#172", /* 172 = reserved for local use */ "compat6.freebsd64_pread", /* 173 = freebsd6 freebsd64_pread */ "compat6.freebsd64_pwrite", /* 174 = freebsd6 freebsd64_pwrite */ diff --git a/sys/compat/freebsd64/freebsd64_sysent.c b/sys/compat/freebsd64/freebsd64_sysent.c index 9041c5ff2d9a..6bbb19a3d104 100644 --- a/sys/compat/freebsd64/freebsd64_sysent.c +++ b/sys/compat/freebsd64/freebsd64_sysent.c @@ -218,9 +218,9 @@ struct sysent freebsd64_sysent[] = { { .sy_narg = AS(freebsd64_rtprio_args), .sy_call = (sy_call_t *)freebsd64_rtprio, .sy_auevent = AUE_RTPRIO, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 166 = freebsd64_rtprio */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 167 = reserved for local use */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 168 = reserved for local use */ - { .sy_narg = AS(freebsd64_semsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 169 = freebsd64_semsys */ - { .sy_narg = AS(freebsd64_msgsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 170 = freebsd64_msgsys */ - { .sy_narg = AS(freebsd64_shmsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 171 = freebsd64_shmsys */ + { .sy_narg = AS(semsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 169 = semsys */ + { .sy_narg = AS(msgsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 170 = msgsys */ + { .sy_narg = AS(shmsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 171 = shmsys */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 172 = reserved for local use */ { compat6(AS(freebsd6_freebsd64_pread_args),freebsd64_pread), .sy_auevent = AUE_PREAD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 173 = freebsd6 freebsd64_pread */ { compat6(AS(freebsd6_freebsd64_pwrite_args),freebsd64_pwrite), .sy_auevent = AUE_PWRITE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 174 = freebsd6 freebsd64_pwrite */ diff --git a/sys/compat/freebsd64/freebsd64_systrace_args.c b/sys/compat/freebsd64/freebsd64_systrace_args.c index 01c4fabb2703..f31b0cb05c12 100644 --- a/sys/compat/freebsd64/freebsd64_systrace_args.c +++ b/sys/compat/freebsd64/freebsd64_systrace_args.c @@ -853,36 +853,36 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } - /* freebsd64_semsys */ + /* semsys */ case 169: { - struct freebsd64_semsys_args *p = params; + struct semsys_args *p = params; iarg[a++] = p->which; /* int */ - uarg[a++] = (intptr_t)p->a2; /* intptr_t */ - uarg[a++] = (intptr_t)p->a3; /* intptr_t */ - uarg[a++] = (intptr_t)p->a4; /* intptr_t */ - uarg[a++] = (intptr_t)p->a5; /* intptr_t */ + iarg[a++] = p->a2; /* int */ + iarg[a++] = p->a3; /* int */ + iarg[a++] = p->a4; /* int */ + iarg[a++] = p->a5; /* int */ *n_args = 5; break; } - /* freebsd64_msgsys */ + /* msgsys */ case 170: { - struct freebsd64_msgsys_args *p = params; + struct msgsys_args *p = params; iarg[a++] = p->which; /* int */ - uarg[a++] = (intptr_t)p->a2; /* intptr_t */ - uarg[a++] = (intptr_t)p->a3; /* intptr_t */ - uarg[a++] = (intptr_t)p->a4; /* intptr_t */ - uarg[a++] = (intptr_t)p->a5; /* intptr_t */ - uarg[a++] = (intptr_t)p->a6; /* intptr_t */ + iarg[a++] = p->a2; /* int */ + iarg[a++] = p->a3; /* int */ + iarg[a++] = p->a4; /* int */ + iarg[a++] = p->a5; /* int */ + iarg[a++] = p->a6; /* int */ *n_args = 6; break; } - /* freebsd64_shmsys */ + /* shmsys */ case 171: { - struct freebsd64_shmsys_args *p = params; + struct shmsys_args *p = params; iarg[a++] = p->which; /* int */ - uarg[a++] = (intptr_t)p->a2; /* intptr_t */ - uarg[a++] = (intptr_t)p->a3; /* intptr_t */ - uarg[a++] = (intptr_t)p->a4; /* intptr_t */ + iarg[a++] = p->a2; /* int */ + iarg[a++] = p->a3; /* int */ + iarg[a++] = p->a4; /* int */ *n_args = 4; break; } @@ -4848,67 +4848,67 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* freebsd64_semsys */ + /* semsys */ case 169: switch (ndx) { case 0: p = "int"; break; case 1: - p = "intptr_t"; + p = "int"; break; case 2: - p = "intptr_t"; + p = "int"; break; case 3: - p = "intptr_t"; + p = "int"; break; case 4: - p = "intptr_t"; + p = "int"; break; default: break; }; break; - /* freebsd64_msgsys */ + /* msgsys */ case 170: switch (ndx) { case 0: p = "int"; break; case 1: - p = "intptr_t"; + p = "int"; break; case 2: - p = "intptr_t"; + p = "int"; break; case 3: - p = "intptr_t"; + p = "int"; break; case 4: - p = "intptr_t"; + p = "int"; break; case 5: - p = "intptr_t"; + p = "int"; break; default: break; }; break; - /* freebsd64_shmsys */ + /* shmsys */ case 171: switch (ndx) { case 0: p = "int"; break; case 1: - p = "intptr_t"; + p = "int"; break; case 2: - p = "intptr_t"; + p = "int"; break; case 3: - p = "intptr_t"; + p = "int"; break; default: break; @@ -9809,17 +9809,17 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* freebsd64_semsys */ + /* semsys */ case 169: if (ndx == 0 || ndx == 1) p = "int"; break; - /* freebsd64_msgsys */ + /* msgsys */ case 170: if (ndx == 0 || ndx == 1) p = "int"; break; - /* freebsd64_shmsys */ + /* shmsys */ case 171: if (ndx == 0 || ndx == 1) p = "int"; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index dfce8c210854..f57ee73b8b41 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -857,10 +857,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 169: { struct semsys_args *p = params; iarg[a++] = p->which; /* int */ - uarg[a++] = (intptr_t)p->a2; /* intcap_t */ - uarg[a++] = (intptr_t)p->a3; /* intcap_t */ - uarg[a++] = (intptr_t)p->a4; /* intcap_t */ - uarg[a++] = (intptr_t)p->a5; /* intcap_t */ + iarg[a++] = p->a2; /* int */ + iarg[a++] = p->a3; /* int */ + iarg[a++] = p->a4; /* int */ + iarg[a++] = p->a5; /* int */ *n_args = 5; break; } @@ -868,11 +868,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 170: { struct msgsys_args *p = params; iarg[a++] = p->which; /* int */ - uarg[a++] = (intptr_t)p->a2; /* intcap_t */ - uarg[a++] = (intptr_t)p->a3; /* intcap_t */ - uarg[a++] = (intptr_t)p->a4; /* intcap_t */ - uarg[a++] = (intptr_t)p->a5; /* intcap_t */ - uarg[a++] = (intptr_t)p->a6; /* intcap_t */ + iarg[a++] = p->a2; /* int */ + iarg[a++] = p->a3; /* int */ + iarg[a++] = p->a4; /* int */ + iarg[a++] = p->a5; /* int */ + iarg[a++] = p->a6; /* int */ *n_args = 6; break; } @@ -880,9 +880,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 171: { struct shmsys_args *p = params; iarg[a++] = p->which; /* int */ - uarg[a++] = (intptr_t)p->a2; /* intcap_t */ - uarg[a++] = (intptr_t)p->a3; /* intcap_t */ - uarg[a++] = (intptr_t)p->a4; /* intcap_t */ + iarg[a++] = p->a2; /* int */ + iarg[a++] = p->a3; /* int */ + iarg[a++] = p->a4; /* int */ *n_args = 4; break; } @@ -4873,16 +4873,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "intcap_t"; + p = "int"; break; case 2: - p = "intcap_t"; + p = "int"; break; case 3: - p = "intcap_t"; + p = "int"; break; case 4: - p = "intcap_t"; + p = "int"; break; default: break; @@ -4895,19 +4895,19 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "intcap_t"; + p = "int"; break; case 2: - p = "intcap_t"; + p = "int"; break; case 3: - p = "intcap_t"; + p = "int"; break; case 4: - p = "intcap_t"; + p = "int"; break; case 5: - p = "intcap_t"; + p = "int"; break; default: break; @@ -4920,13 +4920,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "intcap_t"; + p = "int"; break; case 2: - p = "intcap_t"; + p = "int"; break; case 3: - p = "intcap_t"; + p = "int"; break; default: break; diff --git a/sys/sys/sysargmap.h b/sys/sys/sysargmap.h index 55847d584ccb..270f907e19c9 100644 --- a/sys/sys/sysargmap.h +++ b/sys/sys/sysargmap.h @@ -113,9 +113,9 @@ static int sysargmask[] = { [SYS_getfh] = (0x0 | 0x1 | 0x2), [SYS_sysarch] = (0x0 | 0x2), [SYS_rtprio] = (0x0 | 0x4), - [SYS_semsys] = (0x0 | 0x2 | 0x4 | 0x8 | 0x10), - [SYS_msgsys] = (0x0 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20), - [SYS_shmsys] = (0x0 | 0x2 | 0x4 | 0x8), + [SYS_semsys] = (0x0), + [SYS_msgsys] = (0x0), + [SYS_shmsys] = (0x0), [SYS_setfib] = (0x0), [SYS_ntp_adjtime] = (0x0 | 0x1), [SYS_setgid] = (0x0), diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 3bd47c071f30..09c83886f66c 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -498,24 +498,24 @@ struct rtprio_args { }; struct semsys_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char a2_l_[PADL_(intcap_t)]; intcap_t a2; char a2_r_[PADR_(intcap_t)]; - char a3_l_[PADL_(intcap_t)]; intcap_t a3; char a3_r_[PADR_(intcap_t)]; - char a4_l_[PADL_(intcap_t)]; intcap_t a4; char a4_r_[PADR_(intcap_t)]; - char a5_l_[PADL_(intcap_t)]; intcap_t a5; char a5_r_[PADR_(intcap_t)]; + char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; + char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; + char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; + char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)]; }; struct msgsys_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char a2_l_[PADL_(intcap_t)]; intcap_t a2; char a2_r_[PADR_(intcap_t)]; - char a3_l_[PADL_(intcap_t)]; intcap_t a3; char a3_r_[PADR_(intcap_t)]; - char a4_l_[PADL_(intcap_t)]; intcap_t a4; char a4_r_[PADR_(intcap_t)]; - char a5_l_[PADL_(intcap_t)]; intcap_t a5; char a5_r_[PADR_(intcap_t)]; - char a6_l_[PADL_(intcap_t)]; intcap_t a6; char a6_r_[PADR_(intcap_t)]; + char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; + char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; + char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; + char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)]; + char a6_l_[PADL_(int)]; int a6; char a6_r_[PADR_(int)]; }; struct shmsys_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char a2_l_[PADL_(intcap_t)]; intcap_t a2; char a2_r_[PADR_(intcap_t)]; - char a3_l_[PADL_(intcap_t)]; intcap_t a3; char a3_r_[PADR_(intcap_t)]; - char a4_l_[PADL_(intcap_t)]; intcap_t a4; char a4_r_[PADR_(intcap_t)]; + char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; + char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; + char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; }; struct setfib_args { char fibnum_l_[PADL_(int)]; int fibnum; char fibnum_r_[PADR_(int)];