Author: trasz
Date: Sat Jun 27 14:43:29 2020
New Revision: 362693
URL: https://svnweb.freebsd.org/changeset/base/362693
Log:
Regen.
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/amd64/linux/linux_proto.h
head/sys/amd64/linux/linux_sysent.c
head/sys/amd64/linux/linux_systrace_args.c
head/sys/amd64/linux32/linux32_proto.h
head/sys/amd64/linux32/linux32_sysent.c
head/sys/amd64/linux32/linux32_systrace_args.c
head/sys/arm64/linux/linux_proto.h
head/sys/arm64/linux/linux_sysent.c
head/sys/arm64/linux/linux_systrace_args.c
head/sys/i386/linux/linux_proto.h
head/sys/i386/linux/linux_sysent.c
head/sys/i386/linux/linux_systrace_args.c
Modified: head/sys/amd64/linux/linux_proto.h
==============================================================================
--- head/sys/amd64/linux/linux_proto.h Sat Jun 27 14:42:08 2020
(r362692)
+++ head/sys/amd64/linux/linux_proto.h Sat Jun 27 14:43:29 2020
(r362693)
@@ -38,7 +38,7 @@ struct thread;
struct linux_open_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
- char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)];
+ char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char
mode_r_[PADR_(l_mode_t)];
};
struct linux_newstat_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@@ -66,9 +66,9 @@ struct linux_mmap2_args {
char pgoff_l_[PADL_(l_ulong)]; l_ulong pgoff; char
pgoff_r_[PADR_(l_ulong)];
};
struct linux_mprotect_args {
- char addr_l_[PADL_(caddr_t)]; caddr_t addr; char
addr_r_[PADR_(caddr_t)];
- char len_l_[PADL_(l_int)]; l_int len; char len_r_[PADR_(l_int)];
- char prot_l_[PADL_(l_int)]; l_int prot; char prot_r_[PADR_(l_int)];
+ char addr_l_[PADL_(l_ulong)]; l_ulong addr; char
addr_r_[PADR_(l_ulong)];
+ char len_l_[PADL_(l_size_t)]; l_size_t len; char
len_r_[PADR_(l_size_t)];
+ char prot_l_[PADL_(l_ulong)]; l_ulong prot; char
prot_r_[PADR_(l_ulong)];
};
struct linux_brk_args {
char dsend_l_[PADL_(l_ulong)]; l_ulong dsend; char
dsend_r_[PADR_(l_ulong)];
@@ -91,7 +91,7 @@ struct linux_rt_sigreturn_args {
struct linux_ioctl_args {
char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
char cmd_l_[PADL_(l_uint)]; l_uint cmd; char cmd_r_[PADR_(l_uint)];
- char arg_l_[PADL_(uintptr_t)]; uintptr_t arg; char
arg_r_[PADR_(uintptr_t)];
+ char arg_l_[PADL_(l_ulong)]; l_ulong arg; char arg_r_[PADR_(l_ulong)];
};
struct linux_pread_args {
char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
@@ -110,7 +110,7 @@ struct linux_access_args {
char amode_l_[PADL_(l_int)]; l_int amode; char amode_r_[PADR_(l_int)];
};
struct linux_pipe_args {
- char pipefds_l_[PADL_(l_ulong *)]; l_ulong * pipefds; char
pipefds_r_[PADR_(l_ulong *)];
+ char pipefds_l_[PADL_(l_int *)]; l_int * pipefds; char
pipefds_r_[PADR_(l_int *)];
};
struct linux_select_args {
char nfds_l_[PADL_(l_int)]; l_int nfds; char nfds_r_[PADR_(l_int)];
@@ -137,9 +137,9 @@ struct linux_mincore_args {
char vec_l_[PADL_(u_char *)]; u_char * vec; char vec_r_[PADR_(u_char
*)];
};
struct linux_madvise_args {
- char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)];
- char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
- char behav_l_[PADL_(int)]; int behav; char behav_r_[PADR_(int)];
+ char addr_l_[PADL_(l_ulong)]; l_ulong addr; char
addr_r_[PADR_(l_ulong)];
+ char len_l_[PADL_(l_size_t)]; l_size_t len; char
len_r_[PADR_(l_size_t)];
+ char behav_l_[PADL_(l_int)]; l_int behav; char behav_r_[PADR_(l_int)];
};
struct linux_shmget_args {
char key_l_[PADL_(l_key_t)]; l_key_t key; char key_r_[PADR_(l_key_t)];
@@ -181,7 +181,7 @@ struct linux_getpid_args {
struct linux_sendfile_args {
char out_l_[PADL_(l_int)]; l_int out; char out_r_[PADR_(l_int)];
char in_l_[PADL_(l_int)]; l_int in; char in_r_[PADR_(l_int)];
- char offset_l_[PADL_(l_long *)]; l_long * offset; char
offset_r_[PADR_(l_long *)];
+ char offset_l_[PADL_(l_off_t *)]; l_off_t * offset; char
offset_r_[PADR_(l_off_t *)];
char count_l_[PADL_(l_size_t)]; l_size_t count; char
count_r_[PADR_(l_size_t)];
};
struct linux_socket_args {
@@ -202,8 +202,8 @@ struct linux_accept_args {
struct linux_sendto_args {
char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
char msg_l_[PADL_(l_uintptr_t)]; l_uintptr_t msg; char
msg_r_[PADR_(l_uintptr_t)];
- char len_l_[PADL_(l_int)]; l_int len; char len_r_[PADR_(l_int)];
- char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+ char len_l_[PADL_(l_size_t)]; l_size_t len; char
len_r_[PADR_(l_size_t)];
+ char flags_l_[PADL_(l_uint)]; l_uint flags; char
flags_r_[PADR_(l_uint)];
char to_l_[PADL_(l_uintptr_t)]; l_uintptr_t to; char
to_r_[PADR_(l_uintptr_t)];
char tolen_l_[PADL_(l_int)]; l_int tolen; char tolen_r_[PADR_(l_int)];
};
@@ -211,19 +211,19 @@ struct linux_recvfrom_args {
char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
char buf_l_[PADL_(l_uintptr_t)]; l_uintptr_t buf; char
buf_r_[PADR_(l_uintptr_t)];
char len_l_[PADL_(l_size_t)]; l_size_t len; char
len_r_[PADR_(l_size_t)];
- char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+ char flags_l_[PADL_(l_uint)]; l_uint flags; char
flags_r_[PADR_(l_uint)];
char from_l_[PADL_(l_uintptr_t)]; l_uintptr_t from; char
from_r_[PADR_(l_uintptr_t)];
char fromlen_l_[PADL_(l_uintptr_t)]; l_uintptr_t fromlen; char
fromlen_r_[PADR_(l_uintptr_t)];
};
struct linux_sendmsg_args {
char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
char msg_l_[PADL_(l_uintptr_t)]; l_uintptr_t msg; char
msg_r_[PADR_(l_uintptr_t)];
- char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+ char flags_l_[PADL_(l_uint)]; l_uint flags; char
flags_r_[PADR_(l_uint)];
};
struct linux_recvmsg_args {
char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
char msg_l_[PADL_(l_uintptr_t)]; l_uintptr_t msg; char
msg_r_[PADR_(l_uintptr_t)];
- char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+ char flags_l_[PADL_(l_uint)]; l_uint flags; char
flags_r_[PADR_(l_uint)];
};
struct linux_shutdown_args {
char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
@@ -269,7 +269,7 @@ struct linux_getsockopt_args {
char optlen_l_[PADL_(l_uintptr_t)]; l_uintptr_t optlen; char
optlen_r_[PADR_(l_uintptr_t)];
};
struct linux_clone_args {
- char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+ char flags_l_[PADL_(l_ulong)]; l_ulong flags; char
flags_r_[PADR_(l_ulong)];
char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void
*)];
char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char
parent_tidptr_r_[PADR_(void *)];
char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char
child_tidptr_r_[PADR_(void *)];
@@ -296,7 +296,7 @@ struct linux_wait4_args {
char rusage_l_[PADL_(struct rusage *)]; struct rusage * rusage; char
rusage_r_[PADR_(struct rusage *)];
};
struct linux_kill_args {
- char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)];
+ char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
char signum_l_[PADL_(l_int)]; l_int signum; char
signum_r_[PADR_(l_int)];
};
struct linux_newuname_args {
@@ -353,11 +353,11 @@ struct linux_fdatasync_args {
};
struct linux_truncate_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char length_l_[PADL_(l_ulong)]; l_ulong length; char
length_r_[PADR_(l_ulong)];
+ char length_l_[PADL_(l_long)]; l_long length; char
length_r_[PADR_(l_long)];
};
struct linux_ftruncate_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
- char length_l_[PADL_(l_long)]; l_long length; char
length_r_[PADR_(l_long)];
+ char length_l_[PADL_(l_ulong)]; l_ulong length; char
length_r_[PADR_(l_ulong)];
};
struct linux_getdents_args {
char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
@@ -377,14 +377,14 @@ struct linux_rename_args {
};
struct linux_mkdir_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)];
+ char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char
mode_r_[PADR_(l_mode_t)];
};
struct linux_rmdir_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
};
struct linux_creat_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)];
+ char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char
mode_r_[PADR_(l_mode_t)];
};
struct linux_link_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@@ -500,14 +500,14 @@ struct linux_utime_args {
};
struct linux_mknod_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)];
- char dev_l_[PADL_(l_dev_t)]; l_dev_t dev; char dev_r_[PADR_(l_dev_t)];
+ char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char
mode_r_[PADR_(l_mode_t)];
+ char dev_l_[PADL_(l_uint)]; l_uint dev; char dev_r_[PADR_(l_uint)];
};
struct linux_personality_args {
char per_l_[PADL_(l_uint)]; l_uint per; char per_r_[PADR_(l_uint)];
};
struct linux_ustat_args {
- char dev_l_[PADL_(l_dev_t)]; l_dev_t dev; char dev_r_[PADR_(l_dev_t)];
+ char dev_l_[PADL_(l_uint)]; l_uint dev; char dev_r_[PADR_(l_uint)];
char ubuf_l_[PADL_(struct l_ustat *)]; struct l_ustat * ubuf; char
ubuf_r_[PADR_(struct l_ustat *)];
};
struct linux_statfs_args {
@@ -605,7 +605,7 @@ struct linux_reboot_args {
};
struct linux_sethostname_args {
char hostname_l_[PADL_(char *)]; char * hostname; char
hostname_r_[PADR_(char *)];
- char len_l_[PADL_(l_uint)]; l_uint len; char len_r_[PADR_(l_uint)];
+ char len_l_[PADL_(l_int)]; l_int len; char len_r_[PADR_(l_int)];
};
struct linux_setdomainname_args {
char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)];
@@ -633,43 +633,73 @@ struct linux_readahead_args {
register_t dummy;
};
struct linux_setxattr_args {
- register_t dummy;
+ char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
+ char name_l_[PADL_(const char *)]; const char * name; char
name_r_[PADR_(const char *)];
+ char value_l_[PADL_(const char *)]; const char * value; char
value_r_[PADR_(const char *)];
+ char size_l_[PADL_(l_size_t)]; l_size_t size; char
size_r_[PADR_(l_size_t)];
+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_lsetxattr_args {
- register_t dummy;
+ char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
+ char name_l_[PADL_(const char *)]; const char * name; char
name_r_[PADR_(const char *)];
+ char value_l_[PADL_(const char *)]; const char * value; char
value_r_[PADR_(const char *)];
+ char size_l_[PADL_(l_size_t)]; l_size_t size; char
size_r_[PADR_(l_size_t)];
+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_fsetxattr_args {
- register_t dummy;
+ char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
+ char name_l_[PADL_(const char *)]; const char * name; char
name_r_[PADR_(const char *)];
+ char value_l_[PADL_(const char *)]; const char * value; char
value_r_[PADR_(const char *)];
+ char size_l_[PADL_(l_size_t)]; l_size_t size; char
size_r_[PADR_(l_size_t)];
+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_getxattr_args {
- register_t dummy;
+ char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
+ char name_l_[PADL_(const char *)]; const char * name; char
name_r_[PADR_(const char *)];
+ char value_l_[PADL_(char *)]; char * value; char value_r_[PADR_(char
*)];
+ char size_l_[PADL_(l_size_t)]; l_size_t size; char
size_r_[PADR_(l_size_t)];
};
struct linux_lgetxattr_args {
- register_t dummy;
+ char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
+ char name_l_[PADL_(const char *)]; const char * name; char
name_r_[PADR_(const char *)];
+ char value_l_[PADL_(char *)]; char * value; char value_r_[PADR_(char
*)];
+ char size_l_[PADL_(l_size_t)]; l_size_t size; char
size_r_[PADR_(l_size_t)];
};
struct linux_fgetxattr_args {
- register_t dummy;
+ char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
+ char name_l_[PADL_(const char *)]; const char * name; char
name_r_[PADR_(const char *)];
+ char value_l_[PADL_(char *)]; char * value; char value_r_[PADR_(char
*)];
+ char size_l_[PADL_(l_size_t)]; l_size_t size; char
size_r_[PADR_(l_size_t)];
};
struct linux_listxattr_args {
- register_t dummy;
+ char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
+ char list_l_[PADL_(const char *)]; const char * list; char
list_r_[PADR_(const char *)];
+ char size_l_[PADL_(l_size_t)]; l_size_t size; char
size_r_[PADR_(l_size_t)];
};
struct linux_llistxattr_args {
- register_t dummy;
+ char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
+ char list_l_[PADL_(const char *)]; const char * list; char
list_r_[PADR_(const char *)];
+ char size_l_[PADL_(l_size_t)]; l_size_t size; char
size_r_[PADR_(l_size_t)];
};
struct linux_flistxattr_args {
- register_t dummy;
+ char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
+ char list_l_[PADL_(const char *)]; const char * list; char
list_r_[PADR_(const char *)];
+ char size_l_[PADL_(l_size_t)]; l_size_t size; char
size_r_[PADR_(l_size_t)];
};
struct linux_removexattr_args {
- register_t dummy;
+ char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
+ char name_l_[PADL_(const char *)]; const char * name; char
name_r_[PADR_(const char *)];
};
struct linux_lremovexattr_args {
- register_t dummy;
+ char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
+ char name_l_[PADL_(const char *)]; const char * name; char
name_r_[PADR_(const char *)];
};
struct linux_fremovexattr_args {
- register_t dummy;
+ char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
+ char name_l_[PADL_(const char *)]; const char * name; char
name_r_[PADR_(const char *)];
};
struct linux_tkill_args {
- char tid_l_[PADL_(l_int)]; l_int tid; char tid_r_[PADR_(l_int)];
+ char tid_l_[PADL_(l_pid_t)]; l_pid_t tid; char tid_r_[PADR_(l_pid_t)];
char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)];
};
struct linux_time_args {
@@ -772,7 +802,7 @@ struct linux_clock_getres_args {
};
struct linux_clock_nanosleep_args {
char which_l_[PADL_(clockid_t)]; clockid_t which; char
which_r_[PADR_(clockid_t)];
- char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
char rqtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rqtp;
char rqtp_r_[PADR_(struct l_timespec *)];
char rmtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rmtp;
char rmtp_r_[PADR_(struct l_timespec *)];
};
@@ -792,8 +822,8 @@ struct linux_epoll_ctl_args {
char event_l_[PADL_(struct epoll_event *)]; struct epoll_event * event;
char event_r_[PADR_(struct epoll_event *)];
};
struct linux_tgkill_args {
- char tgid_l_[PADL_(l_int)]; l_int tgid; char tgid_r_[PADR_(l_int)];
- char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)];
+ char tgid_l_[PADL_(l_pid_t)]; l_pid_t tgid; char
tgid_r_[PADR_(l_pid_t)];
+ char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)];
};
struct linux_utimes_args {
@@ -810,22 +840,36 @@ struct linux_get_mempolicy_args {
register_t dummy;
};
struct linux_mq_open_args {
- register_t dummy;
+ char name_l_[PADL_(const char *)]; const char * name; char
name_r_[PADR_(const char *)];
+ char oflag_l_[PADL_(l_int)]; l_int oflag; char oflag_r_[PADR_(l_int)];
+ char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char
mode_r_[PADR_(l_mode_t)];
+ char attr_l_[PADL_(struct mq_attr *)]; struct mq_attr * attr; char
attr_r_[PADR_(struct mq_attr *)];
};
struct linux_mq_unlink_args {
- register_t dummy;
+ char name_l_[PADL_(const char *)]; const char * name; char
name_r_[PADR_(const char *)];
};
struct linux_mq_timedsend_args {
- register_t dummy;
+ char mqd_l_[PADL_(l_mqd_t)]; l_mqd_t mqd; char mqd_r_[PADR_(l_mqd_t)];
+ char msg_ptr_l_[PADL_(const char *)]; const char * msg_ptr; char
msg_ptr_r_[PADR_(const char *)];
+ char msg_len_l_[PADL_(l_size_t)]; l_size_t msg_len; char
msg_len_r_[PADR_(l_size_t)];
+ char msg_prio_l_[PADL_(l_uint)]; l_uint msg_prio; char
msg_prio_r_[PADR_(l_uint)];
+ char abs_timeout_l_[PADL_(const struct l_timespec *)]; const struct
l_timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct l_timespec *)];
};
struct linux_mq_timedreceive_args {
- register_t dummy;
+ char mqd_l_[PADL_(l_mqd_t)]; l_mqd_t mqd; char mqd_r_[PADR_(l_mqd_t)];
+ char msg_ptr_l_[PADL_(char *)]; char * msg_ptr; char
msg_ptr_r_[PADR_(char *)];
+ char msg_len_l_[PADL_(l_size_t)]; l_size_t msg_len; char
msg_len_r_[PADR_(l_size_t)];
+ char msg_prio_l_[PADL_(l_uint *)]; l_uint * msg_prio; char
msg_prio_r_[PADR_(l_uint *)];
+ char abs_timeout_l_[PADL_(const struct l_timespec *)]; const struct
l_timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct l_timespec *)];
};
struct linux_mq_notify_args {
- register_t dummy;
+ char mqd_l_[PADL_(l_mqd_t)]; l_mqd_t mqd; char mqd_r_[PADR_(l_mqd_t)];
+ char abs_timeout_l_[PADL_(const struct l_timespec *)]; const struct
l_timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct l_timespec *)];
};
struct linux_mq_getsetattr_args {
- register_t dummy;
+ char mqd_l_[PADL_(l_mqd_t)]; l_mqd_t mqd; char mqd_r_[PADR_(l_mqd_t)];
+ char attr_l_[PADL_(const struct mq_attr *)]; const struct mq_attr *
attr; char attr_r_[PADR_(const struct mq_attr *)];
+ char oattr_l_[PADL_(struct mq_attr *)]; struct mq_attr * oattr; char
oattr_r_[PADR_(struct mq_attr *)];
};
struct linux_kexec_load_args {
register_t dummy;
@@ -868,17 +912,17 @@ struct linux_openat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
char filename_l_[PADL_(const char *)]; const char * filename; char
filename_r_[PADR_(const char *)];
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
- char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)];
+ char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char
mode_r_[PADR_(l_mode_t)];
};
struct linux_mkdirat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
char pathname_l_[PADL_(const char *)]; const char * pathname; char
pathname_r_[PADR_(const char *)];
- char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)];
+ char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char
mode_r_[PADR_(l_mode_t)];
};
struct linux_mknodat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
char filename_l_[PADL_(const char *)]; const char * filename; char
filename_r_[PADR_(const char *)];
- char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)];
+ char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char
mode_r_[PADR_(l_mode_t)];
char dev_l_[PADL_(l_uint)]; l_uint dev; char dev_r_[PADR_(l_uint)];
};
struct linux_fchownat_args {
@@ -948,7 +992,7 @@ struct linux_pselect6_args {
};
struct linux_ppoll_args {
char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char
fds_r_[PADR_(struct pollfd *)];
- char nfds_l_[PADL_(uint32_t)]; uint32_t nfds; char
nfds_r_[PADR_(uint32_t)];
+ char nfds_l_[PADL_(l_uint)]; l_uint nfds; char nfds_r_[PADR_(l_uint)];
char tsp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tsp; char
tsp_r_[PADR_(struct l_timespec *)];
char sset_l_[PADL_(l_sigset_t *)]; l_sigset_t * sset; char
sset_r_[PADR_(l_sigset_t *)];
char ssize_l_[PADL_(l_size_t)]; l_size_t ssize; char
ssize_r_[PADR_(l_size_t)];
@@ -975,7 +1019,7 @@ struct linux_sync_file_range_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char
offset_r_[PADR_(l_loff_t)];
char nbytes_l_[PADL_(l_loff_t)]; l_loff_t nbytes; char
nbytes_r_[PADR_(l_loff_t)];
- char flags_l_[PADL_(unsigned int)]; unsigned int flags; char
flags_r_[PADR_(unsigned int)];
+ char flags_l_[PADL_(l_uint)]; l_uint flags; char
flags_r_[PADR_(l_uint)];
};
struct linux_vmsplice_args {
register_t dummy;
@@ -1027,7 +1071,7 @@ struct linux_accept4_args {
char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
char addr_l_[PADL_(l_uintptr_t)]; l_uintptr_t addr; char
addr_r_[PADR_(l_uintptr_t)];
char namelen_l_[PADL_(l_uintptr_t)]; l_uintptr_t namelen; char
namelen_r_[PADR_(l_uintptr_t)];
- char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_signalfd4_args {
register_t dummy;
@@ -1040,8 +1084,8 @@ struct linux_epoll_create1_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_dup3_args {
- char oldfd_l_[PADL_(l_int)]; l_int oldfd; char oldfd_r_[PADR_(l_int)];
- char newfd_l_[PADL_(l_int)]; l_int newfd; char newfd_r_[PADR_(l_int)];
+ char oldfd_l_[PADL_(l_uint)]; l_uint oldfd; char
oldfd_r_[PADR_(l_uint)];
+ char newfd_l_[PADL_(l_uint)]; l_uint newfd; char
newfd_r_[PADR_(l_uint)];
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_pipe2_args {
@@ -1164,7 +1208,7 @@ struct linux_renameat2_args {
char oldname_l_[PADL_(const char *)]; const char * oldname; char
oldname_r_[PADR_(const char *)];
char newdfd_l_[PADL_(l_int)]; l_int newdfd; char
newdfd_r_[PADR_(l_int)];
char newname_l_[PADL_(const char *)]; const char * newname; char
newname_r_[PADR_(const char *)];
- char flags_l_[PADL_(unsigned int)]; unsigned int flags; char
flags_r_[PADR_(unsigned int)];
+ char flags_l_[PADL_(l_uint)]; l_uint flags; char
flags_r_[PADR_(l_uint)];
};
struct linux_seccomp_args {
char op_l_[PADL_(l_uint)]; l_uint op; char op_r_[PADR_(l_uint)];
Modified: head/sys/amd64/linux/linux_sysent.c
==============================================================================
--- head/sys/amd64/linux/linux_sysent.c Sat Jun 27 14:42:08 2020
(r362692)
+++ head/sys/amd64/linux/linux_sysent.c Sat Jun 27 14:43:29 2020
(r362693)
@@ -205,18 +205,18 @@ struct sysent linux_sysent[] = {
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 185 = security */
{ 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC
}, /* 186 = linux_gettid */
{ 0, (sy_call_t *)linux_readahead, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 187 = linux_readahead */
- { 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 188 = linux_setxattr */
- { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 189 = linux_lsetxattr */
- { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 190 = linux_fsetxattr */
- { 0, (sy_call_t *)linux_getxattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 191 = linux_getxattr */
- { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 192 = linux_lgetxattr */
- { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 193 = linux_fgetxattr */
- { 0, (sy_call_t *)linux_listxattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 194 = linux_listxattr */
- { 0, (sy_call_t *)linux_llistxattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 195 = linux_llistxattr */
- { 0, (sy_call_t *)linux_flistxattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 196 = linux_flistxattr */
- { 0, (sy_call_t *)linux_removexattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 197 = linux_removexattr */
- { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 198 = linux_lremovexattr */
- { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 199 = linux_fremovexattr */
+ { AS(linux_setxattr_args), (sy_call_t *)linux_setxattr, AUE_NULL, NULL,
0, 0, 0, SY_THR_STATIC }, /* 188 = linux_setxattr */
+ { AS(linux_lsetxattr_args), (sy_call_t *)linux_lsetxattr, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 189 = linux_lsetxattr */
+ { AS(linux_fsetxattr_args), (sy_call_t *)linux_fsetxattr, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 190 = linux_fsetxattr */
+ { AS(linux_getxattr_args), (sy_call_t *)linux_getxattr, AUE_NULL, NULL,
0, 0, 0, SY_THR_STATIC }, /* 191 = linux_getxattr */
+ { AS(linux_lgetxattr_args), (sy_call_t *)linux_lgetxattr, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 192 = linux_lgetxattr */
+ { AS(linux_fgetxattr_args), (sy_call_t *)linux_fgetxattr, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 193 = linux_fgetxattr */
+ { AS(linux_listxattr_args), (sy_call_t *)linux_listxattr, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 194 = linux_listxattr */
+ { AS(linux_llistxattr_args), (sy_call_t *)linux_llistxattr, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 195 = linux_llistxattr */
+ { AS(linux_flistxattr_args), (sy_call_t *)linux_flistxattr, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 196 = linux_flistxattr */
+ { AS(linux_removexattr_args), (sy_call_t *)linux_removexattr, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 197 = linux_removexattr */
+ { AS(linux_lremovexattr_args), (sy_call_t *)linux_lremovexattr,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 198 = linux_lremovexattr */
+ { AS(linux_fremovexattr_args), (sy_call_t *)linux_fremovexattr,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 199 = linux_fremovexattr */
{ AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL, NULL, 0, 0,
0, SY_THR_STATIC }, /* 200 = linux_tkill */
{ AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0,
0, SY_THR_STATIC }, /* 201 = linux_time */
{ AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 202 = linux_sys_futex */
@@ -257,12 +257,12 @@ struct sysent linux_sysent[] = {
{ 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC
}, /* 237 = linux_mbind */
{ 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 238 = linux_set_mempolicy */
{ 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 239 = linux_get_mempolicy */
- { 0, (sy_call_t *)linux_mq_open, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC
}, /* 240 = linux_mq_open */
- { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 241 = linux_mq_unlink */
- { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 242 = linux_mq_timedsend */
- { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 243 = linux_mq_timedreceive */
- { 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 244 = linux_mq_notify */
- { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 245 = linux_mq_getsetattr */
+ { AS(linux_mq_open_args), (sy_call_t *)linux_mq_open, AUE_NULL, NULL,
0, 0, 0, SY_THR_STATIC }, /* 240 = linux_mq_open */
+ { AS(linux_mq_unlink_args), (sy_call_t *)linux_mq_unlink, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 241 = linux_mq_unlink */
+ { AS(linux_mq_timedsend_args), (sy_call_t *)linux_mq_timedsend,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 242 = linux_mq_timedsend */
+ { AS(linux_mq_timedreceive_args), (sy_call_t *)linux_mq_timedreceive,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 243 = linux_mq_timedreceive */
+ { AS(linux_mq_notify_args), (sy_call_t *)linux_mq_notify, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 244 = linux_mq_notify */
+ { AS(linux_mq_getsetattr_args), (sy_call_t *)linux_mq_getsetattr,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 245 = linux_mq_getsetattr */
{ 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 246 = linux_kexec_load */
{ AS(linux_waitid_args), (sy_call_t *)linux_waitid, AUE_WAIT6, NULL, 0,
0, 0, SY_THR_STATIC }, /* 247 = linux_waitid */
{ 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC
}, /* 248 = linux_add_key */
Modified: head/sys/amd64/linux/linux_systrace_args.c
==============================================================================
--- head/sys/amd64/linux/linux_systrace_args.c Sat Jun 27 14:42:08 2020
(r362692)
+++ head/sys/amd64/linux/linux_systrace_args.c Sat Jun 27 14:43:29 2020
(r362693)
@@ -17,7 +17,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
struct read_args *p = params;
iarg[0] = p->fd; /* int */
uarg[1] = (intptr_t) p->buf; /* char * */
- uarg[2] = p->nbyte; /* u_int */
+ iarg[2] = p->nbyte; /* l_size_t */
*n_args = 3;
break;
}
@@ -26,7 +26,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
struct write_args *p = params;
iarg[0] = p->fd; /* int */
uarg[1] = (intptr_t) p->buf; /* char * */
- uarg[2] = p->nbyte; /* u_int */
+ iarg[2] = p->nbyte; /* l_size_t */
*n_args = 3;
break;
}
@@ -35,7 +35,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
struct linux_open_args *p = params;
uarg[0] = (intptr_t) p->path; /* char * */
iarg[1] = p->flags; /* l_int */
- iarg[2] = p->mode; /* l_int */
+ iarg[2] = p->mode; /* l_mode_t */
*n_args = 3;
break;
}
@@ -103,17 +103,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
/* linux_mprotect */
case 10: {
struct linux_mprotect_args *p = params;
- uarg[0] = (intptr_t) p->addr; /* caddr_t */
- iarg[1] = p->len; /* l_int */
- iarg[2] = p->prot; /* l_int */
+ iarg[0] = p->addr; /* l_ulong */
+ iarg[1] = p->len; /* l_size_t */
+ iarg[2] = p->prot; /* l_ulong */
*n_args = 3;
break;
}
/* munmap */
case 11: {
struct munmap_args *p = params;
- uarg[0] = (intptr_t) p->addr; /* caddr_t */
- iarg[1] = p->len; /* int */
+ uarg[0] = (intptr_t) p->addr; /* void * */
+ iarg[1] = p->len; /* l_size_t */
*n_args = 2;
break;
}
@@ -156,7 +156,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
struct linux_ioctl_args *p = params;
iarg[0] = p->fd; /* l_uint */
iarg[1] = p->cmd; /* l_uint */
- uarg[2] = p->arg; /* uintptr_t */
+ iarg[2] = p->arg; /* l_ulong */
*n_args = 3;
break;
}
@@ -209,7 +209,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
/* linux_pipe */
case 22: {
struct linux_pipe_args *p = params;
- uarg[0] = (intptr_t) p->pipefds; /* l_ulong * */
+ uarg[0] = (intptr_t) p->pipefds; /* l_int * */
*n_args = 1;
break;
}
@@ -261,9 +261,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
/* linux_madvise */
case 28: {
struct linux_madvise_args *p = params;
- uarg[0] = (intptr_t) p->addr; /* void * */
- uarg[1] = p->len; /* size_t */
- iarg[2] = p->behav; /* int */
+ iarg[0] = p->addr; /* l_ulong */
+ iarg[1] = p->len; /* l_size_t */
+ iarg[2] = p->behav; /* l_int */
*n_args = 3;
break;
}
@@ -356,7 +356,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
struct linux_sendfile_args *p = params;
iarg[0] = p->out; /* l_int */
iarg[1] = p->in; /* l_int */
- uarg[2] = (intptr_t) p->offset; /* l_long * */
+ uarg[2] = (intptr_t) p->offset; /* l_off_t * */
iarg[3] = p->count; /* l_size_t */
*n_args = 4;
break;
@@ -393,8 +393,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
struct linux_sendto_args *p = params;
iarg[0] = p->s; /* l_int */
iarg[1] = p->msg; /* l_uintptr_t */
- iarg[2] = p->len; /* l_int */
- iarg[3] = p->flags; /* l_int */
+ iarg[2] = p->len; /* l_size_t */
+ iarg[3] = p->flags; /* l_uint */
iarg[4] = p->to; /* l_uintptr_t */
iarg[5] = p->tolen; /* l_int */
*n_args = 6;
@@ -406,7 +406,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
iarg[0] = p->s; /* l_int */
iarg[1] = p->buf; /* l_uintptr_t */
iarg[2] = p->len; /* l_size_t */
- iarg[3] = p->flags; /* l_int */
+ iarg[3] = p->flags; /* l_uint */
iarg[4] = p->from; /* l_uintptr_t */
iarg[5] = p->fromlen; /* l_uintptr_t */
*n_args = 6;
@@ -417,7 +417,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
struct linux_sendmsg_args *p = params;
iarg[0] = p->s; /* l_int */
iarg[1] = p->msg; /* l_uintptr_t */
- iarg[2] = p->flags; /* l_int */
+ iarg[2] = p->flags; /* l_uint */
*n_args = 3;
break;
}
@@ -426,7 +426,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
struct linux_recvmsg_args *p = params;
iarg[0] = p->s; /* l_int */
iarg[1] = p->msg; /* l_uintptr_t */
- iarg[2] = p->flags; /* l_int */
+ iarg[2] = p->flags; /* l_uint */
*n_args = 3;
break;
}
@@ -508,7 +508,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
/* linux_clone */
case 56: {
struct linux_clone_args *p = params;
- iarg[0] = p->flags; /* l_int */
+ iarg[0] = p->flags; /* l_ulong */
uarg[1] = (intptr_t) p->stack; /* void * */
uarg[2] = (intptr_t) p->parent_tidptr; /* void * */
uarg[3] = (intptr_t) p->child_tidptr; /* void * */
@@ -555,7 +555,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
/* linux_kill */
case 62: {
struct linux_kill_args *p = params;
- iarg[0] = p->pid; /* l_int */
+ iarg[0] = p->pid; /* l_pid_t */
iarg[1] = p->signum; /* l_int */
*n_args = 2;
break;
@@ -675,7 +675,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 76: {
struct linux_truncate_args *p = params;
uarg[0] = (intptr_t) p->path; /* char * */
- iarg[1] = p->length; /* l_ulong */
+ iarg[1] = p->length; /* l_long */
*n_args = 2;
break;
}
@@ -683,7 +683,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 77: {
struct linux_ftruncate_args *p = params;
iarg[0] = p->fd; /* l_int */
- iarg[1] = p->length; /* l_long */
+ iarg[1] = p->length; /* l_ulong */
*n_args = 2;
break;
}
@@ -730,7 +730,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 83: {
struct linux_mkdir_args *p = params;
uarg[0] = (intptr_t) p->path; /* char * */
- iarg[1] = p->mode; /* l_int */
+ iarg[1] = p->mode; /* l_mode_t */
*n_args = 2;
break;
}
@@ -745,7 +745,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 85: {
struct linux_creat_args *p = params;
uarg[0] = (intptr_t) p->path; /* char * */
- iarg[1] = p->mode; /* l_int */
+ iarg[1] = p->mode; /* l_mode_t */
*n_args = 2;
break;
}
@@ -1112,8 +1112,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 133: {
struct linux_mknod_args *p = params;
uarg[0] = (intptr_t) p->path; /* char * */
- iarg[1] = p->mode; /* l_int */
- iarg[2] = p->dev; /* l_dev_t */
+ iarg[1] = p->mode; /* l_mode_t */
+ iarg[2] = p->dev; /* l_uint */
*n_args = 3;
break;
}
@@ -1127,7 +1127,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
/* linux_ustat */
case 136: {
struct linux_ustat_args *p = params;
- iarg[0] = p->dev; /* l_dev_t */
+ iarg[0] = p->dev; /* l_uint */
uarg[1] = (intptr_t) p->ubuf; /* struct l_ustat * */
*n_args = 2;
break;
@@ -1382,7 +1382,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 170: {
struct linux_sethostname_args *p = params;
uarg[0] = (intptr_t) p->hostname; /* char * */
- iarg[1] = p->len; /* l_uint */
+ iarg[1] = p->len; /* l_int */
*n_args = 2;
break;
}
@@ -1433,68 +1433,122 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
}
/* linux_setxattr */
case 188: {
- *n_args = 0;
+ struct linux_setxattr_args *p = params;
+ uarg[0] = (intptr_t) p->path; /* const char * */
+ uarg[1] = (intptr_t) p->name; /* const char * */
+ uarg[2] = (intptr_t) p->value; /* const char * */
+ iarg[3] = p->size; /* l_size_t */
+ iarg[4] = p->flags; /* l_int */
+ *n_args = 5;
break;
}
/* linux_lsetxattr */
case 189: {
- *n_args = 0;
+ struct linux_lsetxattr_args *p = params;
+ uarg[0] = (intptr_t) p->path; /* const char * */
+ uarg[1] = (intptr_t) p->name; /* const char * */
+ uarg[2] = (intptr_t) p->value; /* const char * */
+ iarg[3] = p->size; /* l_size_t */
+ iarg[4] = p->flags; /* l_int */
+ *n_args = 5;
break;
}
/* linux_fsetxattr */
case 190: {
- *n_args = 0;
+ struct linux_fsetxattr_args *p = params;
+ iarg[0] = p->fd; /* l_int */
+ uarg[1] = (intptr_t) p->name; /* const char * */
+ uarg[2] = (intptr_t) p->value; /* const char * */
+ iarg[3] = p->size; /* l_size_t */
+ iarg[4] = p->flags; /* l_int */
+ *n_args = 5;
break;
}
/* linux_getxattr */
case 191: {
- *n_args = 0;
+ struct linux_getxattr_args *p = params;
+ uarg[0] = (intptr_t) p->path; /* const char * */
+ uarg[1] = (intptr_t) p->name; /* const char * */
+ uarg[2] = (intptr_t) p->value; /* char * */
+ iarg[3] = p->size; /* l_size_t */
+ *n_args = 4;
break;
}
/* linux_lgetxattr */
case 192: {
- *n_args = 0;
+ struct linux_lgetxattr_args *p = params;
+ uarg[0] = (intptr_t) p->path; /* const char * */
+ uarg[1] = (intptr_t) p->name; /* const char * */
+ uarg[2] = (intptr_t) p->value; /* char * */
+ iarg[3] = p->size; /* l_size_t */
+ *n_args = 4;
break;
}
/* linux_fgetxattr */
case 193: {
- *n_args = 0;
+ struct linux_fgetxattr_args *p = params;
+ iarg[0] = p->fd; /* l_int */
+ uarg[1] = (intptr_t) p->name; /* const char * */
+ uarg[2] = (intptr_t) p->value; /* char * */
+ iarg[3] = p->size; /* l_size_t */
+ *n_args = 4;
break;
}
/* linux_listxattr */
case 194: {
- *n_args = 0;
+ struct linux_listxattr_args *p = params;
+ uarg[0] = (intptr_t) p->path; /* const char * */
+ uarg[1] = (intptr_t) p->list; /* const char * */
+ iarg[2] = p->size; /* l_size_t */
+ *n_args = 3;
break;
}
/* linux_llistxattr */
case 195: {
- *n_args = 0;
+ struct linux_llistxattr_args *p = params;
+ uarg[0] = (intptr_t) p->path; /* const char * */
+ uarg[1] = (intptr_t) p->list; /* const char * */
+ iarg[2] = p->size; /* l_size_t */
+ *n_args = 3;
break;
}
/* linux_flistxattr */
case 196: {
- *n_args = 0;
+ struct linux_flistxattr_args *p = params;
+ iarg[0] = p->fd; /* l_int */
+ uarg[1] = (intptr_t) p->list; /* const char * */
+ iarg[2] = p->size; /* l_size_t */
+ *n_args = 3;
break;
}
/* linux_removexattr */
case 197: {
- *n_args = 0;
+ struct linux_removexattr_args *p = params;
+ uarg[0] = (intptr_t) p->path; /* const char * */
+ uarg[1] = (intptr_t) p->name; /* const char * */
+ *n_args = 2;
break;
}
/* linux_lremovexattr */
case 198: {
- *n_args = 0;
+ struct linux_lremovexattr_args *p = params;
+ uarg[0] = (intptr_t) p->path; /* const char * */
+ uarg[1] = (intptr_t) p->name; /* const char * */
+ *n_args = 2;
break;
}
/* linux_fremovexattr */
case 199: {
- *n_args = 0;
+ struct linux_fremovexattr_args *p = params;
+ iarg[0] = p->fd; /* l_int */
+ uarg[1] = (intptr_t) p->name; /* const char * */
+ *n_args = 2;
break;
}
/* linux_tkill */
case 200: {
struct linux_tkill_args *p = params;
- iarg[0] = p->tid; /* l_int */
+ iarg[0] = p->tid; /* l_pid_t */
iarg[1] = p->sig; /* l_int */
*n_args = 2;
break;
@@ -1683,7 +1737,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 230: {
struct linux_clock_nanosleep_args *p = params;
iarg[0] = p->which; /* clockid_t */
- iarg[1] = p->flags; /* int */
+ iarg[1] = p->flags; /* l_int */
uarg[2] = (intptr_t) p->rqtp; /* struct l_timespec * */
uarg[3] = (intptr_t) p->rmtp; /* struct l_timespec * */
*n_args = 4;
@@ -1719,8 +1773,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
/* linux_tgkill */
case 234: {
struct linux_tgkill_args *p = params;
- iarg[0] = p->tgid; /* l_int */
- iarg[1] = p->pid; /* l_int */
+ iarg[0] = p->tgid; /* l_pid_t */
+ iarg[1] = p->pid; /* l_pid_t */
iarg[2] = p->sig; /* l_int */
*n_args = 3;
break;
@@ -1750,32 +1804,58 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
}
/* linux_mq_open */
case 240: {
- *n_args = 0;
+ struct linux_mq_open_args *p = params;
+ uarg[0] = (intptr_t) p->name; /* const char * */
+ iarg[1] = p->oflag; /* l_int */
+ iarg[2] = p->mode; /* l_mode_t */
+ uarg[3] = (intptr_t) p->attr; /* struct mq_attr * */
+ *n_args = 4;
break;
}
/* linux_mq_unlink */
case 241: {
- *n_args = 0;
+ struct linux_mq_unlink_args *p = params;
+ uarg[0] = (intptr_t) p->name; /* const char * */
+ *n_args = 1;
break;
}
/* linux_mq_timedsend */
case 242: {
- *n_args = 0;
+ struct linux_mq_timedsend_args *p = params;
+ iarg[0] = p->mqd; /* l_mqd_t */
+ uarg[1] = (intptr_t) p->msg_ptr; /* const char * */
+ iarg[2] = p->msg_len; /* l_size_t */
+ iarg[3] = p->msg_prio; /* l_uint */
+ uarg[4] = (intptr_t) p->abs_timeout; /* const struct l_timespec
* */
+ *n_args = 5;
break;
}
/* linux_mq_timedreceive */
case 243: {
- *n_args = 0;
+ struct linux_mq_timedreceive_args *p = params;
+ iarg[0] = p->mqd; /* l_mqd_t */
+ uarg[1] = (intptr_t) p->msg_ptr; /* char * */
+ iarg[2] = p->msg_len; /* l_size_t */
+ uarg[3] = (intptr_t) p->msg_prio; /* l_uint * */
+ uarg[4] = (intptr_t) p->abs_timeout; /* const struct l_timespec
* */
+ *n_args = 5;
break;
}
/* linux_mq_notify */
case 244: {
- *n_args = 0;
+ struct linux_mq_notify_args *p = params;
+ iarg[0] = p->mqd; /* l_mqd_t */
+ uarg[1] = (intptr_t) p->abs_timeout; /* const struct l_timespec
* */
+ *n_args = 2;
break;
}
/* linux_mq_getsetattr */
case 245: {
- *n_args = 0;
+ struct linux_mq_getsetattr_args *p = params;
+ iarg[0] = p->mqd; /* l_mqd_t */
+ uarg[1] = (intptr_t) p->attr; /* const struct mq_attr * */
+ uarg[2] = (intptr_t) p->oattr; /* struct mq_attr * */
+ *n_args = 3;
break;
}
/* linux_kexec_load */
@@ -1845,7 +1925,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
iarg[0] = p->dfd; /* l_int */
uarg[1] = (intptr_t) p->filename; /* const char * */
iarg[2] = p->flags; /* l_int */
- iarg[3] = p->mode; /* l_int */
+ iarg[3] = p->mode; /* l_mode_t */
*n_args = 4;
break;
}
@@ -1854,7 +1934,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
struct linux_mkdirat_args *p = params;
iarg[0] = p->dfd; /* l_int */
uarg[1] = (intptr_t) p->pathname; /* const char * */
- iarg[2] = p->mode; /* l_int */
+ iarg[2] = p->mode; /* l_mode_t */
*n_args = 3;
break;
}
@@ -1863,7 +1943,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
struct linux_mknodat_args *p = params;
iarg[0] = p->dfd; /* l_int */
uarg[1] = (intptr_t) p->filename; /* const char * */
- iarg[2] = p->mode; /* l_int */
+ iarg[2] = p->mode; /* l_mode_t */
iarg[3] = p->dev; /* l_uint */
*n_args = 4;
break;
@@ -1981,7 +2061,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 271: {
struct linux_ppoll_args *p = params;
uarg[0] = (intptr_t) p->fds; /* struct pollfd * */
- uarg[1] = p->nfds; /* uint32_t */
+ iarg[1] = p->nfds; /* l_uint */
uarg[2] = (intptr_t) p->tsp; /* struct l_timespec * */
uarg[3] = (intptr_t) p->sset; /* l_sigset_t * */
iarg[4] = p->ssize; /* l_size_t */
@@ -2026,7 +2106,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
iarg[0] = p->fd; /* l_int */
iarg[1] = p->offset; /* l_loff_t */
iarg[2] = p->nbytes; /* l_loff_t */
- uarg[3] = p->flags; /* unsigned int */
+ iarg[3] = p->flags; /* l_uint */
*n_args = 4;
break;
}
@@ -2116,7 +2196,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
iarg[0] = p->s; /* l_int */
iarg[1] = p->addr; /* l_uintptr_t */
iarg[2] = p->namelen; /* l_uintptr_t */
- iarg[3] = p->flags; /* int */
+ iarg[3] = p->flags; /* l_int */
*n_args = 4;
break;
}
@@ -2143,8 +2223,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
/* linux_dup3 */
case 292: {
struct linux_dup3_args *p = params;
- iarg[0] = p->oldfd; /* l_int */
- iarg[1] = p->newfd; /* l_int */
+ iarg[0] = p->oldfd; /* l_uint */
+ iarg[1] = p->newfd; /* l_uint */
iarg[2] = p->flags; /* l_int */
*n_args = 3;
break;
@@ -2351,7 +2431,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
uarg[1] = (intptr_t) p->oldname; /* const char * */
iarg[2] = p->newdfd; /* l_int */
uarg[3] = (intptr_t) p->newname; /* const char * */
- uarg[4] = p->flags; /* unsigned int */
+ iarg[4] = p->flags; /* l_uint */
*n_args = 5;
break;
}
@@ -2564,7 +2644,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "userland char *";
break;
case 2:
- p = "u_int";
+ p = "l_size_t";
break;
default:
break;
@@ -2580,7 +2660,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "userland char *";
break;
case 2:
- p = "u_int";
+ p = "l_size_t";
break;
default:
break;
@@ -2596,7 +2676,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "l_int";
break;
case 2:
- p = "l_int";
+ p = "l_mode_t";
break;
default:
break;
@@ -2712,13 +2792,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
case 10:
switch(ndx) {
case 0:
- p = "caddr_t";
+ p = "l_ulong";
break;
case 1:
- p = "l_int";
+ p = "l_size_t";
break;
case 2:
- p = "l_int";
+ p = "l_ulong";
break;
default:
break;
@@ -2728,10 +2808,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
case 11:
switch(ndx) {
case 0:
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
