git: 8460d3e9e6cb - main - freebsd32: regen
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 22 Nov 2021 22:37:38 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=8460d3e9e6cbc78f4ae363b7894d765189b2ad44
commit 8460d3e9e6cbc78f4ae363b7894d765189b2ad44
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2021-11-22 22:36:55 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2021-11-22 22:36:55 +0000
freebsd32: regen
---
sys/compat/freebsd32/freebsd32_proto.h | 22 ++++++++--------
sys/compat/freebsd32/freebsd32_syscall.h | 6 ++---
sys/compat/freebsd32/freebsd32_syscalls.c | 6 ++---
sys/compat/freebsd32/freebsd32_sysent.c | 14 +++++-----
sys/compat/freebsd32/freebsd32_systrace_args.c | 36 +++++++++++++-------------
5 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index 9e95d74621da..1a7a8fe933e6 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -90,7 +90,7 @@ struct freebsd32_getitimer_args {
struct freebsd32_fcntl_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
- char arg_l_[PADL_(int)]; int arg; char arg_r_[PADR_(int)];
+ char arg_l_[PADL_(int32_t)]; int32_t arg; char arg_r_[PADR_(int32_t)];
};
struct freebsd32_select_args {
char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)];
@@ -149,10 +149,10 @@ struct freebsd32_msgsys_args {
char a6_l_[PADL_(int)]; int a6; char a6_r_[PADR_(int)];
};
struct freebsd32_shmsys_args {
- char which_l_[PADL_(uint32_t)]; uint32_t which; char which_r_[PADR_(uint32_t)];
- char a2_l_[PADL_(uint32_t)]; uint32_t a2; char a2_r_[PADR_(uint32_t)];
- char a3_l_[PADL_(uint32_t)]; uint32_t a3; char a3_r_[PADR_(uint32_t)];
- char a4_l_[PADL_(uint32_t)]; uint32_t a4; char a4_r_[PADR_(uint32_t)];
+ char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
+ 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 *)];
@@ -1250,10 +1250,10 @@ int freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_
#ifdef PAD64_REQUIRED
#else
#endif
-struct freebsd10_freebsd32_umtx_lock_args {
+struct freebsd10_freebsd32__umtx_lock_args {
char umtx_l_[PADL_(struct umtx *)]; struct umtx * umtx; char umtx_r_[PADR_(struct umtx *)];
};
-struct freebsd10_freebsd32_umtx_unlock_args {
+struct freebsd10_freebsd32__umtx_unlock_args {
char umtx_l_[PADL_(struct umtx *)]; struct umtx * umtx; char umtx_r_[PADR_(struct umtx *)];
};
#ifdef PAD64_REQUIRED
@@ -1271,8 +1271,8 @@ struct freebsd10_freebsd32_umtx_unlock_args {
#ifdef PAD64_REQUIRED
#else
#endif
-int freebsd10_freebsd32_umtx_lock(struct thread *, struct freebsd10_freebsd32_umtx_lock_args *);
-int freebsd10_freebsd32_umtx_unlock(struct thread *, struct freebsd10_freebsd32_umtx_unlock_args *);
+int freebsd10_freebsd32__umtx_lock(struct thread *, struct freebsd10_freebsd32__umtx_lock_args *);
+int freebsd10_freebsd32__umtx_unlock(struct thread *, struct freebsd10_freebsd32__umtx_unlock_args *);
#endif /* COMPAT_FREEBSD10 */
@@ -1486,8 +1486,8 @@ int freebsd11_freebsd32_fstatat(struct thread *, struct freebsd11_freebsd32_fsta
#define FREEBSD32_SYS_AUE_freebsd32_getcontext AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_setcontext AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_swapcontext AUE_NULL
-#define FREEBSD32_SYS_AUE_freebsd10_freebsd32_umtx_lock AUE_NULL
-#define FREEBSD32_SYS_AUE_freebsd10_freebsd32_umtx_unlock AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd10_freebsd32__umtx_lock AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd10_freebsd32__umtx_unlock AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_ksem_timedwait AUE_SEMWAIT
#define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32__umtx_op AUE_NULL
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h
index ac9f042c3061..38ccc95b9d89 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -127,7 +127,7 @@
#define FREEBSD32_SYS_freebsd32_settimeofday 122
#define FREEBSD32_SYS_fchown 123
#define FREEBSD32_SYS_fchmod 124
- /* 125 is obsolete orecvfrom */
+ /* 125 is old recvfrom */
#define FREEBSD32_SYS_setreuid 126
#define FREEBSD32_SYS_setregid 127
#define FREEBSD32_SYS_rename 128
@@ -359,8 +359,8 @@
#define FREEBSD32_SYS_thr_exit 431
#define FREEBSD32_SYS_thr_self 432
#define FREEBSD32_SYS_thr_kill 433
-#define FREEBSD32_SYS_freebsd10_freebsd32_umtx_lock 434
-#define FREEBSD32_SYS_freebsd10_freebsd32_umtx_unlock 435
+#define FREEBSD32_SYS_freebsd10_freebsd32__umtx_lock 434
+#define FREEBSD32_SYS_freebsd10_freebsd32__umtx_unlock 435
#define FREEBSD32_SYS_jail_attach 436
#define FREEBSD32_SYS_extattr_list_fd 437
#define FREEBSD32_SYS_extattr_list_file 438
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c
index 95153d6a94b5..fa7e58f91bfb 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -134,7 +134,7 @@ const char *freebsd32_syscallnames[] = {
"freebsd32_settimeofday", /* 122 = freebsd32_settimeofday */
"fchown", /* 123 = fchown */
"fchmod", /* 124 = fchmod */
- "obs_orecvfrom", /* 125 = obsolete orecvfrom */
+ "compat.recvfrom", /* 125 = old recvfrom */
"setreuid", /* 126 = setreuid */
"setregid", /* 127 = setregid */
"rename", /* 128 = rename */
@@ -448,8 +448,8 @@ const char *freebsd32_syscallnames[] = {
"thr_exit", /* 431 = thr_exit */
"thr_self", /* 432 = thr_self */
"thr_kill", /* 433 = thr_kill */
- "compat10.freebsd32_umtx_lock", /* 434 = freebsd10 freebsd32_umtx_lock */
- "compat10.freebsd32_umtx_unlock", /* 435 = freebsd10 freebsd32_umtx_unlock */
+ "compat10.freebsd32__umtx_lock", /* 434 = freebsd10 freebsd32__umtx_lock */
+ "compat10.freebsd32__umtx_unlock", /* 435 = freebsd10 freebsd32__umtx_unlock */
"jail_attach", /* 436 = jail_attach */
"extattr_list_fd", /* 437 = extattr_list_fd */
"extattr_list_file", /* 438 = extattr_list_file */
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c
index 69457336de93..0a93641f7f16 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -171,9 +171,9 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = AS(listen_args), .sy_call = (sy_call_t *)sys_listen, .sy_auevent = AUE_LISTEN, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 106 = listen */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 107 = obsolete vtimes */
{ compat(AS(ofreebsd32_sigvec_args),freebsd32_sigvec), .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 108 = old freebsd32_sigvec */
- { compat(AS(osigblock_args),sigblock), .sy_auevent = AUE_O_SIGBLOCK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 109 = old sigblock */
- { compat(AS(osigsetmask_args),sigsetmask), .sy_auevent = AUE_O_SIGSETMASK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 110 = old sigsetmask */
- { compat(AS(osigsuspend_args),sigsuspend), .sy_auevent = AUE_SIGSUSPEND, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 111 = old sigsuspend */
+ { compat(AS(osigblock_args),sigblock), .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 109 = old sigblock */
+ { compat(AS(osigsetmask_args),sigsetmask), .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 110 = old sigsetmask */
+ { compat(AS(osigsuspend_args),sigsuspend), .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 111 = old sigsuspend */
{ compat(AS(ofreebsd32_sigstack_args),freebsd32_sigstack), .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 112 = old freebsd32_sigstack */
{ compat(AS(ofreebsd32_recvmsg_args),freebsd32_recvmsg), .sy_auevent = AUE_RECVMSG, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 113 = old freebsd32_recvmsg */
{ compat(AS(ofreebsd32_sendmsg_args),freebsd32_sendmsg), .sy_auevent = AUE_SENDMSG, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 114 = old freebsd32_sendmsg */
@@ -187,7 +187,7 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = AS(freebsd32_settimeofday_args), .sy_call = (sy_call_t *)freebsd32_settimeofday, .sy_auevent = AUE_SETTIMEOFDAY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 122 = freebsd32_settimeofday */
{ .sy_narg = AS(fchown_args), .sy_call = (sy_call_t *)sys_fchown, .sy_auevent = AUE_FCHOWN, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 123 = fchown */
{ .sy_narg = AS(fchmod_args), .sy_call = (sy_call_t *)sys_fchmod, .sy_auevent = AUE_FCHMOD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 124 = fchmod */
- { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 125 = obsolete orecvfrom */
+ { compat(AS(recvfrom_args),recvfrom), .sy_auevent = AUE_RECVFROM, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 125 = old recvfrom */
{ .sy_narg = AS(setreuid_args), .sy_call = (sy_call_t *)sys_setreuid, .sy_auevent = AUE_SETREUID, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 126 = setreuid */
{ .sy_narg = AS(setregid_args), .sy_call = (sy_call_t *)sys_setregid, .sy_auevent = AUE_SETREGID, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 127 = setregid */
{ .sy_narg = AS(rename_args), .sy_call = (sy_call_t *)sys_rename, .sy_auevent = AUE_RENAME, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 128 = rename */
@@ -212,7 +212,7 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = 0, .sy_call = (sy_call_t *)sys_setsid, .sy_auevent = AUE_SETSID, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 147 = setsid */
{ .sy_narg = AS(quotactl_args), .sy_call = (sy_call_t *)sys_quotactl, .sy_auevent = AUE_QUOTACTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 148 = quotactl */
{ compat(0,quota), .sy_auevent = AUE_O_QUOTA, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 149 = old quota */
- { compat(0,getsockname), .sy_auevent = AUE_GETSOCKNAME, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 150 = old getsockname */
+ { compat(AS(getsockname_args),getsockname), .sy_auevent = AUE_GETSOCKNAME, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 150 = old getsockname */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 151 = 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 }, /* 152 = 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 }, /* 153 = reserved for local use */
@@ -501,8 +501,8 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = AS(thr_exit_args), .sy_call = (sy_call_t *)sys_thr_exit, .sy_auevent = AUE_THR_EXIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 431 = thr_exit */
{ .sy_narg = AS(thr_self_args), .sy_call = (sy_call_t *)sys_thr_self, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 432 = thr_self */
{ .sy_narg = AS(thr_kill_args), .sy_call = (sy_call_t *)sys_thr_kill, .sy_auevent = AUE_THR_KILL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 433 = thr_kill */
- { compat10(AS(freebsd10_freebsd32_umtx_lock_args),freebsd32_umtx_lock), .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 434 = freebsd10 freebsd32_umtx_lock */
- { compat10(AS(freebsd10_freebsd32_umtx_unlock_args),freebsd32_umtx_unlock), .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 435 = freebsd10 freebsd32_umtx_unlock */
+ { compat10(AS(freebsd10_freebsd32__umtx_lock_args),freebsd32__umtx_lock), .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 434 = freebsd10 freebsd32__umtx_lock */
+ { compat10(AS(freebsd10_freebsd32__umtx_unlock_args),freebsd32__umtx_unlock), .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 435 = freebsd10 freebsd32__umtx_unlock */
{ .sy_narg = AS(jail_attach_args), .sy_call = (sy_call_t *)sys_jail_attach, .sy_auevent = AUE_JAIL_ATTACH, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 436 = jail_attach */
{ .sy_narg = AS(extattr_list_fd_args), .sy_call = (sy_call_t *)sys_extattr_list_fd, .sy_auevent = AUE_EXTATTR_LIST_FD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 437 = extattr_list_fd */
{ .sy_narg = AS(extattr_list_file_args), .sy_call = (sy_call_t *)sys_extattr_list_file, .sy_auevent = AUE_EXTATTR_LIST_FILE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 438 = extattr_list_file */
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
index 23af58fe1ffa..d23213b5cb8b 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -473,7 +473,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* getgroups */
case 79: {
struct getgroups_args *p = params;
- uarg[0] = p->gidsetsize; /* u_int */
+ iarg[0] = p->gidsetsize; /* int */
uarg[1] = (intptr_t)p->gidset; /* gid_t * */
*n_args = 2;
break;
@@ -481,7 +481,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* setgroups */
case 80: {
struct setgroups_args *p = params;
- uarg[0] = p->gidsetsize; /* u_int */
+ iarg[0] = p->gidsetsize; /* int */
uarg[1] = (intptr_t)p->gidset; /* const gid_t * */
*n_args = 2;
break;
@@ -541,7 +541,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
struct freebsd32_fcntl_args *p = params;
iarg[0] = p->fd; /* int */
iarg[1] = p->cmd; /* int */
- iarg[2] = p->arg; /* int */
+ iarg[2] = p->arg; /* int32_t */
*n_args = 3;
break;
}
@@ -863,10 +863,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* freebsd32_shmsys */
case 171: {
struct freebsd32_shmsys_args *p = params;
- uarg[0] = p->which; /* uint32_t */
- uarg[1] = p->a2; /* uint32_t */
- uarg[2] = p->a3; /* uint32_t */
- uarg[3] = p->a4; /* uint32_t */
+ iarg[0] = p->which; /* int */
+ iarg[1] = p->a2; /* int */
+ iarg[2] = p->a3; /* int */
+ iarg[3] = p->a4; /* int */
*n_args = 4;
break;
}
@@ -2357,7 +2357,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 473: {
struct sctp_generic_sendmsg_iov_args *p = params;
iarg[0] = p->sd; /* int */
- uarg[1] = (intptr_t)p->iov; /* struct iovec * */
+ uarg[1] = (intptr_t)p->iov; /* struct iovec32 * */
iarg[2] = p->iovlen; /* int */
uarg[3] = (intptr_t)p->to; /* const struct sockaddr * */
iarg[4] = p->tolen; /* __socklen_t */
@@ -2370,7 +2370,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 474: {
struct sctp_generic_recvmsg_args *p = params;
iarg[0] = p->sd; /* int */
- uarg[1] = (intptr_t)p->iov; /* struct iovec * */
+ uarg[1] = (intptr_t)p->iov; /* struct iovec32 * */
iarg[2] = p->iovlen; /* int */
uarg[3] = (intptr_t)p->from; /* struct sockaddr * */
uarg[4] = (intptr_t)p->fromlenaddr; /* __socklen_t * */
@@ -4188,7 +4188,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 79:
switch (ndx) {
case 0:
- p = "u_int";
+ p = "int";
break;
case 1:
p = "userland gid_t *";
@@ -4201,7 +4201,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 80:
switch (ndx) {
case 0:
- p = "u_int";
+ p = "int";
break;
case 1:
p = "userland const gid_t *";
@@ -4291,7 +4291,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 2:
- p = "int";
+ p = "int32_t";
break;
default:
break;
@@ -4849,16 +4849,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 171:
switch (ndx) {
case 0:
- p = "uint32_t";
+ p = "int";
break;
case 1:
- p = "uint32_t";
+ p = "int";
break;
case 2:
- p = "uint32_t";
+ p = "int";
break;
case 3:
- p = "uint32_t";
+ p = "int";
break;
default:
break;
@@ -7285,7 +7285,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "userland struct iovec *";
+ p = "userland struct iovec32 *";
break;
case 2:
p = "int";
@@ -7313,7 +7313,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "userland struct iovec *";
+ p = "userland struct iovec32 *";
break;
case 2:
p = "int";