d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "syscallarg_t: Add a type for system call arguments"

Browse Source 
Missed issues in truss on at least armv7 and powerpcspe need to be
resolved before recommit.

This reverts commit 3889fb8af0.
This reverts commit 1544e0f5d1.
This commit is contained in:
Brooks Davis 2022-01-12 23:28:13 +00:00
parent 3889fb8af0
commit 0910a41ef3
27 changed files with 353 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/amd64/amd64/trap.c
View File

@ -1011,7 +1011,7 @@ cpu_fetch_syscall_args_fallback(struct thread *td, struct syscall_args *sa)
{
struct proc *p;
struct trapframe *frame;
syscallarg_t *argp;
register_t *argp;
caddr_t params;
int reg, regcnt, error;

140
sys/amd64/linux/linux_proto.h
View File

@ -23,8 +23,8 @@ struct proc;
struct thread;
#define PAD_(t) (sizeof(syscallarg_t) <= sizeof(t) ? \
0 : sizeof(syscallarg_t) - sizeof(t))
#define PAD_(t) (sizeof(register_t) <= sizeof(t) ? \
0 : sizeof(register_t) - sizeof(t))
#if BYTE_ORDER == LITTLE_ENDIAN
#define PADL_(t) 0
@ -162,7 +162,7 @@ struct linux_shmctl_args {
char buf_l_[PADL_(struct l_shmid_ds *)]; struct l_shmid_ds * buf; char buf_r_[PADR_(struct l_shmid_ds *)];
};
struct linux_pause_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_nanosleep_args {
char rqtp_l_[PADL_(const struct l_timespec *)]; const struct l_timespec * rqtp; char rqtp_r_[PADR_(const struct l_timespec *)];
@ -181,7 +181,7 @@ struct linux_setitimer_args {
char oitv_l_[PADL_(struct l_itimerval *)]; struct l_itimerval * oitv; char oitv_r_[PADR_(struct l_itimerval *)];
};
struct linux_getpid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_sendfile_args {
char out_l_[PADL_(l_int)]; l_int out; char out_r_[PADR_(l_int)];
@ -281,10 +281,10 @@ struct linux_clone_args {
char tls_l_[PADL_(l_ulong)]; l_ulong tls; char tls_r_[PADR_(l_ulong)];
};
struct linux_fork_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_vfork_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_execve_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@ -438,7 +438,7 @@ struct linux_ptrace_args {
char data_l_[PADL_(l_ulong)]; l_ulong data; char data_r_[PADR_(l_ulong)];
};
struct linux_getuid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_syslog_args {
char type_l_[PADL_(l_int)]; l_int type; char type_r_[PADR_(l_int)];
@ -446,10 +446,10 @@ struct linux_syslog_args {
char len_l_[PADL_(l_int)]; l_int len; char len_r_[PADR_(l_int)];
};
struct linux_getgid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getppid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getgroups_args {
char gidsetsize_l_[PADL_(l_int)]; l_int gidsetsize; char gidsetsize_r_[PADR_(l_int)];
@ -559,13 +559,13 @@ struct linux_sched_rr_get_interval_args {
char interval_l_[PADL_(struct l_timespec *)]; struct l_timespec * interval; char interval_r_[PADR_(struct l_timespec *)];
};
struct linux_vhangup_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_modify_ldt_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pivot_root_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_sysctl_args {
char args_l_[PADL_(struct l___sysctl_args *)]; struct l___sysctl_args * args; char args_r_[PADR_(struct l___sysctl_args *)];
@ -582,7 +582,7 @@ struct linux_arch_prctl_args {
char addr_l_[PADL_(l_ulong)]; l_ulong addr; char addr_r_[PADR_(l_ulong)];
};
struct linux_adjtimex_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_setrlimit_args {
char resource_l_[PADL_(l_uint)]; l_uint resource; char resource_r_[PADR_(l_uint)];
@ -600,7 +600,7 @@ struct linux_umount_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_swapoff_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_reboot_args {
char magic1_l_[PADL_(l_int)]; l_int magic1; char magic1_r_[PADR_(l_int)];
@ -620,22 +620,22 @@ struct linux_iopl_args {
char level_l_[PADL_(l_uint)]; l_uint level; char level_r_[PADR_(l_uint)];
};
struct linux_ioperm_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_init_module_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_delete_module_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_quotactl_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_gettid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_readahead_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_setxattr_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
@ -729,28 +729,28 @@ struct linux_sched_getaffinity_args {
char user_mask_ptr_l_[PADL_(l_ulong *)]; l_ulong * user_mask_ptr; char user_mask_ptr_r_[PADR_(l_ulong *)];
};
struct linux_io_setup_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_destroy_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_getevents_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_submit_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_cancel_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_lookup_dcookie_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_epoll_create_args {
char size_l_[PADL_(l_int)]; l_int size; char size_r_[PADR_(l_int)];
};
struct linux_remap_file_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getdents64_args {
char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
@ -761,10 +761,10 @@ struct linux_set_tid_address_args {
char tidptr_l_[PADL_(l_int *)]; l_int * tidptr; char tidptr_r_[PADR_(l_int *)];
};
struct linux_restart_syscall_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_semtimedop_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fadvise64_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
@ -836,13 +836,13 @@ struct linux_utimes_args {
char tptr_l_[PADL_(struct l_timeval *)]; struct l_timeval * tptr; char tptr_r_[PADR_(struct l_timeval *)];
};
struct linux_mbind_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_set_mempolicy_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_get_mempolicy_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mq_open_args {
char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
@ -877,7 +877,7 @@ struct linux_mq_getsetattr_args {
char oattr_l_[PADL_(struct mq_attr *)]; struct mq_attr * oattr; char oattr_r_[PADR_(struct mq_attr *)];
};
struct linux_kexec_load_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_waitid_args {
char idtype_l_[PADL_(l_int)]; l_int idtype; char idtype_r_[PADR_(l_int)];
@ -887,31 +887,31 @@ struct linux_waitid_args {
char rusage_l_[PADL_(struct rusage *)]; struct rusage * rusage; char rusage_r_[PADR_(struct rusage *)];
};
struct linux_add_key_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_request_key_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_keyctl_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ioprio_set_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ioprio_get_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_inotify_init_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_inotify_add_watch_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_inotify_rm_watch_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_migrate_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_openat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -1003,7 +1003,7 @@ struct linux_ppoll_args {
char ssize_l_[PADL_(l_size_t)]; l_size_t ssize; char ssize_r_[PADR_(l_size_t)];
};
struct linux_unshare_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_set_robust_list_args {
char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
@ -1023,7 +1023,7 @@ struct linux_splice_args {
char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
};
struct linux_tee_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_sync_file_range_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
@ -1032,10 +1032,10 @@ struct linux_sync_file_range_args {
char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
};
struct linux_vmsplice_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_move_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_utimensat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -1052,7 +1052,7 @@ struct linux_epoll_pwait_args {
char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_signalfd_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_timerfd_create_args {
char clockid_l_[PADL_(l_int)]; l_int clockid; char clockid_r_[PADR_(l_int)];
@ -1084,7 +1084,7 @@ struct linux_accept4_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_signalfd4_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_eventfd2_args {
char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)];
@ -1126,7 +1126,7 @@ struct linux_rt_tgsigqueueinfo_args {
char uinfo_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * uinfo; char uinfo_r_[PADR_(l_siginfo_t *)];
};
struct linux_perf_event_open_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_recvmmsg_args {
char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
@ -1136,10 +1136,10 @@ struct linux_recvmmsg_args {
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
};
struct linux_fanotify_init_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fanotify_mark_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_prlimit64_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
@ -1160,7 +1160,7 @@ struct linux_open_by_handle_at_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_clock_adjtime_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_syncfs_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
@ -1316,10 +1316,10 @@ struct linux_statx_args {
char statxbuf_l_[PADL_(void *)]; void * statxbuf; char statxbuf_r_[PADR_(void *)];
};
struct linux_io_pgetevents_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_rseq_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_send_signal_args {
char pidfd_l_[PADL_(l_int)]; l_int pidfd; char pidfd_r_[PADR_(l_int)];
@ -1328,47 +1328,47 @@ struct linux_pidfd_send_signal_args {
char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
};
struct linux_io_uring_setup_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_uring_enter_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_uring_register_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_open_tree_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_move_mount_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsopen_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsconfig_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsmount_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fspick_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_open_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_clone3_args {
char uargs_l_[PADL_(struct l_user_clone_args *)]; struct l_user_clone_args * uargs; char uargs_r_[PADR_(struct l_user_clone_args *)];
char usize_l_[PADL_(l_size_t)]; l_size_t usize; char usize_r_[PADR_(l_size_t)];
};
struct linux_close_range_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_openat2_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_getfd_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_faccessat2_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -1377,13 +1377,13 @@ struct linux_faccessat2_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_process_madvise_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_epoll_pwait2_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mount_setattr_args {
syscallarg_t dummy;
register_t dummy;
};
#define nosys linux_nosys
int linux_open(struct thread *, struct linux_open_args *);

2
sys/amd64/linux/linux_sysent.c
View File

@ -12,7 +12,7 @@
#include <amd64/linux/linux.h>
#include <amd64/linux/linux_proto.h>
#define AS(name) (sizeof(struct name) / sizeof(syscallarg_t))
#define AS(name) (sizeof(struct name) / sizeof(register_t))
/* The casts are bogus but will do for now. */
struct sysent linux_sysent[] = {

162
sys/amd64/linux32/linux32_proto.h
View File

@ -23,8 +23,8 @@ struct proc;
struct thread;
#define PAD_(t) (sizeof(syscallarg_t) <= sizeof(t) ? \
0 : sizeof(syscallarg_t) - sizeof(t))
#define PAD_(t) (sizeof(register_t) <= sizeof(t) ? \
0 : sizeof(register_t) - sizeof(t))
#if BYTE_ORDER == LITTLE_ENDIAN
#define PADL_(t) 0
@ -39,7 +39,7 @@ struct linux_exit_args {
char rval_l_[PADL_(int)]; int rval; char rval_r_[PADR_(int)];
};
struct linux_fork_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_open_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@ -97,7 +97,7 @@ struct linux_lseek_args {
char whence_l_[PADL_(l_int)]; l_int whence; char whence_r_[PADR_(l_int)];
};
struct linux_getpid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mount_args {
char specialfile_l_[PADL_(char *)]; char * specialfile; char specialfile_r_[PADR_(char *)];
@ -113,10 +113,10 @@ struct linux_setuid16_args {
char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)];
};
struct linux_getuid16_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_stime_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ptrace_args {
char req_l_[PADL_(l_long)]; l_long req; char req_r_[PADR_(l_long)];
@ -128,7 +128,7 @@ struct linux_alarm_args {
char secs_l_[PADL_(l_uint)]; l_uint secs; char secs_r_[PADR_(l_uint)];
};
struct linux_pause_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_utime_args {
char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)];
@ -169,17 +169,17 @@ struct linux_setgid16_args {
char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)];
};
struct linux_getgid16_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_signal_args {
char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)];
char handler_l_[PADL_(l_handler_t)]; l_handler_t handler; char handler_r_[PADR_(l_handler_t)];
};
struct linux_geteuid16_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getegid16_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_umount_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@ -196,14 +196,14 @@ struct linux_fcntl_args {
char arg_l_[PADL_(uintptr_t)]; uintptr_t arg; char arg_r_[PADR_(uintptr_t)];
};
struct linux_olduname_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ustat_args {
char dev_l_[PADL_(l_dev_t)]; l_dev_t dev; char dev_r_[PADR_(l_dev_t)];
char ubuf_l_[PADL_(struct l_ustat *)]; struct l_ustat * ubuf; char ubuf_r_[PADR_(struct l_ustat *)];
};
struct linux_getppid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_sigaction_args {
char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)];
@ -211,7 +211,7 @@ struct linux_sigaction_args {
char osa_l_[PADL_(l_osigaction_t *)]; l_osigaction_t * osa; char osa_r_[PADR_(l_osigaction_t *)];
};
struct linux_sgetmask_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ssetmask_args {
char mask_l_[PADL_(l_osigset_t)]; l_osigset_t mask; char mask_r_[PADR_(l_osigset_t)];
@ -345,13 +345,13 @@ struct linux_newfstat_args {
char buf_l_[PADL_(struct l_newstat *)]; struct l_newstat * buf; char buf_r_[PADR_(struct l_newstat *)];
};
struct linux_uname_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_iopl_args {
char level_l_[PADL_(l_int)]; l_int level; char level_r_[PADR_(l_int)];
};
struct linux_vhangup_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_wait4_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
@ -360,7 +360,7 @@ struct linux_wait4_args {
char rusage_l_[PADL_(struct l_rusage *)]; struct l_rusage * rusage; char rusage_r_[PADR_(struct l_rusage *)];
};
struct linux_swapoff_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_sysinfo_args {
char info_l_[PADL_(struct l_sysinfo *)]; struct l_sysinfo * info; char info_r_[PADR_(struct l_sysinfo *)];
@ -391,7 +391,7 @@ struct linux_newuname_args {
char buf_l_[PADL_(struct l_new_utsname *)]; struct l_new_utsname * buf; char buf_r_[PADR_(struct l_new_utsname *)];
};
struct linux_adjtimex_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mprotect_args {
char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
@ -404,16 +404,16 @@ struct linux_sigprocmask_args {
char omask_l_[PADL_(l_osigset_t *)]; l_osigset_t * omask; char omask_r_[PADR_(l_osigset_t *)];
};
struct linux_init_module_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_delete_module_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_quotactl_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_bdflush_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_sysfs_args {
char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)];
@ -617,7 +617,7 @@ struct linux_sendfile_args {
char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)];
};
struct linux_vfork_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getrlimit_args {
char resource_l_[PADL_(l_uint)]; l_uint resource; char resource_r_[PADR_(l_uint)];
@ -659,10 +659,10 @@ struct linux_lchown_args {
char gid_l_[PADL_(l_gid_t)]; l_gid_t gid; char gid_r_[PADR_(l_gid_t)];
};
struct linux_getuid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getgid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getgroups_args {
char gidsetsize_l_[PADL_(l_int)]; l_int gidsetsize; char gidsetsize_r_[PADR_(l_int)];
@ -708,7 +708,7 @@ struct linux_fcntl64_args {
char arg_l_[PADL_(uintptr_t)]; uintptr_t arg; char arg_r_[PADR_(uintptr_t)];
};
struct linux_gettid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_setxattr_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
@ -818,7 +818,7 @@ struct linux_exit_group_args {
char error_code_l_[PADL_(int)]; int error_code; char error_code_r_[PADR_(int)];
};
struct linux_lookup_dcookie_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_epoll_create_args {
char size_l_[PADL_(l_int)]; l_int size; char size_r_[PADR_(l_int)];
@ -836,7 +836,7 @@ struct linux_epoll_wait_args {
char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)];
};
struct linux_remap_file_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_set_tid_address_args {
char tidptr_l_[PADL_(int *)]; int * tidptr; char tidptr_r_[PADR_(int *)];
@ -908,13 +908,13 @@ struct linux_fadvise64_64_args {
char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)];
};
struct linux_mbind_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_get_mempolicy_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_set_mempolicy_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mq_open_args {
char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
@ -949,7 +949,7 @@ struct linux_mq_getsetattr_args {
char oattr_l_[PADL_(struct mq_attr *)]; struct mq_attr * oattr; char oattr_r_[PADR_(struct mq_attr *)];
};
struct linux_kexec_load_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_waitid_args {
char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
@ -959,31 +959,31 @@ struct linux_waitid_args {
char rusage_l_[PADL_(struct l_rusage *)]; struct l_rusage * rusage; char rusage_r_[PADR_(struct l_rusage *)];
};
struct linux_add_key_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_request_key_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_keyctl_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ioprio_set_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ioprio_get_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_inotify_init_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_inotify_add_watch_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_inotify_rm_watch_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_migrate_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_openat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -1075,7 +1075,7 @@ struct linux_ppoll_args {
char ssize_l_[PADL_(l_size_t)]; l_size_t ssize; char ssize_r_[PADR_(l_size_t)];
};
struct linux_unshare_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_set_robust_list_args {
char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
@ -1103,13 +1103,13 @@ struct linux_sync_file_range_args {
char flags_l_[PADL_(unsigned int)]; unsigned int flags; char flags_r_[PADR_(unsigned int)];
};
struct linux_tee_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_vmsplice_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_move_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getcpu_args {
char cpu_l_[PADL_(l_uint *)]; l_uint * cpu; char cpu_r_[PADR_(l_uint *)];
@ -1131,7 +1131,7 @@ struct linux_utimensat_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_signalfd_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_timerfd_create_args {
char clockid_l_[PADL_(l_int)]; l_int clockid; char clockid_r_[PADR_(l_int)];
@ -1159,7 +1159,7 @@ struct linux_timerfd_gettime_args {
char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)];
};
struct linux_signalfd4_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_eventfd2_args {
char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)];
@ -1178,7 +1178,7 @@ struct linux_pipe2_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_inotify_init1_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_preadv_args {
char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)];
@ -1201,7 +1201,7 @@ struct linux_rt_tgsigqueueinfo_args {
char uinfo_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * uinfo; char uinfo_r_[PADR_(l_siginfo_t *)];
};
struct linux_perf_event_open_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_recvmmsg_args {
char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
@ -1211,10 +1211,10 @@ struct linux_recvmmsg_args {
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
};
struct linux_fanotify_init_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fanotify_mark_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_prlimit64_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
@ -1235,7 +1235,7 @@ struct linux_open_by_handle_at_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_clock_adjtime_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_syncfs_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
@ -1247,7 +1247,7 @@ struct linux_sendmmsg_args {
char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
};
struct linux_setns_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_process_vm_readv_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
@ -1467,10 +1467,10 @@ struct linux_arch_prctl_args {
char arg2_l_[PADL_(l_ulong)]; l_ulong arg2; char arg2_r_[PADR_(l_ulong)];
};
struct linux_io_pgetevents_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_rseq_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_semget_args {
char key_l_[PADL_(l_key_t)]; l_key_t key; char key_r_[PADR_(l_key_t)];
@ -1532,7 +1532,7 @@ struct linux_clock_settime64_args {
char tp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * tp; char tp_r_[PADR_(struct l_timespec64 *)];
};
struct linux_clock_adjtime64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_clock_getres_time64_args {
char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)];
@ -1545,16 +1545,16 @@ struct linux_clock_nanosleep_time64_args {
char rmtp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * rmtp; char rmtp_r_[PADR_(struct l_timespec64 *)];
};
struct linux_timer_gettime64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_timer_settime64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_timerfd_gettime64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_timerfd_settime64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_utimensat_time64_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -1578,19 +1578,19 @@ struct linux_ppoll_time64_args {
char ssize_l_[PADL_(l_size_t)]; l_size_t ssize; char ssize_r_[PADR_(l_size_t)];
};
struct linux_io_pgetevents_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_recvmmsg_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mq_timedsend_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mq_timedreceive_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_semtimedop_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_rt_sigtimedwait_time64_args {
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];
@ -1607,7 +1607,7 @@ struct linux_sys_futex_time64_args {
char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)];
};
struct linux_sched_rr_get_interval_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_send_signal_args {
char pidfd_l_[PADL_(l_int)]; l_int pidfd; char pidfd_r_[PADR_(l_int)];
@ -1616,47 +1616,47 @@ struct linux_pidfd_send_signal_args {
char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
};
struct linux_io_uring_setup_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_uring_enter_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_uring_register_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_open_tree_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_move_mount_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsopen_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsconfig_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsmount_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fspick_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_open_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_clone3_args {
char uargs_l_[PADL_(struct l_user_clone_args *)]; struct l_user_clone_args * uargs; char uargs_r_[PADR_(struct l_user_clone_args *)];
char usize_l_[PADL_(l_size_t)]; l_size_t usize; char usize_r_[PADR_(l_size_t)];
};
struct linux_close_range_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_openat2_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_getfd_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_faccessat2_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -1665,13 +1665,13 @@ struct linux_faccessat2_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_process_madvise_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_epoll_pwait2_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mount_setattr_args {
syscallarg_t dummy;
register_t dummy;
};
#define nosys linux_nosys
int linux_exit(struct thread *, struct linux_exit_args *);

2
sys/amd64/linux32/linux32_sysent.c
View File

@ -12,7 +12,7 @@
#include <amd64/linux32/linux.h>
#include <amd64/linux32/linux32_proto.h>
#define AS(name) (sizeof(struct name) / sizeof(syscallarg_t))
#define AS(name) (sizeof(struct name) / sizeof(register_t))
/* The casts are bogus but will do for now. */
struct sysent linux32_sysent[] = {

6
sys/arm/arm/syscall.c
View File

@ -100,7 +100,7 @@ int
cpu_fetch_syscall_args(struct thread *td)
{
struct proc *p;
syscallarg_t *ap;
register_t *ap;
struct syscall_args *sa;
u_int nap;
int error;
@ -124,10 +124,10 @@ cpu_fetch_syscall_args(struct thread *td)
else
sa->callp = &p->p_sysent->sv_table[sa->code];
error = 0;
memcpy(sa->args, ap, nap * sizeof(*sa->args));
memcpy(sa->args, ap, nap * sizeof(register_t));
if (sa->callp->sy_narg > nap) {
error = copyin((void *)td->td_frame->tf_usr_sp, sa->args +
nap, (sa->callp->sy_narg - nap) * sizeof(*sa->args));
nap, (sa->callp->sy_narg - nap) * sizeof(register_t));
}
if (error == 0) {
td->td_retval[0] = 0;

4
sys/arm64/arm64/trap.c
View File

@ -134,7 +134,7 @@ int
cpu_fetch_syscall_args(struct thread *td)
{
struct proc *p;
syscallarg_t *ap, *dst_ap;
register_t *ap, *dst_ap;
struct syscall_args *sa;
p = td->td_proc;
@ -159,7 +159,7 @@ cpu_fetch_syscall_args(struct thread *td)
KASSERT(sa->callp->sy_narg <= nitems(sa->args),
("Syscall %d takes too many arguments", sa->code));
memcpy(dst_ap, ap, (nitems(sa->args) - 1) * sizeof(*dst_ap));
memcpy(dst_ap, ap, (nitems(sa->args) - 1) * sizeof(register_t));
td->td_retval[0] = 0;
td->td_retval[1] = 0;

114
sys/arm64/linux/linux_proto.h
View File

@ -23,8 +23,8 @@ struct proc;
struct thread;
#define PAD_(t) (sizeof(syscallarg_t) <= sizeof(t) ? \
0 : sizeof(syscallarg_t) - sizeof(t))
#define PAD_(t) (sizeof(register_t) <= sizeof(t) ? \
0 : sizeof(register_t) - sizeof(t))
#if BYTE_ORDER == LITTLE_ENDIAN
#define PADL_(t) 0
@ -106,7 +106,7 @@ struct linux_getcwd_args {
char bufsize_l_[PADL_(l_ulong)]; l_ulong bufsize; char bufsize_r_[PADR_(l_ulong)];
};
struct linux_lookup_dcookie_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_eventfd2_args {
char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)];
@ -143,10 +143,10 @@ struct linux_inotify_init1_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_inotify_add_watch_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_inotify_rm_watch_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ioctl_args {
char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
@ -154,10 +154,10 @@ struct linux_ioctl_args {
char arg_l_[PADL_(l_ulong)]; l_ulong arg; char arg_r_[PADR_(l_ulong)];
};
struct linux_ioprio_set_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ioprio_get_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mknodat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -201,7 +201,7 @@ struct linux_mount_args {
char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
};
struct linux_pivot_root_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_statfs_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@ -252,7 +252,7 @@ struct linux_openat_args {
char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char mode_r_[PADR_(l_mode_t)];
};
struct linux_vhangup_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pipe2_args {
char pipefds_l_[PADL_(l_int *)]; l_int * pipefds; char pipefds_r_[PADR_(l_int *)];
@ -316,10 +316,10 @@ struct linux_ppoll_args {
char ssize_l_[PADL_(l_size_t)]; l_size_t ssize; char ssize_r_[PADR_(l_size_t)];
};
struct linux_signalfd4_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_vmsplice_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_splice_args {
char fd_in_l_[PADL_(int)]; int fd_in; char fd_in_r_[PADR_(int)];
@ -330,7 +330,7 @@ struct linux_splice_args {
char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
};
struct linux_tee_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_readlinkat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -405,7 +405,7 @@ struct linux_set_tid_address_args {
char tidptr_l_[PADL_(l_int *)]; l_int * tidptr; char tidptr_r_[PADR_(l_int *)];
};
struct linux_unshare_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_sys_futex_args {
char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];
@ -438,13 +438,13 @@ struct linux_setitimer_args {
char oitv_l_[PADL_(struct l_itimerval *)]; struct l_itimerval * oitv; char oitv_r_[PADR_(struct l_itimerval *)];
};
struct linux_kexec_load_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_init_module_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_delete_module_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_timer_create_args {
char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)];
@ -581,7 +581,7 @@ struct linux_rt_sigqueueinfo_args {
char info_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * info; char info_r_[PADR_(l_siginfo_t *)];
};
struct linux_rt_sigreturn_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getpriority_args {
char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)];
@ -645,22 +645,22 @@ struct linux_getcpu_args {
char cache_l_[PADL_(void *)]; void * cache; char cache_r_[PADR_(void *)];
};
struct linux_adjtimex_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getpid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getppid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getuid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getgid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_gettid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_sysinfo_args {
char info_l_[PADL_(struct l_sysinfo *)]; struct l_sysinfo * info; char info_r_[PADR_(struct l_sysinfo *)];
@ -731,7 +731,7 @@ struct linux_semctl_args {
char arg_l_[PADL_(union l_semun)]; union l_semun arg; char arg_r_[PADR_(union l_semun)];
};
struct linux_semtimedop_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_semop_args {
char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)];
@ -851,13 +851,13 @@ struct linux_mremap_args {
char new_addr_l_[PADL_(l_ulong)]; l_ulong new_addr; char new_addr_r_[PADR_(l_ulong)];
};
struct linux_add_key_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_request_key_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_keyctl_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_clone_args {
char flags_l_[PADL_(l_ulong)]; l_ulong flags; char flags_r_[PADR_(l_ulong)];
@ -886,7 +886,7 @@ struct linux_fadvise64_args {
char advice_l_[PADL_(l_int)]; l_int advice; char advice_r_[PADR_(l_int)];
};
struct linux_swapoff_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mprotect_args {
char addr_l_[PADL_(l_ulong)]; l_ulong addr; char addr_r_[PADR_(l_ulong)];
@ -909,22 +909,22 @@ struct linux_madvise_args {
char behav_l_[PADL_(l_int)]; l_int behav; char behav_r_[PADR_(l_int)];
};
struct linux_remap_file_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mbind_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_get_mempolicy_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_set_mempolicy_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_migrate_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_move_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_rt_tgsigqueueinfo_args {
char tgid_l_[PADL_(l_pid_t)]; l_pid_t tgid; char tgid_r_[PADR_(l_pid_t)];
@ -933,7 +933,7 @@ struct linux_rt_tgsigqueueinfo_args {
char uinfo_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * uinfo; char uinfo_r_[PADR_(l_siginfo_t *)];
};
struct linux_perf_event_open_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_accept4_args {
char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
@ -961,10 +961,10 @@ struct linux_prlimit64_args {
char old_l_[PADL_(struct rlimit *)]; struct rlimit * old; char old_r_[PADR_(struct rlimit *)];
};
struct linux_fanotify_init_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fanotify_mark_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_name_to_handle_at_args {
char dirfd_l_[PADL_(l_int)]; l_int dirfd; char dirfd_r_[PADR_(l_int)];
@ -979,7 +979,7 @@ struct linux_open_by_handle_at_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_clock_adjtime_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_syncfs_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
@ -1123,13 +1123,13 @@ struct linux_statx_args {
char statxbuf_l_[PADL_(void *)]; void * statxbuf; char statxbuf_r_[PADR_(void *)];
};
struct linux_io_pgetevents_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_rseq_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_kexec_file_load_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_send_signal_args {
char pidfd_l_[PADL_(l_int)]; l_int pidfd; char pidfd_r_[PADR_(l_int)];
@ -1138,47 +1138,47 @@ struct linux_pidfd_send_signal_args {
char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
};
struct linux_io_uring_setup_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_uring_enter_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_uring_register_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_open_tree_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_move_mount_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsopen_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsconfig_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsmount_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fspick_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_open_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_clone3_args {
char uargs_l_[PADL_(struct l_user_clone_args *)]; struct l_user_clone_args * uargs; char uargs_r_[PADR_(struct l_user_clone_args *)];
char usize_l_[PADL_(l_size_t)]; l_size_t usize; char usize_r_[PADR_(l_size_t)];
};
struct linux_close_range_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_openat2_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_getfd_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_faccessat2_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -1187,13 +1187,13 @@ struct linux_faccessat2_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_process_madvise_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_epoll_pwait2_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mount_setattr_args {
syscallarg_t dummy;
register_t dummy;
};
#define nosys linux_nosys
int linux_setxattr(struct thread *, struct linux_setxattr_args *);

2
sys/arm64/linux/linux_sysent.c
View File

@ -12,7 +12,7 @@
#include <arm64/linux/linux.h>
#include <arm64/linux/linux_proto.h>
#define AS(name) (sizeof(struct name) / sizeof(syscallarg_t))
#define AS(name) (sizeof(struct name) / sizeof(register_t))
/* The casts are bogus but will do for now. */
struct sysent linux_sysent[] = {

4
sys/compat/freebsd32/freebsd32_proto.h
View File

@ -23,8 +23,8 @@ struct proc;
struct thread;
#define PAD_(t) (sizeof(syscallarg_t) <= sizeof(t) ? \
0 : sizeof(syscallarg_t) - sizeof(t))
#define PAD_(t) (sizeof(register_t) <= sizeof(t) ? \
0 : sizeof(register_t) - sizeof(t))
#if BYTE_ORDER == LITTLE_ENDIAN
#define PADL_(t) 0

2
sys/compat/freebsd32/freebsd32_sysent.c
View File

@ -10,7 +10,7 @@
#include <sys/sysproto.h>
#include <compat/freebsd32/freebsd32_proto.h>
#define AS(name) (sizeof(struct name) / sizeof(syscallarg_t))
#define AS(name) (sizeof(struct name) / sizeof(register_t))
#ifdef COMPAT_43
#define compat(n, name) .sy_narg = n, .sy_call = (sy_call_t *)__CONCAT(o, name)

166
sys/i386/linux/linux_proto.h
View File

@ -23,8 +23,8 @@ struct proc;
struct thread;
#define PAD_(t) (sizeof(syscallarg_t) <= sizeof(t) ? \
0 : sizeof(syscallarg_t) - sizeof(t))
#define PAD_(t) (sizeof(register_t) <= sizeof(t) ? \
0 : sizeof(register_t) - sizeof(t))
#if BYTE_ORDER == LITTLE_ENDIAN
#define PADL_(t) 0
@ -39,7 +39,7 @@ struct linux_exit_args {
char rval_l_[PADL_(int)]; int rval; char rval_r_[PADR_(int)];
};
struct linux_fork_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_open_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@ -97,7 +97,7 @@ struct linux_lseek_args {
char whence_l_[PADL_(l_int)]; l_int whence; char whence_r_[PADR_(l_int)];
};
struct linux_getpid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mount_args {
char specialfile_l_[PADL_(char *)]; char * specialfile; char specialfile_r_[PADR_(char *)];
@ -113,10 +113,10 @@ struct linux_setuid16_args {
char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)];
};
struct linux_getuid16_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_stime_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ptrace_args {
char req_l_[PADL_(l_long)]; l_long req; char req_r_[PADR_(l_long)];
@ -132,7 +132,7 @@ struct linux_fstat_args {
char up_l_[PADL_(struct linux_stat *)]; struct linux_stat * up; char up_r_[PADR_(struct linux_stat *)];
};
struct linux_pause_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_utime_args {
char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)];
@ -173,17 +173,17 @@ struct linux_setgid16_args {
char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)];
};
struct linux_getgid16_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_signal_args {
char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)];
char handler_l_[PADL_(void *)]; void * handler; char handler_r_[PADR_(void *)];
};
struct linux_geteuid16_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getegid16_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_umount_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@ -200,14 +200,14 @@ struct linux_fcntl_args {
char arg_l_[PADL_(l_ulong)]; l_ulong arg; char arg_r_[PADR_(l_ulong)];
};
struct linux_olduname_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ustat_args {
char dev_l_[PADL_(l_dev_t)]; l_dev_t dev; char dev_r_[PADR_(l_dev_t)];
char ubuf_l_[PADL_(struct l_ustat *)]; struct l_ustat * ubuf; char ubuf_r_[PADR_(struct l_ustat *)];
};
struct linux_getppid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_sigaction_args {
char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)];
@ -215,7 +215,7 @@ struct linux_sigaction_args {
char osa_l_[PADL_(l_osigaction_t *)]; l_osigaction_t * osa; char osa_r_[PADR_(l_osigaction_t *)];
};
struct linux_sgetmask_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ssetmask_args {
char mask_l_[PADL_(l_osigset_t)]; l_osigset_t mask; char mask_r_[PADR_(l_osigset_t)];
@ -345,16 +345,16 @@ struct linux_newfstat_args {
char buf_l_[PADL_(struct l_newstat *)]; struct l_newstat * buf; char buf_r_[PADR_(struct l_newstat *)];
};
struct linux_uname_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_iopl_args {
char level_l_[PADL_(l_int)]; l_int level; char level_r_[PADR_(l_int)];
};
struct linux_vhangup_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_vm86old_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_wait4_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
@ -363,7 +363,7 @@ struct linux_wait4_args {
char rusage_l_[PADL_(void *)]; void * rusage; char rusage_r_[PADR_(void *)];
};
struct linux_swapoff_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_sysinfo_args {
char info_l_[PADL_(struct l_sysinfo *)]; struct l_sysinfo * info; char info_r_[PADR_(struct l_sysinfo *)];
@ -399,7 +399,7 @@ struct linux_modify_ldt_args {
char bytecount_l_[PADL_(l_ulong)]; l_ulong bytecount; char bytecount_r_[PADR_(l_ulong)];
};
struct linux_adjtimex_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mprotect_args {
char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
@ -412,16 +412,16 @@ struct linux_sigprocmask_args {
char omask_l_[PADL_(l_osigset_t *)]; l_osigset_t * omask; char omask_r_[PADR_(l_osigset_t *)];
};
struct linux_init_module_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_delete_module_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_quotactl_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_bdflush_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_sysfs_args {
char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)];
@ -518,7 +518,7 @@ struct linux_getresuid16_args {
char suid_l_[PADL_(l_uid16_t *)]; l_uid16_t * suid; char suid_r_[PADR_(l_uid16_t *)];
};
struct linux_vm86_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_poll_args {
char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)];
@ -616,7 +616,7 @@ struct linux_sendfile_args {
char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)];
};
struct linux_vfork_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getrlimit_args {
char resource_l_[PADL_(l_uint)]; l_uint resource; char resource_r_[PADR_(l_uint)];
@ -656,10 +656,10 @@ struct linux_lchown_args {
char gid_l_[PADL_(l_gid_t)]; l_gid_t gid; char gid_r_[PADR_(l_gid_t)];
};
struct linux_getuid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getgid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getgroups_args {
char gidsetsize_l_[PADL_(l_int)]; l_int gidsetsize; char gidsetsize_r_[PADR_(l_int)];
@ -705,7 +705,7 @@ struct linux_fcntl64_args {
char arg_l_[PADL_(l_ulong)]; l_ulong arg; char arg_r_[PADR_(l_ulong)];
};
struct linux_gettid_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_setxattr_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
@ -817,7 +817,7 @@ struct linux_exit_group_args {
char error_code_l_[PADL_(int)]; int error_code; char error_code_r_[PADR_(int)];
};
struct linux_lookup_dcookie_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_epoll_create_args {
char size_l_[PADL_(l_int)]; l_int size; char size_r_[PADR_(l_int)];
@ -835,7 +835,7 @@ struct linux_epoll_wait_args {
char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)];
};
struct linux_remap_file_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_set_tid_address_args {
char tidptr_l_[PADL_(int *)]; int * tidptr; char tidptr_r_[PADR_(int *)];
@ -905,13 +905,13 @@ struct linux_fadvise64_64_args {
char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)];
};
struct linux_mbind_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_get_mempolicy_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_set_mempolicy_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mq_open_args {
char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
@ -946,7 +946,7 @@ struct linux_mq_getsetattr_args {
char oattr_l_[PADL_(struct mq_attr *)]; struct mq_attr * oattr; char oattr_r_[PADR_(struct mq_attr *)];
};
struct linux_kexec_load_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_waitid_args {
char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
@ -956,31 +956,31 @@ struct linux_waitid_args {
char rusage_l_[PADL_(void *)]; void * rusage; char rusage_r_[PADR_(void *)];
};
struct linux_add_key_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_request_key_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_keyctl_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ioprio_set_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_ioprio_get_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_inotify_init_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_inotify_add_watch_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_inotify_rm_watch_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_migrate_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_openat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -1072,7 +1072,7 @@ struct linux_ppoll_args {
char ssize_l_[PADL_(l_size_t)]; l_size_t ssize; char ssize_r_[PADR_(l_size_t)];
};
struct linux_unshare_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_set_robust_list_args {
char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
@ -1098,13 +1098,13 @@ struct linux_sync_file_range_args {
char flags_l_[PADL_(unsigned int)]; unsigned int flags; char flags_r_[PADR_(unsigned int)];
};
struct linux_tee_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_vmsplice_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_move_pages_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_getcpu_args {
char cpu_l_[PADL_(l_uint *)]; l_uint * cpu; char cpu_r_[PADR_(l_uint *)];
@ -1126,7 +1126,7 @@ struct linux_utimensat_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_signalfd_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_timerfd_create_args {
char clockid_l_[PADL_(l_int)]; l_int clockid; char clockid_r_[PADR_(l_int)];
@ -1152,7 +1152,7 @@ struct linux_timerfd_gettime_args {
char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)];
};
struct linux_signalfd4_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_eventfd2_args {
char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)];
@ -1171,7 +1171,7 @@ struct linux_pipe2_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_inotify_init1_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_preadv_args {
char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)];
@ -1194,7 +1194,7 @@ struct linux_rt_tgsigqueueinfo_args {
char uinfo_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * uinfo; char uinfo_r_[PADR_(l_siginfo_t *)];
};
struct linux_perf_event_open_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_recvmmsg_args {
char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
@ -1204,10 +1204,10 @@ struct linux_recvmmsg_args {
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
};
struct linux_fanotify_init_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fanotify_mark_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_prlimit64_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
@ -1228,7 +1228,7 @@ struct linux_open_by_handle_at_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_clock_adjtime_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_syncfs_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
@ -1240,7 +1240,7 @@ struct linux_sendmmsg_args {
char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
};
struct linux_setns_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_process_vm_readv_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
@ -1460,10 +1460,10 @@ struct linux_arch_prctl_args {
char arg2_l_[PADL_(l_ulong)]; l_ulong arg2; char arg2_r_[PADR_(l_ulong)];
};
struct linux_io_pgetevents_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_rseq_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_semget_args {
char key_l_[PADL_(l_key_t)]; l_key_t key; char key_r_[PADR_(l_key_t)];
@ -1525,7 +1525,7 @@ struct linux_clock_settime64_args {
char tp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * tp; char tp_r_[PADR_(struct l_timespec64 *)];
};
struct linux_clock_adjtime64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_clock_getres_time64_args {
char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)];
@ -1538,16 +1538,16 @@ struct linux_clock_nanosleep_time64_args {
char rmtp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * rmtp; char rmtp_r_[PADR_(struct l_timespec64 *)];
};
struct linux_timer_gettime64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_timer_settime64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_timerfd_gettime64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_timerfd_settime64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_utimensat_time64_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -1571,19 +1571,19 @@ struct linux_ppoll_time64_args {
char ssize_l_[PADL_(l_size_t)]; l_size_t ssize; char ssize_r_[PADR_(l_size_t)];
};
struct linux_io_pgetevents_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_recvmmsg_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mq_timedsend_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mq_timedreceive_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_semtimedop_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_rt_sigtimedwait_time64_args {
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];
@ -1600,7 +1600,7 @@ struct linux_sys_futex_time64_args {
char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)];
};
struct linux_sched_rr_get_interval_time64_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_send_signal_args {
char pidfd_l_[PADL_(l_int)]; l_int pidfd; char pidfd_r_[PADR_(l_int)];
@ -1609,47 +1609,47 @@ struct linux_pidfd_send_signal_args {
char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
};
struct linux_io_uring_setup_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_uring_enter_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_io_uring_register_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_open_tree_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_move_mount_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsopen_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsconfig_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fsmount_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_fspick_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_open_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_clone3_args {
char uargs_l_[PADL_(struct l_user_clone_args *)]; struct l_user_clone_args * uargs; char uargs_r_[PADR_(struct l_user_clone_args *)];
char usize_l_[PADL_(l_size_t)]; l_size_t usize; char usize_r_[PADR_(l_size_t)];
};
struct linux_close_range_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_openat2_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_pidfd_getfd_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_faccessat2_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@ -1658,13 +1658,13 @@ struct linux_faccessat2_args {
char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_process_madvise_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_epoll_pwait2_args {
syscallarg_t dummy;
register_t dummy;
};
struct linux_mount_setattr_args {
syscallarg_t dummy;
register_t dummy;
};
#define nosys linux_nosys
int linux_exit(struct thread *, struct linux_exit_args *);

2
sys/i386/linux/linux_sysent.c
View File

@ -12,7 +12,7 @@
#include <i386/linux/linux.h>
#include <i386/linux/linux_proto.h>
#define AS(name) (sizeof(struct name) / sizeof(syscallarg_t))
#define AS(name) (sizeof(struct name) / sizeof(register_t))
/* The casts are bogus but will do for now. */
struct sysent linux_sysent[] = {

2
sys/kern/init_sysent.c
View File

@ -9,7 +9,7 @@
#include <sys/sysent.h>
#include <sys/sysproto.h>
#define AS(name) (sizeof(struct name) / sizeof(syscallarg_t))
#define AS(name) (sizeof(struct name) / sizeof(register_t))
#ifdef COMPAT_43
#define compat(n, name) .sy_narg = n, .sy_call = (sy_call_t *)__CONCAT(o, name)

2
sys/kern/kern_ktrace.c
View File

@ -524,7 +524,7 @@ ktr_get_tracevp(struct proc *p, bool ref)
}
void
ktrsyscall(int code, int narg, syscallarg_t args[])
ktrsyscall(int code, int narg, register_t args[])
{
struct ktr_request *req;
struct ktr_syscall *ktp;

4
sys/kern/sys_process.c
View File

@ -474,7 +474,7 @@ sys_ptrace(struct thread *td, struct ptrace_args *uap)
struct dbreg dbreg;
struct fpreg fpreg;
struct reg reg;
syscallarg_t args[nitems(td->td_sa.args)];
char args[sizeof(td->td_sa.args)];
struct ptrace_sc_ret psr;
int ptevents;
} r;
@ -1010,7 +1010,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data)
/* See the explanation in linux_ptrace_get_syscall_info(). */
bcopy(td2->td_sa.args, addr, SV_PROC_ABI(td->td_proc) ==
SV_ABI_LINUX ? sizeof(td2->td_sa.args) :
td2->td_sa.callp->sy_narg * sizeof(syscallarg_t));
td2->td_sa.callp->sy_narg * sizeof(register_t));
break;
case PT_GET_SC_RET:

4
sys/riscv/riscv/trap.c
View File

@ -94,7 +94,7 @@ int
cpu_fetch_syscall_args(struct thread *td)
{
struct proc *p;
syscallarg_t *ap, *dst_ap;
register_t *ap, *dst_ap;
struct syscall_args *sa;
p = td->td_proc;
@ -119,7 +119,7 @@ cpu_fetch_syscall_args(struct thread *td)
KASSERT(sa->callp->sy_narg <= nitems(sa->args),
("Syscall %d takes too many arguments", sa->code));
memcpy(dst_ap, ap, (NARGREG - 1) * sizeof(*dst_ap));
memcpy(dst_ap, ap, (NARGREG - 1) * sizeof(register_t));
td->td_retval[0] = 0;
td->td_retval[1] = 0;

2
sys/sys/ktrace.h
View File

@ -284,7 +284,7 @@ void ktrpsig(int, sig_t, sigset_t *, int);
void ktrfault(vm_offset_t, int);
void ktrfaultend(int);
void ktrgenio(int, enum uio_rw, struct uio *, int);
void ktrsyscall(int, int narg, syscallarg_t args[]);
void ktrsyscall(int, int narg, register_t args[]);
void ktrsysctl(int *name, u_int namelen);
void ktrsysret(int, int, register_t);
void ktrprocctor(struct proc *);

2
sys/sys/proc.h
View File

@ -357,7 +357,7 @@ struct thread {
} td_state; /* (t) thread state */
/* Note: td_state must be accessed using TD_{GET,SET}_STATE(). */
union {
syscallarg_t tdu_retval[2];
register_t tdu_retval[2];
off_t tdu_off;
} td_uretoff; /* (k) Syscall aux returns. */
#define td_retval td_uretoff.tdu_retval

2
sys/sys/ptrace.h
View File

@ -160,7 +160,7 @@ struct ptrace_lwpinfo32 {
/* Argument structure for PT_GET_SC_RET. */
struct ptrace_sc_ret {
syscallarg_t sr_retval[2]; /* Only valid if sr_error == 0. */
register_t sr_retval[2]; /* Only valid if sr_error == 0. */
int sr_error;
};

54
sys/sys/sysproto.h
View File

@ -23,8 +23,8 @@ struct proc;
struct thread;
#define PAD_(t) (sizeof(syscallarg_t) <= sizeof(t) ? \
0 : sizeof(syscallarg_t) - sizeof(t))
#define PAD_(t) (sizeof(register_t) <= sizeof(t) ? \
0 : sizeof(register_t) - sizeof(t))
#if BYTE_ORDER == LITTLE_ENDIAN
#define PADL_(t) 0
@ -38,7 +38,7 @@ struct exit_args {
char rval_l_[PADL_(int)]; int rval; char rval_r_[PADR_(int)];
};
struct fork_args {
syscallarg_t dummy;
register_t dummy;
};
struct read_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
@ -90,7 +90,7 @@ struct break_args {
char nsize_l_[PADL_(char *)]; char * nsize; char nsize_r_[PADR_(char *)];
};
struct getpid_args {
syscallarg_t dummy;
register_t dummy;
};
struct mount_args {
char type_l_[PADL_(const char *)]; const char * type; char type_r_[PADR_(const char *)];
@ -106,10 +106,10 @@ struct setuid_args {
char uid_l_[PADL_(uid_t)]; uid_t uid; char uid_r_[PADR_(uid_t)];
};
struct getuid_args {
syscallarg_t dummy;
register_t dummy;
};
struct geteuid_args {
syscallarg_t dummy;
register_t dummy;
};
struct ptrace_args {
char req_l_[PADL_(int)]; int req; char req_r_[PADR_(int)];
@ -163,23 +163,23 @@ struct fchflags_args {
char flags_l_[PADL_(u_long)]; u_long flags; char flags_r_[PADR_(u_long)];
};
struct sync_args {
syscallarg_t dummy;
register_t dummy;
};
struct kill_args {
char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)];
char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
};
struct getppid_args {
syscallarg_t dummy;
register_t dummy;
};
struct dup_args {
char fd_l_[PADL_(u_int)]; u_int fd; char fd_r_[PADR_(u_int)];
};
struct freebsd10_pipe_args {
syscallarg_t dummy;
register_t dummy;
};
struct getegid_args {
syscallarg_t dummy;
register_t dummy;
};
struct profil_args {
char samples_l_[PADL_(char *)]; char * samples; char samples_r_[PADR_(char *)];
@ -194,7 +194,7 @@ struct ktrace_args {
char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)];
};
struct getgid_args {
syscallarg_t dummy;
register_t dummy;
};
struct getlogin_args {
char namebuf_l_[PADL_(char *)]; char * namebuf; char namebuf_r_[PADR_(char *)];
@ -207,7 +207,7 @@ struct acct_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
};
struct osigpending_args {
syscallarg_t dummy;
register_t dummy;
};
struct sigaltstack_args {
char ss_l_[PADL_(const struct sigaltstack *)]; const struct sigaltstack * ss; char ss_r_[PADR_(const struct sigaltstack *)];
@ -245,7 +245,7 @@ struct chroot_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
};
struct ogetpagesize_args {
syscallarg_t dummy;
register_t dummy;
};
struct msync_args {
char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)];
@ -253,7 +253,7 @@ struct msync_args {
char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
};
struct vfork_args {
syscallarg_t dummy;
register_t dummy;
};
struct sbrk_args {
char incr_l_[PADL_(int)]; int incr; char incr_r_[PADR_(int)];
@ -289,7 +289,7 @@ struct setgroups_args {
char gidset_l_[PADL_(const gid_t *)]; const gid_t * gidset; char gidset_r_[PADR_(const gid_t *)];
};
struct getpgrp_args {
syscallarg_t dummy;
register_t dummy;
};
struct setpgid_args {
char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)];
@ -301,7 +301,7 @@ struct setitimer_args {
char oitv_l_[PADL_(struct itimerval *)]; struct itimerval * oitv; char oitv_r_[PADR_(struct itimerval *)];
};
struct owait_args {
syscallarg_t dummy;
register_t dummy;
};
struct swapon_args {
char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
@ -311,7 +311,7 @@ struct getitimer_args {
char itv_l_[PADL_(struct itimerval *)]; struct itimerval * itv; char itv_r_[PADR_(struct itimerval *)];
};
struct getdtablesize_args {
syscallarg_t dummy;
register_t dummy;
};
struct dup2_args {
char from_l_[PADL_(u_int)]; u_int from; char from_r_[PADR_(u_int)];
@ -459,10 +459,10 @@ struct adjtime_args {
char olddelta_l_[PADL_(struct timeval *)]; struct timeval * olddelta; char olddelta_r_[PADR_(struct timeval *)];
};
struct ogethostid_args {
syscallarg_t dummy;
register_t dummy;
};
struct setsid_args {
syscallarg_t dummy;
register_t dummy;
};
struct quotactl_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
@ -471,7 +471,7 @@ struct quotactl_args {
char arg_l_[PADL_(void *)]; void * arg; char arg_r_[PADR_(void *)];
};
struct oquota_args {
syscallarg_t dummy;
register_t dummy;
};
struct nlm_syscall_args {
char debug_level_l_[PADL_(int)]; int debug_level; char debug_level_r_[PADR_(int)];
@ -692,7 +692,7 @@ struct rfork_args {
char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
};
struct issetugid_args {
syscallarg_t dummy;
register_t dummy;
};
struct lchown_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
@ -796,13 +796,13 @@ struct aio_error_args {
char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)];
};
struct yield_args {
syscallarg_t dummy;
register_t dummy;
};
struct mlockall_args {
char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)];
};
struct munlockall_args {
syscallarg_t dummy;
register_t dummy;
};
struct __getcwd_args {
char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
@ -825,7 +825,7 @@ struct sched_getscheduler_args {
char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
};
struct sched_yield_args {
syscallarg_t dummy;
register_t dummy;
};
struct sched_get_priority_max_args {
char policy_l_[PADL_(int)]; int policy; char policy_r_[PADR_(int)];
@ -955,7 +955,7 @@ struct getresgid_args {
char sgid_l_[PADL_(gid_t *)]; gid_t * sgid; char sgid_r_[PADR_(gid_t *)];
};
struct kqueue_args {
syscallarg_t dummy;
register_t dummy;
};
struct extattr_set_fd_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
@ -1525,7 +1525,7 @@ struct __cap_rights_get_args {
char rightsp_l_[PADL_(cap_rights_t *)]; cap_rights_t * rightsp; char rightsp_r_[PADR_(cap_rights_t *)];
};
struct cap_enter_args {
syscallarg_t dummy;
register_t dummy;
};
struct cap_getmode_args {
char modep_l_[PADL_(u_int *)]; u_int * modep; char modep_r_[PADR_(u_int *)];
@ -1849,7 +1849,7 @@ struct fspacectl_args {
char rmsr_l_[PADL_(struct spacectl_range *)]; struct spacectl_range * rmsr; char rmsr_r_[PADR_(struct spacectl_range *)];
};
struct sched_getcpu_args {
syscallarg_t dummy;
register_t dummy;
};
struct swapoff_args {
char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];

2
sys/sys/types.h
View File

@ -270,8 +270,6 @@ typedef __vm_size_t vm_size_t;
typedef __rman_res_t rman_res_t;
typedef __register_t syscallarg_t;
#ifdef _KERNEL
typedef int boolean_t;
typedef struct _device *device_t;

10
sys/tools/makesyscalls.lua
View File

@ -860,7 +860,7 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype,
write_line("sysarg", "};\n")
else
write_line("sysarg", string.format(
"struct %s {\n\tsyscallarg_t dummy;\n};\n", argalias))
"struct %s {\n\tregister_t dummy;\n};\n", argalias))
end
end
@ -986,7 +986,7 @@ local function handle_compat(sysnum, thr_flag, flags, sysflags, rettype,
write_line(out, "};\n")
elseif flags & nargflags == 0 then
write_line("sysarg", string.format(
"struct %s {\n\tsyscallarg_t dummy;\n};\n", argalias))
"struct %s {\n\tregister_t dummy;\n};\n", argalias))
end
if flags & dprotoflags == 0 then
write_line(outdcl, string.format(
@ -1439,8 +1439,8 @@ struct proc;
struct thread;
#define PAD_(t) (sizeof(syscallarg_t) <= sizeof(t) ? \
0 : sizeof(syscallarg_t) - sizeof(t))
#define PAD_(t) (sizeof(register_t) <= sizeof(t) ? \
0 : sizeof(register_t) - sizeof(t))
#if BYTE_ORDER == LITTLE_ENDIAN
#define PADL_(t) 0
@ -1530,7 +1530,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
process_sysfile(sysfile)
write_line("sysinc",
"\n#define AS(name) (sizeof(struct name) / sizeof(syscallarg_t))\n")
"\n#define AS(name) (sizeof(struct name) / sizeof(register_t))\n")
for _, v in pairs(compat_options) do
if v["count"] > 0 then

2
sys/vm/vm_mmap.c
View File

@ -420,7 +420,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp)
}
if (error == 0)
td->td_retval[0] = addr + pageoff;
td->td_retval[0] = (register_t) (addr + pageoff);
done:
if (fp)
fdrop(fp, td);

