From c4db0baa34b97e88f2e7cd2b2c2711828ffc89a7 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Mon, 18 Jun 2018 18:10:11 +0000 Subject: [PATCH] Regen arm64 linuxulator sysent files after r335323 --- sys/arm64/linux/linux_syscall.h | 1 + sys/arm64/linux/linux_syscalls.c | 2 +- sys/arm64/linux/linux_sysent.c | 2 +- sys/arm64/linux/linux_systrace_args.c | 22 ++++++++++++++++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/sys/arm64/linux/linux_syscall.h b/sys/arm64/linux/linux_syscall.h index 635689fe782..202d7da4ec3 100644 --- a/sys/arm64/linux/linux_syscall.h +++ b/sys/arm64/linux/linux_syscall.h @@ -23,6 +23,7 @@ #define LINUX_SYS_linux_epoll_create1 20 #define LINUX_SYS_linux_epoll_ctl 21 #define LINUX_SYS_linux_epoll_pwait 22 +#define LINUX_SYS_dup 23 #define LINUX_SYS_linux_dup3 24 #define LINUX_SYS_linux_fcntl 25 #define LINUX_SYS_linux_inotify_init1 26 diff --git a/sys/arm64/linux/linux_syscalls.c b/sys/arm64/linux/linux_syscalls.c index d7e7fa0956f..7a2b6403fe3 100644 --- a/sys/arm64/linux/linux_syscalls.c +++ b/sys/arm64/linux/linux_syscalls.c @@ -30,7 +30,7 @@ const char *linux_syscallnames[] = { "linux_epoll_create1", /* 20 = linux_epoll_create1 */ "linux_epoll_ctl", /* 21 = linux_epoll_ctl */ "linux_epoll_pwait", /* 22 = linux_epoll_pwait */ - "#23", /* 23 = linux_dup */ + "dup", /* 23 = dup */ "linux_dup3", /* 24 = linux_dup3 */ "linux_fcntl", /* 25 = linux_fcntl */ "linux_inotify_init1", /* 26 = linux_inotify_init1 */ diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c index 3c38953645f..b61121f320a 100644 --- a/sys/arm64/linux/linux_sysent.c +++ b/sys/arm64/linux/linux_sysent.c @@ -40,7 +40,7 @@ struct sysent linux_sysent[] = { { AS(linux_epoll_create1_args), (sy_call_t *)linux_epoll_create1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 20 = linux_epoll_create1 */ { AS(linux_epoll_ctl_args), (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 21 = linux_epoll_ctl */ { AS(linux_epoll_pwait_args), (sy_call_t *)linux_epoll_pwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 22 = linux_epoll_pwait */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 23 = linux_dup */ + { AS(dup_args), (sy_call_t *)sys_dup, AUE_DUP, NULL, 0, 0, 0, SY_THR_STATIC }, /* 23 = dup */ { AS(linux_dup3_args), (sy_call_t *)linux_dup3, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 24 = linux_dup3 */ { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 25 = linux_fcntl */ { AS(linux_inotify_init1_args), (sy_call_t *)linux_inotify_init1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 26 = linux_inotify_init1 */ diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index c142b95595b..d9320eb2722 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -122,6 +122,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 6; break; } + /* dup */ + case 23: { + struct dup_args *p = params; + uarg[0] = p->fd; /* u_int */ + *n_args = 1; + break; + } /* linux_dup3 */ case 24: { struct linux_dup3_args *p = params; @@ -2234,6 +2241,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* dup */ + case 23: + switch(ndx) { + case 0: + p = "u_int"; + break; + default: + break; + }; + break; /* linux_dup3 */ case 24: switch(ndx) { @@ -5499,6 +5516,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* dup */ + case 23: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_dup3 */ case 24: if (ndx == 0 || ndx == 1)