Module Name: src
Committed By: thorpej
Date: Sun Apr 26 19:20:58 UTC 2020
Modified Files:
src/sys/compat/linux32/arch/amd64: linux32_syscall.h
linux32_syscallargs.h linux32_syscalls.c linux32_sysent.c
linux32_systrace_args.c
Log Message:
Regen for native futex calls.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 \
src/sys/compat/linux32/arch/amd64/linux32_syscall.h \
src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h \
src/sys/compat/linux32/arch/amd64/linux32_syscalls.c \
src/sys/compat/linux32/arch/amd64/linux32_sysent.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux32/arch/amd64/linux32_syscall.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.80 src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.81
--- src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.80 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux32/arch/amd64/linux32_syscall.h Sun Apr 26 19:20:58 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.80 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.70 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
*/
#ifndef _LINUX32_SYS_SYSCALL_H_
@@ -693,11 +693,11 @@
/* syscall: "ppoll" ret: "int" args: "netbsd32_pollfdp_t" "u_int" "linux32_timespecp_t" "linux32_sigsetp_t" */
#define LINUX32_SYS_ppoll 309
-/* syscall: "set_robust_list" ret: "int" args: "linux32_robust_list_headp_t" "linux32_size_t" */
-#define LINUX32_SYS_set_robust_list 311
+/* syscall: "netbsd32___futex_set_robust_list" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" */
+#define LINUX32_SYS_netbsd32___futex_set_robust_list 311
-/* syscall: "get_robust_list" ret: "int" args: "linux32_pid_t" "linux32_robust_list_headpp_t" "linux32_sizep_t" */
-#define LINUX32_SYS_get_robust_list 312
+/* syscall: "netbsd32___futex_get_robust_list" ret: "int" args: "lwpid_t" "netbsd32_voidp" "netbsd32_size_tp" */
+#define LINUX32_SYS_netbsd32___futex_get_robust_list 312
/* syscall: "utimensat" ret: "int" args: "int" "netbsd32_charp" "linux32_timespecp_t" "int" */
#define LINUX32_SYS_utimensat 320
Index: src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.80 src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.81
--- src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.80 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h Sun Apr 26 19:20:58 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.80 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.70 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
*/
#ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -992,18 +992,9 @@ struct linux32_sys_ppoll_args {
};
check_syscall_args(linux32_sys_ppoll)
-struct linux32_sys_set_robust_list_args {
- syscallarg(linux32_robust_list_headp_t) head;
- syscallarg(linux32_size_t) len;
-};
-check_syscall_args(linux32_sys_set_robust_list)
+struct netbsd32___futex_set_robust_list_args;
-struct linux32_sys_get_robust_list_args {
- syscallarg(linux32_pid_t) pid;
- syscallarg(linux32_robust_list_headpp_t) head;
- syscallarg(linux32_sizep_t) len;
-};
-check_syscall_args(linux32_sys_get_robust_list)
+struct netbsd32___futex_get_robust_list_args;
struct linux32_sys_utimensat_args {
syscallarg(int) fd;
@@ -1470,9 +1461,9 @@ int linux32_sys_faccessat(struct lwp *,
int linux32_sys_ppoll(struct lwp *, const struct linux32_sys_ppoll_args *, register_t *);
-int linux32_sys_set_robust_list(struct lwp *, const struct linux32_sys_set_robust_list_args *, register_t *);
+int netbsd32___futex_set_robust_list(struct lwp *, const struct netbsd32___futex_set_robust_list_args *, register_t *);
-int linux32_sys_get_robust_list(struct lwp *, const struct linux32_sys_get_robust_list_args *, register_t *);
+int netbsd32___futex_get_robust_list(struct lwp *, const struct netbsd32___futex_get_robust_list_args *, register_t *);
int linux32_sys_utimensat(struct lwp *, const struct linux32_sys_utimensat_args *, register_t *);
Index: src/sys/compat/linux32/arch/amd64/linux32_syscalls.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.80 src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.81
--- src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.80 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux32/arch/amd64/linux32_syscalls.c Sun Apr 26 19:20:58 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_syscalls.c,v 1.80 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux32_syscalls.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.70 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.80 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include <sys/param.h>
@@ -350,8 +350,8 @@ const char *const linux32_syscallnames[]
/* 308 */ "#308 (unimplemented pselect6)",
/* 309 */ "ppoll",
/* 310 */ "#310 (unimplemented unshare)",
- /* 311 */ "set_robust_list",
- /* 312 */ "get_robust_list",
+ /* 311 */ "netbsd32___futex_set_robust_list",
+ /* 312 */ "netbsd32___futex_get_robust_list",
/* 313 */ "#313 (unimplemented splice)",
/* 314 */ "#314 (unimplemented sync_file_range)",
/* 315 */ "#315 (unimplemented tee)",
@@ -869,8 +869,8 @@ const char *const altlinux32_syscallname
/* 308 */ NULL, /* unimplemented pselect6 */
/* 309 */ NULL, /* ppoll */
/* 310 */ NULL, /* unimplemented unshare */
- /* 311 */ NULL, /* set_robust_list */
- /* 312 */ NULL, /* get_robust_list */
+ /* 311 */ "__futex_set_robust_list",
+ /* 312 */ "__futex_get_robust_list",
/* 313 */ NULL, /* unimplemented splice */
/* 314 */ NULL, /* unimplemented sync_file_range */
/* 315 */ NULL, /* unimplemented tee */
Index: src/sys/compat/linux32/arch/amd64/linux32_sysent.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.80 src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.81
--- src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.80 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux32/arch/amd64/linux32_sysent.c Sun Apr 26 19:20:58 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_sysent.c,v 1.80 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux32_sysent.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.70 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.80 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -1177,13 +1177,13 @@ struct sysent linux32_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 310 = filler */
{
- ns(struct linux32_sys_set_robust_list_args),
- .sy_call = (sy_call_t *)linux32_sys_set_robust_list
- }, /* 311 = set_robust_list */
- {
- ns(struct linux32_sys_get_robust_list_args),
- .sy_call = (sy_call_t *)linux32_sys_get_robust_list
- }, /* 312 = get_robust_list */
+ ns(struct netbsd32___futex_set_robust_list_args),
+ .sy_call = (sy_call_t *)netbsd32___futex_set_robust_list
+ }, /* 311 = netbsd32___futex_set_robust_list */
+ {
+ ns(struct netbsd32___futex_get_robust_list_args),
+ .sy_call = (sy_call_t *)netbsd32___futex_get_robust_list
+ }, /* 312 = netbsd32___futex_get_robust_list */
{
.sy_call = linux_sys_nosys,
}, /* 313 = filler */
Index: src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c:1.7 src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c:1.8
--- src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c:1.7 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c Sun Apr 26 19:20:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_systrace_args.c,v 1.7 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux32_systrace_args.c,v 1.8 2020/04/26 19:20:58 thorpej Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1820,20 +1820,20 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
- /* linux32_sys_set_robust_list */
+ /* netbsd32___futex_set_robust_list */
case 311: {
- const struct linux32_sys_set_robust_list_args *p = params;
- uarg[0] = (intptr_t) SCARG(p, head).i32; /* linux32_robust_list_headp_t */
- iarg[1] = SCARG(p, len); /* linux32_size_t */
+ const struct netbsd32___futex_set_robust_list_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, head).i32; /* netbsd32_voidp */
+ iarg[1] = SCARG(p, len); /* netbsd32_size_t */
*n_args = 2;
break;
}
- /* linux32_sys_get_robust_list */
+ /* netbsd32___futex_get_robust_list */
case 312: {
- const struct linux32_sys_get_robust_list_args *p = params;
- iarg[0] = SCARG(p, pid); /* linux32_pid_t */
- uarg[1] = (intptr_t) SCARG(p, head).i32; /* linux32_robust_list_headpp_t */
- uarg[2] = (intptr_t) SCARG(p, len).i32; /* linux32_sizep_t */
+ const struct netbsd32___futex_get_robust_list_args *p = params;
+ iarg[0] = SCARG(p, lwpid); /* lwpid_t */
+ uarg[1] = (intptr_t) SCARG(p, headp).i32; /* netbsd32_voidp */
+ uarg[2] = (intptr_t) SCARG(p, lenp).i32; /* netbsd32_size_tp */
*n_args = 3;
break;
}
@@ -4830,30 +4830,30 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* linux32_sys_set_robust_list */
+ /* netbsd32___futex_set_robust_list */
case 311:
switch(ndx) {
case 0:
- p = "linux32_robust_list_headp_t";
+ p = "netbsd32_voidp";
break;
case 1:
- p = "linux32_size_t";
+ p = "netbsd32_size_t";
break;
default:
break;
};
break;
- /* linux32_sys_get_robust_list */
+ /* netbsd32___futex_get_robust_list */
case 312:
switch(ndx) {
case 0:
- p = "linux32_pid_t";
+ p = "lwpid_t";
break;
case 1:
- p = "linux32_robust_list_headpp_t";
+ p = "netbsd32_voidp";
break;
case 2:
- p = "linux32_sizep_t";
+ p = "netbsd32_size_tp";
break;
default:
break;
@@ -5991,12 +5991,12 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* linux32_sys_set_robust_list */
+ /* netbsd32___futex_set_robust_list */
case 311:
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* linux32_sys_get_robust_list */
+ /* netbsd32___futex_get_robust_list */
case 312:
if (ndx == 0 || ndx == 1)
p = "int";