8
usr.bin/truss/syscall.h
View File

@ -227,7 +227,7 @@ struct syscall {
};
struct syscall *get_syscall(struct threadinfo *, u_int, u_int);
char *print_arg(struct syscall_arg *, unsigned long *, syscallarg_t *,
char *print_arg(struct syscall_arg *, unsigned long *, register_t *,
struct trussinfo *);
/*
@ -251,8 +251,8 @@ char *print_arg(struct syscall_arg *, unsigned long *, syscallarg_t *,
#define LINUX_SENDMSG 16
#define LINUX_RECVMSG 17
#define PAD_(t) (sizeof(syscallarg_t) <= sizeof(t) ? \
0 : sizeof(syscallarg_t) - sizeof(t))
#define PAD_(t) (sizeof(register_t) <= sizeof(t) ? \
0 : sizeof(register_t) - sizeof(t))
#if BYTE_ORDER == LITTLE_ENDIAN
#define PADL_(t) 0
@ -271,5 +271,5 @@ struct linux_socketcall_args {
};
void print_syscall(struct trussinfo *);
void print_syscall_ret(struct trussinfo *, int, syscallarg_t *);
void print_syscall_ret(struct trussinfo *, int, register_t *);
void print_summary(struct trussinfo *trussinfo);

4
usr.bin/truss/syscalls.c
View File

@ -1556,7 +1556,7 @@ user_ptr32_to_psaddr(int32_t user_pointer)
* an array of all of the system call arguments.
*/
char *
print_arg(struct syscall_arg *sc, unsigned long *args, syscallarg_t *retval,
print_arg(struct syscall_arg *sc, unsigned long *args, register_t *retval,
struct trussinfo *trussinfo)
{
FILE *fp;
@ -2729,7 +2729,7 @@ print_syscall(struct trussinfo *trussinfo)
}
void
print_syscall_ret(struct trussinfo *trussinfo, int error, syscallarg_t *retval)
print_syscall_ret(struct trussinfo *trussinfo, int error, register_t *retval)
{
struct timespec timediff;
struct threadinfo *t;

2
usr.bin/truss/truss.h
View File

@ -81,7 +81,7 @@ struct current_syscall {
struct syscall *sc;
unsigned int number;
unsigned int nargs;
syscallarg_t args[10];
unsigned long args[10];
char *s_args[10]; /* the printable arguments */
};