Regendiff -r1.141 -r1.142 src/sys/compat/netbsd32/netbsd32_syscall.h
(christos)
--- src/sys/compat/netbsd32/netbsd32_syscall.h 2019/06/18 01:37:04 1.141
+++ src/sys/compat/netbsd32/netbsd32_syscall.h 2019/06/18 16:24:32 1.142
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | /* $NetBSD: netbsd32_syscall.h,v 1.141 2019/06/18 01:37:04 christos Exp $ */ | 1 | /* $NetBSD: netbsd32_syscall.h,v 1.142 2019/06/18 16:24:32 christos Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * System call numbers. | 4 | * System call numbers. | |
5 | * | 5 | * | |
6 | * DO NOT EDIT-- this file is automatically generated. | 6 | * DO NOT EDIT-- this file is automatically generated. | |
7 | * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #ifndef _NETBSD32_SYS_SYSCALL_H_ | 10 | #ifndef _NETBSD32_SYS_SYSCALL_H_ | |
11 | #define _NETBSD32_SYS_SYSCALL_H_ | 11 | #define _NETBSD32_SYS_SYSCALL_H_ | |
12 | 12 | |||
13 | #define NETBSD32_SYS_MAXSYSARGS 8 | 13 | #define NETBSD32_SYS_MAXSYSARGS 8 | |
14 | 14 | |||
15 | /* syscall: "netbsd32_syscall" ret: "int" args: "int" "..." */ | 15 | /* syscall: "netbsd32_syscall" ret: "int" args: "int" "..." */ | |
16 | #define NETBSD32_SYS_netbsd32_syscall 0 | 16 | #define NETBSD32_SYS_netbsd32_syscall 0 | |
17 | 17 | |||
18 | /* syscall: "netbsd32_exit" ret: "void" args: "int" */ | 18 | /* syscall: "netbsd32_exit" ret: "void" args: "int" */ | |
19 | #define NETBSD32_SYS_netbsd32_exit 1 | 19 | #define NETBSD32_SYS_netbsd32_exit 1 | |
20 | 20 | |||
@@ -1230,29 +1230,33 @@ | @@ -1230,29 +1230,33 @@ | |||
1230 | 1230 | |||
1231 | /* syscall: "netbsd32_readlinkat" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_charp" "netbsd32_charp" "size_t" */ | 1231 | /* syscall: "netbsd32_readlinkat" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_charp" "netbsd32_charp" "size_t" */ | |
1232 | #define NETBSD32_SYS_netbsd32_readlinkat 469 | 1232 | #define NETBSD32_SYS_netbsd32_readlinkat 469 | |
1233 | 1233 | |||
1234 | /* syscall: "netbsd32_symlinkat" ret: "int" args: "const netbsd32_charp" "int" "const netbsd32_charp" */ | 1234 | /* syscall: "netbsd32_symlinkat" ret: "int" args: "const netbsd32_charp" "int" "const netbsd32_charp" */ | |
1235 | #define NETBSD32_SYS_netbsd32_symlinkat 470 | 1235 | #define NETBSD32_SYS_netbsd32_symlinkat 470 | |
1236 | 1236 | |||
1237 | /* syscall: "netbsd32_unlinkat" ret: "int" args: "int" "const netbsd32_charp" "int" */ | 1237 | /* syscall: "netbsd32_unlinkat" ret: "int" args: "int" "const netbsd32_charp" "int" */ | |
1238 | #define NETBSD32_SYS_netbsd32_unlinkat 471 | 1238 | #define NETBSD32_SYS_netbsd32_unlinkat 471 | |
1239 | 1239 | |||
1240 | /* syscall: "netbsd32_futimens" ret: "int" args: "int" "const netbsd32_timespecp_t" */ | 1240 | /* syscall: "netbsd32_futimens" ret: "int" args: "int" "const netbsd32_timespecp_t" */ | |
1241 | #define NETBSD32_SYS_netbsd32_futimens 472 | 1241 | #define NETBSD32_SYS_netbsd32_futimens 472 | |
1242 | 1242 | |||
1243 | #if defined(QUOTA) || !defined(_KERNEL_OPT) | |||
1243 | /* syscall: "netbsd32___quotactl" ret: "int" args: "const netbsd32_charp" "netbsd32_voidp" */ | 1244 | /* syscall: "netbsd32___quotactl" ret: "int" args: "const netbsd32_charp" "netbsd32_voidp" */ | |
1244 | #define NETBSD32_SYS_netbsd32___quotactl 473 | 1245 | #define NETBSD32_SYS_netbsd32___quotactl 473 | |
1245 | 1246 | |||
1247 | #else | |||
1248 | /* 473 is excluded netbsd32___quotactl */ | |||
1249 | #endif | |||
1246 | /* syscall: "netbsd32_posix_spawn" ret: "int" args: "netbsd32_pid_tp" "const netbsd32_charp" "const netbsd32_posix_spawn_file_actionsp" "const netbsd32_posix_spawnattrp" "netbsd32_charpp" "netbsd32_charpp" */ | 1250 | /* syscall: "netbsd32_posix_spawn" ret: "int" args: "netbsd32_pid_tp" "const netbsd32_charp" "const netbsd32_posix_spawn_file_actionsp" "const netbsd32_posix_spawnattrp" "netbsd32_charpp" "netbsd32_charpp" */ | |
1247 | #define NETBSD32_SYS_netbsd32_posix_spawn 474 | 1251 | #define NETBSD32_SYS_netbsd32_posix_spawn 474 | |
1248 | 1252 | |||
1249 | /* syscall: "netbsd32_recvmmsg" ret: "int" args: "int" "netbsd32_mmsghdrp_t" "unsigned int" "unsigned int" "netbsd32_timespecp_t" */ | 1253 | /* syscall: "netbsd32_recvmmsg" ret: "int" args: "int" "netbsd32_mmsghdrp_t" "unsigned int" "unsigned int" "netbsd32_timespecp_t" */ | |
1250 | #define NETBSD32_SYS_netbsd32_recvmmsg 475 | 1254 | #define NETBSD32_SYS_netbsd32_recvmmsg 475 | |
1251 | 1255 | |||
1252 | /* syscall: "netbsd32_sendmmsg" ret: "int" args: "int" "netbsd32_mmsghdrp_t" "unsigned int" "unsigned int" */ | 1256 | /* syscall: "netbsd32_sendmmsg" ret: "int" args: "int" "netbsd32_mmsghdrp_t" "unsigned int" "unsigned int" */ | |
1253 | #define NETBSD32_SYS_netbsd32_sendmmsg 476 | 1257 | #define NETBSD32_SYS_netbsd32_sendmmsg 476 | |
1254 | 1258 | |||
1255 | /* syscall: "netbsd32_clock_nanosleep" ret: "int" args: "netbsd32_clockid_t" "int" "const netbsd32_timespecp_t" "netbsd32_timespecp_t" */ | 1259 | /* syscall: "netbsd32_clock_nanosleep" ret: "int" args: "netbsd32_clockid_t" "int" "const netbsd32_timespecp_t" "netbsd32_timespecp_t" */ | |
1256 | #define NETBSD32_SYS_netbsd32_clock_nanosleep 477 | 1260 | #define NETBSD32_SYS_netbsd32_clock_nanosleep 477 | |
1257 | 1261 | |||
1258 | /* syscall: "netbsd32____lwp_park60" ret: "int" args: "netbsd32_clockid_t" "int" "netbsd32_timespecp_t" "lwpid_t" "netbsd32_voidp" "netbsd32_voidp" */ | 1262 | /* syscall: "netbsd32____lwp_park60" ret: "int" args: "netbsd32_clockid_t" "int" "netbsd32_timespecp_t" "lwpid_t" "netbsd32_voidp" "netbsd32_voidp" */ |
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h 2019/06/18 01:37:04 1.140
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h 2019/06/18 16:24:32 1.141
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | /* $NetBSD: netbsd32_syscallargs.h,v 1.140 2019/06/18 01:37:04 christos Exp $ */ | 1 | /* $NetBSD: netbsd32_syscallargs.h,v 1.141 2019/06/18 16:24:32 christos Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * System call argument lists. | 4 | * System call argument lists. | |
5 | * | 5 | * | |
6 | * DO NOT EDIT-- this file is automatically generated. | 6 | * DO NOT EDIT-- this file is automatically generated. | |
7 | * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ | 10 | #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ | |
11 | #define _NETBSD32_SYS_SYSCALLARGS_H_ | 11 | #define _NETBSD32_SYS_SYSCALLARGS_H_ | |
12 | 12 | |||
13 | /* Forward declaration */ | 13 | /* Forward declaration */ | |
14 | struct lwp; | 14 | struct lwp; | |
15 | 15 | |||
16 | #define NETBSD32_SYS_MAXSYSARGS 8 | 16 | #define NETBSD32_SYS_MAXSYSARGS 8 | |
17 | 17 | |||
18 | #undef syscallarg | 18 | #undef syscallarg | |
19 | #define syscallarg(x) \ | 19 | #define syscallarg(x) \ | |
20 | union { \ | 20 | union { \ | |
@@ -2524,32 +2524,35 @@ check_syscall_args(netbsd32_symlinkat) | @@ -2524,32 +2524,35 @@ check_syscall_args(netbsd32_symlinkat) | |||
2524 | 2524 | |||
2525 | struct netbsd32_unlinkat_args { | 2525 | struct netbsd32_unlinkat_args { | |
2526 | syscallarg(int) fd; | 2526 | syscallarg(int) fd; | |
2527 | syscallarg(const netbsd32_charp) path; | 2527 | syscallarg(const netbsd32_charp) path; | |
2528 | syscallarg(int) flag; | 2528 | syscallarg(int) flag; | |
2529 | }; | 2529 | }; | |
2530 | check_syscall_args(netbsd32_unlinkat) | 2530 | check_syscall_args(netbsd32_unlinkat) | |
2531 | 2531 | |||
2532 | struct netbsd32_futimens_args { | 2532 | struct netbsd32_futimens_args { | |
2533 | syscallarg(int) fd; | 2533 | syscallarg(int) fd; | |
2534 | syscallarg(const netbsd32_timespecp_t) tptr; | 2534 | syscallarg(const netbsd32_timespecp_t) tptr; | |
2535 | }; | 2535 | }; | |
2536 | check_syscall_args(netbsd32_futimens) | 2536 | check_syscall_args(netbsd32_futimens) | |
2537 | #if defined(QUOTA) || !defined(_KERNEL_OPT) | |||
2537 | 2538 | |||
2538 | struct netbsd32___quotactl_args { | 2539 | struct netbsd32___quotactl_args { | |
2539 | syscallarg(const netbsd32_charp) path; | 2540 | syscallarg(const netbsd32_charp) path; | |
2540 | syscallarg(netbsd32_voidp) args; | 2541 | syscallarg(netbsd32_voidp) args; | |
2541 | }; | 2542 | }; | |
2542 | check_syscall_args(netbsd32___quotactl) | 2543 | check_syscall_args(netbsd32___quotactl) | |
2544 | #else | |||
2545 | #endif | |||
2543 | 2546 | |||
2544 | struct netbsd32_posix_spawn_args { | 2547 | struct netbsd32_posix_spawn_args { | |
2545 | syscallarg(netbsd32_pid_tp) pid; | 2548 | syscallarg(netbsd32_pid_tp) pid; | |
2546 | syscallarg(const netbsd32_charp) path; | 2549 | syscallarg(const netbsd32_charp) path; | |
2547 | syscallarg(const netbsd32_posix_spawn_file_actionsp) file_actions; | 2550 | syscallarg(const netbsd32_posix_spawn_file_actionsp) file_actions; | |
2548 | syscallarg(const netbsd32_posix_spawnattrp) attrp; | 2551 | syscallarg(const netbsd32_posix_spawnattrp) attrp; | |
2549 | syscallarg(netbsd32_charpp) argv; | 2552 | syscallarg(netbsd32_charpp) argv; | |
2550 | syscallarg(netbsd32_charpp) envp; | 2553 | syscallarg(netbsd32_charpp) envp; | |
2551 | }; | 2554 | }; | |
2552 | check_syscall_args(netbsd32_posix_spawn) | 2555 | check_syscall_args(netbsd32_posix_spawn) | |
2553 | 2556 | |||
2554 | struct netbsd32_recvmmsg_args { | 2557 | struct netbsd32_recvmmsg_args { | |
2555 | syscallarg(int) s; | 2558 | syscallarg(int) s; | |
@@ -3414,28 +3417,31 @@ int netbsd32_fstatat(struct lwp *, const | @@ -3414,28 +3417,31 @@ int netbsd32_fstatat(struct lwp *, const | |||
3414 | 3417 | |||
3415 | int netbsd32_utimensat(struct lwp *, const struct netbsd32_utimensat_args *, register_t *); | 3418 | int netbsd32_utimensat(struct lwp *, const struct netbsd32_utimensat_args *, register_t *); | |
3416 | 3419 | |||
3417 | int netbsd32_openat(struct lwp *, const struct netbsd32_openat_args *, register_t *); | 3420 | int netbsd32_openat(struct lwp *, const struct netbsd32_openat_args *, register_t *); | |
3418 | 3421 | |||
3419 | int netbsd32_readlinkat(struct lwp *, const struct netbsd32_readlinkat_args *, register_t *); | 3422 | int netbsd32_readlinkat(struct lwp *, const struct netbsd32_readlinkat_args *, register_t *); | |
3420 | 3423 | |||
3421 | int netbsd32_symlinkat(struct lwp *, const struct netbsd32_symlinkat_args *, register_t *); | 3424 | int netbsd32_symlinkat(struct lwp *, const struct netbsd32_symlinkat_args *, register_t *); | |
3422 | 3425 | |||
3423 | int netbsd32_unlinkat(struct lwp *, const struct netbsd32_unlinkat_args *, register_t *); | 3426 | int netbsd32_unlinkat(struct lwp *, const struct netbsd32_unlinkat_args *, register_t *); | |
3424 | 3427 | |||
3425 | int netbsd32_futimens(struct lwp *, const struct netbsd32_futimens_args *, register_t *); | 3428 | int netbsd32_futimens(struct lwp *, const struct netbsd32_futimens_args *, register_t *); | |
3426 | 3429 | |||
3430 | #if defined(QUOTA) || !defined(_KERNEL_OPT) | |||
3427 | int netbsd32___quotactl(struct lwp *, const struct netbsd32___quotactl_args *, register_t *); | 3431 | int netbsd32___quotactl(struct lwp *, const struct netbsd32___quotactl_args *, register_t *); | |
3428 | 3432 | |||
3433 | #else | |||
3434 | #endif | |||
3429 | int netbsd32_posix_spawn(struct lwp *, const struct netbsd32_posix_spawn_args *, register_t *); | 3435 | int netbsd32_posix_spawn(struct lwp *, const struct netbsd32_posix_spawn_args *, register_t *); | |
3430 | 3436 | |||
3431 | int netbsd32_recvmmsg(struct lwp *, const struct netbsd32_recvmmsg_args *, register_t *); | 3437 | int netbsd32_recvmmsg(struct lwp *, const struct netbsd32_recvmmsg_args *, register_t *); | |
3432 | 3438 | |||
3433 | int netbsd32_sendmmsg(struct lwp *, const struct netbsd32_sendmmsg_args *, register_t *); | 3439 | int netbsd32_sendmmsg(struct lwp *, const struct netbsd32_sendmmsg_args *, register_t *); | |
3434 | 3440 | |||
3435 | int netbsd32_clock_nanosleep(struct lwp *, const struct netbsd32_clock_nanosleep_args *, register_t *); | 3441 | int netbsd32_clock_nanosleep(struct lwp *, const struct netbsd32_clock_nanosleep_args *, register_t *); | |
3436 | 3442 | |||
3437 | int netbsd32____lwp_park60(struct lwp *, const struct netbsd32____lwp_park60_args *, register_t *); | 3443 | int netbsd32____lwp_park60(struct lwp *, const struct netbsd32____lwp_park60_args *, register_t *); | |
3438 | 3444 | |||
3439 | int netbsd32_posix_fallocate(struct lwp *, const struct netbsd32_posix_fallocate_args *, register_t *); | 3445 | int netbsd32_posix_fallocate(struct lwp *, const struct netbsd32_posix_fallocate_args *, register_t *); | |
3440 | 3446 | |||
3441 | int netbsd32_fdiscard(struct lwp *, const struct netbsd32_fdiscard_args *, register_t *); | 3447 | int netbsd32_fdiscard(struct lwp *, const struct netbsd32_fdiscard_args *, register_t *); |
--- src/sys/compat/netbsd32/netbsd32_syscalls.c 2019/06/18 01:37:04 1.140
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c 2019/06/18 16:24:32 1.141
@@ -1,38 +1,39 @@ | @@ -1,38 +1,39 @@ | |||
1 | /* $NetBSD: netbsd32_syscalls.c,v 1.140 2019/06/18 01:37:04 christos Exp $ */ | 1 | /* $NetBSD: netbsd32_syscalls.c,v 1.141 2019/06/18 16:24:32 christos Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * System call names. | 4 | * System call names. | |
5 | * | 5 | * | |
6 | * DO NOT EDIT-- this file is automatically generated. | 6 | * DO NOT EDIT-- this file is automatically generated. | |
7 | * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #include <sys/cdefs.h> | 10 | #include <sys/cdefs.h> | |
11 | __KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.140 2019/06/18 01:37:04 christos Exp $"); | 11 | __KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.141 2019/06/18 16:24:32 christos Exp $"); | |
12 | 12 | |||
13 | #if defined(_KERNEL_OPT) | 13 | #if defined(_KERNEL_OPT) | |
14 | #if defined(_KERNEL_OPT) | 14 | #if defined(_KERNEL_OPT) | |
15 | #include "opt_compat_netbsd.h" | 15 | #include "opt_compat_netbsd.h" | |
16 | #include "opt_ntp.h" | 16 | #include "opt_ntp.h" | |
17 | #include "opt_compat_43.h" | 17 | #include "opt_compat_43.h" | |
18 | #include "opt_quota.h" | 18 | #include "opt_quota.h" | |
19 | #endif | 19 | #endif | |
20 | #include <sys/param.h> | 20 | #include <sys/param.h> | |
21 | #include <sys/systm.h> | 21 | #include <sys/systm.h> | |
22 | #include <sys/signal.h> | 22 | #include <sys/signal.h> | |
23 | #include <sys/mount.h> | 23 | #include <sys/mount.h> | |
24 | #include <sys/syscallargs.h> | 24 | #include <sys/syscallargs.h> | |
25 | #include <compat/netbsd32/netbsd32.h> | 25 | #include <compat/netbsd32/netbsd32.h> | |
26 | #include <compat/netbsd32/netbsd32_syscall.h> | |||
26 | #include <compat/netbsd32/netbsd32_syscallargs.h> | 27 | #include <compat/netbsd32/netbsd32_syscallargs.h> | |
27 | #else /* _KERNEL_OPT */ | 28 | #else /* _KERNEL_OPT */ | |
28 | #include <sys/null.h> | 29 | #include <sys/null.h> | |
29 | #endif /* _KERNEL_OPT */ | 30 | #endif /* _KERNEL_OPT */ | |
30 | 31 | |||
31 | const char *const netbsd32_syscallnames[] = { | 32 | const char *const netbsd32_syscallnames[] = { | |
32 | /* 0 */ "netbsd32_syscall", | 33 | /* 0 */ "netbsd32_syscall", | |
33 | /* 1 */ "netbsd32_exit", | 34 | /* 1 */ "netbsd32_exit", | |
34 | /* 2 */ "fork", | 35 | /* 2 */ "fork", | |
35 | /* 3 */ "netbsd32_read", | 36 | /* 3 */ "netbsd32_read", | |
36 | /* 4 */ "netbsd32_write", | 37 | /* 4 */ "netbsd32_write", | |
37 | /* 5 */ "netbsd32_open", | 38 | /* 5 */ "netbsd32_open", | |
38 | /* 6 */ "netbsd32_close", | 39 | /* 6 */ "netbsd32_close", | |
@@ -505,27 +506,31 @@ const char *const netbsd32_syscallnames[ | @@ -505,27 +506,31 @@ const char *const netbsd32_syscallnames[ | |||
505 | /* 460 */ "netbsd32_mknodat", | 506 | /* 460 */ "netbsd32_mknodat", | |
506 | /* 461 */ "netbsd32_mkdirat", | 507 | /* 461 */ "netbsd32_mkdirat", | |
507 | /* 462 */ "netbsd32_faccessat", | 508 | /* 462 */ "netbsd32_faccessat", | |
508 | /* 463 */ "netbsd32_fchmodat", | 509 | /* 463 */ "netbsd32_fchmodat", | |
509 | /* 464 */ "netbsd32_fchownat", | 510 | /* 464 */ "netbsd32_fchownat", | |
510 | /* 465 */ "netbsd32_fexecve", | 511 | /* 465 */ "netbsd32_fexecve", | |
511 | /* 466 */ "netbsd32_fstatat", | 512 | /* 466 */ "netbsd32_fstatat", | |
512 | /* 467 */ "netbsd32_utimensat", | 513 | /* 467 */ "netbsd32_utimensat", | |
513 | /* 468 */ "netbsd32_openat", | 514 | /* 468 */ "netbsd32_openat", | |
514 | /* 469 */ "netbsd32_readlinkat", | 515 | /* 469 */ "netbsd32_readlinkat", | |
515 | /* 470 */ "netbsd32_symlinkat", | 516 | /* 470 */ "netbsd32_symlinkat", | |
516 | /* 471 */ "netbsd32_unlinkat", | 517 | /* 471 */ "netbsd32_unlinkat", | |
517 | /* 472 */ "netbsd32_futimens", | 518 | /* 472 */ "netbsd32_futimens", | |
519 | #if defined(QUOTA) || !defined(_KERNEL_OPT) | |||
518 | /* 473 */ "netbsd32___quotactl", | 520 | /* 473 */ "netbsd32___quotactl", | |
521 | #else | |||
522 | /* 473 */ "#473 (excluded netbsd32___quotactl)", | |||
523 | #endif | |||
519 | /* 474 */ "netbsd32_posix_spawn", | 524 | /* 474 */ "netbsd32_posix_spawn", | |
520 | /* 475 */ "netbsd32_recvmmsg", | 525 | /* 475 */ "netbsd32_recvmmsg", | |
521 | /* 476 */ "netbsd32_sendmmsg", | 526 | /* 476 */ "netbsd32_sendmmsg", | |
522 | /* 477 */ "netbsd32_clock_nanosleep", | 527 | /* 477 */ "netbsd32_clock_nanosleep", | |
523 | /* 478 */ "netbsd32____lwp_park60", | 528 | /* 478 */ "netbsd32____lwp_park60", | |
524 | /* 479 */ "netbsd32_posix_fallocate", | 529 | /* 479 */ "netbsd32_posix_fallocate", | |
525 | /* 480 */ "netbsd32_fdiscard", | 530 | /* 480 */ "netbsd32_fdiscard", | |
526 | /* 481 */ "netbsd32_wait6", | 531 | /* 481 */ "netbsd32_wait6", | |
527 | /* 482 */ "netbsd32_clock_getcpuclockid2", | 532 | /* 482 */ "netbsd32_clock_getcpuclockid2", | |
528 | /* 483 */ "# filler", | 533 | /* 483 */ "# filler", | |
529 | /* 484 */ "# filler", | 534 | /* 484 */ "# filler", | |
530 | /* 485 */ "# filler", | 535 | /* 485 */ "# filler", | |
531 | /* 486 */ "# filler", | 536 | /* 486 */ "# filler", | |
@@ -1035,27 +1040,31 @@ const char *const altnetbsd32_syscallnam | @@ -1035,27 +1040,31 @@ const char *const altnetbsd32_syscallnam | |||
1035 | /* 460 */ "mknodat", | 1040 | /* 460 */ "mknodat", | |
1036 | /* 461 */ "mkdirat", | 1041 | /* 461 */ "mkdirat", | |
1037 | /* 462 */ "faccessat", | 1042 | /* 462 */ "faccessat", | |
1038 | /* 463 */ "fchmodat", | 1043 | /* 463 */ "fchmodat", | |
1039 | /* 464 */ "fchownat", | 1044 | /* 464 */ "fchownat", | |
1040 | /* 465 */ "fexecve", | 1045 | /* 465 */ "fexecve", | |
1041 | /* 466 */ "fstatat", | 1046 | /* 466 */ "fstatat", | |
1042 | /* 467 */ "utimensat", | 1047 | /* 467 */ "utimensat", | |
1043 | /* 468 */ "openat", | 1048 | /* 468 */ "openat", | |
1044 | /* 469 */ "readlinkat", | 1049 | /* 469 */ "readlinkat", | |
1045 | /* 470 */ "symlinkat", | 1050 | /* 470 */ "symlinkat", | |
1046 | /* 471 */ "unlinkat", | 1051 | /* 471 */ "unlinkat", | |
1047 | /* 472 */ "futimens", | 1052 | /* 472 */ "futimens", | |
1053 | #if defined(QUOTA) || !defined(_KERNEL_OPT) | |||
1048 | /* 473 */ "__quotactl", | 1054 | /* 473 */ "__quotactl", | |
1055 | #else | |||
1056 | /* 473 */ NULL, /* excluded netbsd32___quotactl */ | |||
1057 | #endif | |||
1049 | /* 474 */ "posix_spawn", | 1058 | /* 474 */ "posix_spawn", | |
1050 | /* 475 */ "recvmmsg", | 1059 | /* 475 */ "recvmmsg", | |
1051 | /* 476 */ "sendmmsg", | 1060 | /* 476 */ "sendmmsg", | |
1052 | /* 477 */ "clock_nanosleep", | 1061 | /* 477 */ "clock_nanosleep", | |
1053 | /* 478 */ "_lwp_park", | 1062 | /* 478 */ "_lwp_park", | |
1054 | /* 479 */ "posix_fallocate", | 1063 | /* 479 */ "posix_fallocate", | |
1055 | /* 480 */ "fdiscard", | 1064 | /* 480 */ "fdiscard", | |
1056 | /* 481 */ "wait6", | 1065 | /* 481 */ "wait6", | |
1057 | /* 482 */ "clock_getcpuclockid2", | 1066 | /* 482 */ "clock_getcpuclockid2", | |
1058 | /* 483 */ NULL, /* filler */ | 1067 | /* 483 */ NULL, /* filler */ | |
1059 | /* 484 */ NULL, /* filler */ | 1068 | /* 484 */ NULL, /* filler */ | |
1060 | /* 485 */ NULL, /* filler */ | 1069 | /* 485 */ NULL, /* filler */ | |
1061 | /* 486 */ NULL, /* filler */ | 1070 | /* 486 */ NULL, /* filler */ |
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c 2019/06/18 01:37:04 1.20
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c 2019/06/18 16:24:32 1.21
@@ -1,26 +1,39 @@ | @@ -1,26 +1,39 @@ | |||
1 | /* $NetBSD: netbsd32_syscalls_autoload.c,v 1.20 2019/06/18 01:37:04 christos Exp $ */ | 1 | /* $NetBSD: netbsd32_syscalls_autoload.c,v 1.21 2019/06/18 16:24:32 christos Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * System call autoload table. | 4 | * System call autoload table. | |
5 | * | 5 | * | |
6 | * DO NOT EDIT-- this file is automatically generated. | 6 | * DO NOT EDIT-- this file is automatically generated. | |
7 | * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #include <sys/cdefs.h> | 10 | #include <sys/cdefs.h> | |
11 | __KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.20 2019/06/18 01:37:04 christos Exp $"); | 11 | __KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.21 2019/06/18 16:24:32 christos Exp $"); | |
12 | 12 | |||
13 | #include <sys/proc.h> | 13 | #if defined(_KERNEL_OPT) | |
14 | #include "opt_compat_netbsd.h" | |||
15 | #include "opt_ntp.h" | |||
16 | #include "opt_compat_43.h" | |||
17 | #include "opt_quota.h" | |||
18 | #endif | |||
19 | #include <sys/param.h> | |||
20 | #include <sys/systm.h> | |||
21 | #include <sys/signal.h> | |||
22 | #include <sys/mount.h> | |||
23 | #include <sys/syscallargs.h> | |||
24 | #include <compat/netbsd32/netbsd32.h> | |||
25 | #include <compat/netbsd32/netbsd32_syscall.h> | |||
26 | #include <compat/netbsd32/netbsd32_syscallargs.h> | |||
14 | static struct sc_autoload netbsd32_syscalls_autoload[] = { | 27 | static struct sc_autoload netbsd32_syscalls_autoload[] = { | |
15 | { NETBSD32_SYS_compat_50_netbsd32_wait4, "compat_netbsd32_50" }, | 28 | { NETBSD32_SYS_compat_50_netbsd32_wait4, "compat_netbsd32_50" }, | |
16 | { NETBSD32_SYS_compat_43_netbsd32_ocreat, "compat_netbsd32_43" }, | 29 | { NETBSD32_SYS_compat_43_netbsd32_ocreat, "compat_netbsd32_43" }, | |
17 | { NETBSD32_SYS_compat_50_netbsd32_mknod, "compat_netbsd32_50" }, | 30 | { NETBSD32_SYS_compat_50_netbsd32_mknod, "compat_netbsd32_50" }, | |
18 | { NETBSD32_SYS_compat_20_netbsd32_getfsstat, "compat_netbsd32_20" }, | 31 | { NETBSD32_SYS_compat_20_netbsd32_getfsstat, "compat_netbsd32_20" }, | |
19 | { NETBSD32_SYS_compat_43_netbsd32_olseek, "compat_netbsd32_43" }, | 32 | { NETBSD32_SYS_compat_43_netbsd32_olseek, "compat_netbsd32_43" }, | |
20 | { NETBSD32_SYS_compat_40_netbsd32_mount, "compat_netbsd32_40" }, | 33 | { NETBSD32_SYS_compat_40_netbsd32_mount, "compat_netbsd32_40" }, | |
21 | { NETBSD32_SYS_netbsd32_ptrace, "compat_netbsd32_ptrace" }, | 34 | { NETBSD32_SYS_netbsd32_ptrace, "compat_netbsd32_ptrace" }, | |
22 | { NETBSD32_SYS_compat_43_netbsd32_stat43, "compat_netbsd32_43" }, | 35 | { NETBSD32_SYS_compat_43_netbsd32_stat43, "compat_netbsd32_43" }, | |
23 | { NETBSD32_SYS_compat_43_netbsd32_lstat43, "compat_netbsd32_43" }, | 36 | { NETBSD32_SYS_compat_43_netbsd32_lstat43, "compat_netbsd32_43" }, | |
24 | { NETBSD32_SYS_compat_13_sigprocmask13, "compat_netbsd32_13" }, | 37 | { NETBSD32_SYS_compat_13_sigprocmask13, "compat_netbsd32_13" }, | |
25 | { NETBSD32_SYS_compat_13_sigpending13, "compat_netbsd32_13" }, | 38 | { NETBSD32_SYS_compat_13_sigpending13, "compat_netbsd32_13" }, | |
26 | { NETBSD32_SYS_compat_13_netbsd32_sigaltstack13, "compat_netbsd32_13" }, | 39 | { NETBSD32_SYS_compat_13_netbsd32_sigaltstack13, "compat_netbsd32_13" }, | |
@@ -54,41 +67,47 @@ static struct sc_autoload netbsd32_sysca | @@ -54,41 +67,47 @@ static struct sc_autoload netbsd32_sysca | |||
54 | { NETBSD32_SYS_compat_50_netbsd32_getrusage, "compat_netbsd32_50" }, | 67 | { NETBSD32_SYS_compat_50_netbsd32_getrusage, "compat_netbsd32_50" }, | |
55 | { NETBSD32_SYS_compat_50_netbsd32_settimeofday, "compat_netbsd32_50" }, | 68 | { NETBSD32_SYS_compat_50_netbsd32_settimeofday, "compat_netbsd32_50" }, | |
56 | { NETBSD32_SYS_compat_43_netbsd32_orecvfrom, "compat_netbsd32_43" }, | 69 | { NETBSD32_SYS_compat_43_netbsd32_orecvfrom, "compat_netbsd32_43" }, | |
57 | { NETBSD32_SYS_compat_43_netbsd32_otruncate, "compat_netbsd32_43" }, | 70 | { NETBSD32_SYS_compat_43_netbsd32_otruncate, "compat_netbsd32_43" }, | |
58 | { NETBSD32_SYS_compat_43_netbsd32_oftruncate, "compat_netbsd32_43" }, | 71 | { NETBSD32_SYS_compat_43_netbsd32_oftruncate, "compat_netbsd32_43" }, | |
59 | { NETBSD32_SYS_compat_50_netbsd32_utimes, "compat_netbsd32_50" }, | 72 | { NETBSD32_SYS_compat_50_netbsd32_utimes, "compat_netbsd32_50" }, | |
60 | { NETBSD32_SYS_compat_50_netbsd32_adjtime, "compat_netbsd32_50" }, | 73 | { NETBSD32_SYS_compat_50_netbsd32_adjtime, "compat_netbsd32_50" }, | |
61 | { NETBSD32_SYS_compat_43_netbsd32_ogetpeername, "compat_netbsd32_43" }, | 74 | { NETBSD32_SYS_compat_43_netbsd32_ogetpeername, "compat_netbsd32_43" }, | |
62 | { NETBSD32_SYS_compat_43_ogethostid, "compat_netbsd32_43" }, | 75 | { NETBSD32_SYS_compat_43_ogethostid, "compat_netbsd32_43" }, | |
63 | { NETBSD32_SYS_compat_43_netbsd32_sethostid, "compat_netbsd32_43" }, | 76 | { NETBSD32_SYS_compat_43_netbsd32_sethostid, "compat_netbsd32_43" }, | |
64 | { NETBSD32_SYS_compat_43_netbsd32_ogetrlimit, "compat_netbsd32_43" }, | 77 | { NETBSD32_SYS_compat_43_netbsd32_ogetrlimit, "compat_netbsd32_43" }, | |
65 | { NETBSD32_SYS_compat_43_netbsd32_osetrlimit, "compat_netbsd32_43" }, | 78 | { NETBSD32_SYS_compat_43_netbsd32_osetrlimit, "compat_netbsd32_43" }, | |
66 | { NETBSD32_SYS_compat_43_netbsd32_killpg, "compat_netbsd32_43" }, | 79 | { NETBSD32_SYS_compat_43_netbsd32_killpg, "compat_netbsd32_43" }, | |
80 | #if defined(QUOTA) || !defined(_KERNEL_OPT) | |||
67 | { NETBSD32_SYS_compat_50_netbsd32_quotactl, "compat_netbsd32_50" }, | 81 | { NETBSD32_SYS_compat_50_netbsd32_quotactl, "compat_netbsd32_50" }, | |
68 | { NETBSD32_SYS_compat_43_oquota, "compat_netbsd32_43" }, | 82 | { NETBSD32_SYS_compat_43_oquota, "compat_netbsd32_43" }, | |
83 | #else | |||
84 | #endif | |||
69 | { NETBSD32_SYS_compat_43_netbsd32_ogetsockname, "compat_netbsd32_43" }, | 85 | { NETBSD32_SYS_compat_43_netbsd32_ogetsockname, "compat_netbsd32_43" }, | |
70 | { NETBSD32_SYS_netbsd32_nfssvc, "compat_netbsd32_nfssrv" }, | 86 | { NETBSD32_SYS_netbsd32_nfssvc, "compat_netbsd32_nfssrv" }, | |
71 | { NETBSD32_SYS_compat_43_netbsd32_ogetdirentries, "compat_netbsd32_43" }, | 87 | { NETBSD32_SYS_compat_43_netbsd32_ogetdirentries, "compat_netbsd32_43" }, | |
72 | { NETBSD32_SYS_compat_20_netbsd32_statfs, "compat_netbsd32_20" }, | 88 | { NETBSD32_SYS_compat_20_netbsd32_statfs, "compat_netbsd32_20" }, | |
73 | { NETBSD32_SYS_compat_20_netbsd32_fstatfs, "compat_netbsd32_20" }, | 89 | { NETBSD32_SYS_compat_20_netbsd32_fstatfs, "compat_netbsd32_20" }, | |
74 | { NETBSD32_SYS_compat_30_netbsd32_getfh, "compat_netbsd32_30" }, | 90 | { NETBSD32_SYS_compat_30_netbsd32_getfh, "compat_netbsd32_30" }, | |
75 | { NETBSD32_SYS_compat_09_netbsd32_ogetdomainname, "compat_netbsd32_09" }, | 91 | { NETBSD32_SYS_compat_09_netbsd32_ogetdomainname, "compat_netbsd32_09" }, | |
76 | { NETBSD32_SYS_compat_09_netbsd32_osetdomainname, "compat_netbsd32_09" }, | 92 | { NETBSD32_SYS_compat_09_netbsd32_osetdomainname, "compat_netbsd32_09" }, | |
77 | { NETBSD32_SYS_compat_09_netbsd32_uname, "compat_netbsd32_09" }, | 93 | { NETBSD32_SYS_compat_09_netbsd32_uname, "compat_netbsd32_09" }, | |
78 | { NETBSD32_SYS_compat_10_osemsys, "compat_netbsd32_sysvipc_10" }, | 94 | { NETBSD32_SYS_compat_10_osemsys, "compat_netbsd32_sysvipc_10" }, | |
79 | { NETBSD32_SYS_compat_10_omsgsys, "compat_netbsd32_sysvipc_10" }, | 95 | { NETBSD32_SYS_compat_10_omsgsys, "compat_netbsd32_sysvipc_10" }, | |
80 | { NETBSD32_SYS_compat_10_oshmsys, "compat_netbsd32_sysvipc_10" }, | 96 | { NETBSD32_SYS_compat_10_oshmsys, "compat_netbsd32_sysvipc_10" }, | |
81 | { NETBSD32_SYS_compat_30_netbsd32_ntp_gettime, "compat_netbsd32_30" }, | 97 | { NETBSD32_SYS_compat_30_netbsd32_ntp_gettime, "compat_netbsd32_30" }, | |
98 | #if defined(NTP) || !defined(_KERNEL_OPT) | |||
99 | #else | |||
100 | #endif | |||
82 | { NETBSD32_SYS_compat_12_netbsd32_stat12, "compat_netbsd32_12" }, | 101 | { NETBSD32_SYS_compat_12_netbsd32_stat12, "compat_netbsd32_12" }, | |
83 | { NETBSD32_SYS_compat_12_netbsd32_fstat12, "compat_netbsd32_12" }, | 102 | { NETBSD32_SYS_compat_12_netbsd32_fstat12, "compat_netbsd32_12" }, | |
84 | { NETBSD32_SYS_compat_12_netbsd32_lstat12, "compat_netbsd32_12" }, | 103 | { NETBSD32_SYS_compat_12_netbsd32_lstat12, "compat_netbsd32_12" }, | |
85 | { NETBSD32_SYS_compat_12_netbsd32_getdirentries, "compat_netbsd32_12" }, | 104 | { NETBSD32_SYS_compat_12_netbsd32_getdirentries, "compat_netbsd32_12" }, | |
86 | { NETBSD32_SYS_compat_50_netbsd32_futimes, "compat_netbsd32_50" }, | 105 | { NETBSD32_SYS_compat_50_netbsd32_futimes, "compat_netbsd32_50" }, | |
87 | { NETBSD32_SYS_compat_14_netbsd32___semctl, "compat_netbsd32_sysvipc_14" }, | 106 | { NETBSD32_SYS_compat_14_netbsd32___semctl, "compat_netbsd32_sysvipc_14" }, | |
88 | { NETBSD32_SYS_netbsd32_semget, "compat_netbsd32_sysvipc" }, | 107 | { NETBSD32_SYS_netbsd32_semget, "compat_netbsd32_sysvipc" }, | |
89 | { NETBSD32_SYS_netbsd32_semop, "compat_netbsd32_sysvipc" }, | 108 | { NETBSD32_SYS_netbsd32_semop, "compat_netbsd32_sysvipc" }, | |
90 | { NETBSD32_SYS_netbsd32_semconfig, "compat_netbsd32_sysvipc" }, | 109 | { NETBSD32_SYS_netbsd32_semconfig, "compat_netbsd32_sysvipc" }, | |
91 | { NETBSD32_SYS_compat_14_netbsd32_msgctl, "compat_netbsd32_sysvipc_14" }, | 110 | { NETBSD32_SYS_compat_14_netbsd32_msgctl, "compat_netbsd32_sysvipc_14" }, | |
92 | { NETBSD32_SYS_netbsd32_msgget, "compat_netbsd32_sysvipc" }, | 111 | { NETBSD32_SYS_netbsd32_msgget, "compat_netbsd32_sysvipc" }, | |
93 | { NETBSD32_SYS_netbsd32_msgsnd, "compat_netbsd32_sysvipc" }, | 112 | { NETBSD32_SYS_netbsd32_msgsnd, "compat_netbsd32_sysvipc" }, | |
94 | { NETBSD32_SYS_netbsd32_msgrcv, "compat_netbsd32_sysvipc" }, | 113 | { NETBSD32_SYS_netbsd32_msgrcv, "compat_netbsd32_sysvipc" }, | |
@@ -132,15 +151,21 @@ static struct sc_autoload netbsd32_sysca | @@ -132,15 +151,21 @@ static struct sc_autoload netbsd32_sysca | |||
132 | { NETBSD32_SYS_compat_50_netbsd32_pollts, "compat_netbsd32_50" }, | 151 | { NETBSD32_SYS_compat_50_netbsd32_pollts, "compat_netbsd32_50" }, | |
133 | { NETBSD32_SYS_compat_50_netbsd32___stat30, "compat_netbsd32_50" }, | 152 | { NETBSD32_SYS_compat_50_netbsd32___stat30, "compat_netbsd32_50" }, | |
134 | { NETBSD32_SYS_compat_50_netbsd32___fstat30, "compat_netbsd32_50" }, | 153 | { NETBSD32_SYS_compat_50_netbsd32___fstat30, "compat_netbsd32_50" }, | |
135 | { NETBSD32_SYS_compat_50_netbsd32___lstat30, "compat_netbsd32_50" }, | 154 | { NETBSD32_SYS_compat_50_netbsd32___lstat30, "compat_netbsd32_50" }, | |
136 | { NETBSD32_SYS_compat_30_netbsd32___fhstat30, "compat_netbsd32_30" }, | 155 | { NETBSD32_SYS_compat_30_netbsd32___fhstat30, "compat_netbsd32_30" }, | |
137 | { NETBSD32_SYS_compat_50_netbsd32_ntp_gettime, "compat_netbsd32_50" }, | 156 | { NETBSD32_SYS_compat_50_netbsd32_ntp_gettime, "compat_netbsd32_50" }, | |
138 | { NETBSD32_SYS_compat_50_netbsd32___fhstat40, "compat_netbsd32_50" }, | 157 | { NETBSD32_SYS_compat_50_netbsd32___fhstat40, "compat_netbsd32_50" }, | |
139 | { NETBSD32_SYS_netbsd32___mq_timedsend50, "compat_netbsd32_mqueue" }, | 158 | { NETBSD32_SYS_netbsd32___mq_timedsend50, "compat_netbsd32_mqueue" }, | |
140 | { NETBSD32_SYS_netbsd32___mq_timedreceive50, "compat_netbsd32_mqueue" }, | 159 | { NETBSD32_SYS_netbsd32___mq_timedreceive50, "compat_netbsd32_mqueue" }, | |
141 | { NETBSD32_SYS_compat_60_netbsd32__lwp_park, "compat_netbsd32_60" }, | 160 | { NETBSD32_SYS_compat_60_netbsd32__lwp_park, "compat_netbsd32_60" }, | |
142 | { NETBSD32_SYS_netbsd32_____semctl50, "compat_netbsd32_sysvipc" }, | 161 | { NETBSD32_SYS_netbsd32_____semctl50, "compat_netbsd32_sysvipc" }, | |
143 | { NETBSD32_SYS_netbsd32___shmctl50, "compat_netbsd32_sysvipc" }, | 162 | { NETBSD32_SYS_netbsd32___shmctl50, "compat_netbsd32_sysvipc" }, | |
144 | { NETBSD32_SYS_netbsd32___msgctl50, "compat_netbsd32_sysvipc" }, | 163 | { NETBSD32_SYS_netbsd32___msgctl50, "compat_netbsd32_sysvipc" }, | |
164 | #if defined(NTP) || !defined(_KERNEL_OPT) | |||
165 | #else | |||
166 | #endif | |||
167 | #if defined(QUOTA) || !defined(_KERNEL_OPT) | |||
168 | #else | |||
169 | #endif | |||
145 | { 0, NULL } | 170 | { 0, NULL } | |
146 | }; | 171 | }; |
--- src/sys/compat/netbsd32/netbsd32_sysent.c 2019/06/18 01:37:04 1.139
+++ src/sys/compat/netbsd32/netbsd32_sysent.c 2019/06/18 16:24:32 1.140
@@ -1,37 +1,38 @@ | @@ -1,37 +1,38 @@ | |||
1 | /* $NetBSD: netbsd32_sysent.c,v 1.139 2019/06/18 01:37:04 christos Exp $ */ | 1 | /* $NetBSD: netbsd32_sysent.c,v 1.140 2019/06/18 16:24:32 christos Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * System call switch table. | 4 | * System call switch table. | |
5 | * | 5 | * | |
6 | * DO NOT EDIT-- this file is automatically generated. | 6 | * DO NOT EDIT-- this file is automatically generated. | |
7 | * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #include <sys/cdefs.h> | 10 | #include <sys/cdefs.h> | |
11 | __KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.139 2019/06/18 01:37:04 christos Exp $"); | 11 | __KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.140 2019/06/18 16:24:32 christos Exp $"); | |
12 | 12 | |||
13 | #if defined(_KERNEL_OPT) | 13 | #if defined(_KERNEL_OPT) | |
14 | #include "opt_compat_netbsd.h" | 14 | #include "opt_compat_netbsd.h" | |
15 | #include "opt_ntp.h" | 15 | #include "opt_ntp.h" | |
16 | #include "opt_compat_43.h" | 16 | #include "opt_compat_43.h" | |
17 | #include "opt_quota.h" | 17 | #include "opt_quota.h" | |
18 | #endif | 18 | #endif | |
19 | #include <sys/param.h> | 19 | #include <sys/param.h> | |
20 | #include <sys/systm.h> | 20 | #include <sys/systm.h> | |
21 | #include <sys/signal.h> | 21 | #include <sys/signal.h> | |
22 | #include <sys/mount.h> | 22 | #include <sys/mount.h> | |
23 | #include <sys/syscallargs.h> | 23 | #include <sys/syscallargs.h> | |
24 | #include <compat/netbsd32/netbsd32.h> | 24 | #include <compat/netbsd32/netbsd32.h> | |
25 | #include <compat/netbsd32/netbsd32_syscall.h> | |||
25 | #include <compat/netbsd32/netbsd32_syscallargs.h> | 26 | #include <compat/netbsd32/netbsd32_syscallargs.h> | |
26 | 27 | |||
27 | #ifdef COMPAT_43 | 28 | #ifdef COMPAT_43 | |
28 | #define compat_43(func) __CONCAT(compat_43_,func) | 29 | #define compat_43(func) __CONCAT(compat_43_,func) | |
29 | #else | 30 | #else | |
30 | #define compat_43(func) sys_nosys | 31 | #define compat_43(func) sys_nosys | |
31 | #endif | 32 | #endif | |
32 | 33 | |||
33 | #ifdef COMPAT_09 | 34 | #ifdef COMPAT_09 | |
34 | #define compat_09(func) __CONCAT(compat_09_,func) | 35 | #define compat_09(func) __CONCAT(compat_09_,func) | |
35 | #else | 36 | #else | |
36 | #define compat_09(func) sys_nosys | 37 | #define compat_09(func) sys_nosys | |
37 | #endif | 38 | #endif | |
@@ -1939,30 +1940,36 @@ struct sysent netbsd32_sysent[] = { | @@ -1939,30 +1940,36 @@ struct sysent netbsd32_sysent[] = { | |||
1939 | }, /* 469 = netbsd32_readlinkat */ | 1940 | }, /* 469 = netbsd32_readlinkat */ | |
1940 | { | 1941 | { | |
1941 | ns(struct netbsd32_symlinkat_args), | 1942 | ns(struct netbsd32_symlinkat_args), | |
1942 | .sy_call = (sy_call_t *)netbsd32_symlinkat | 1943 | .sy_call = (sy_call_t *)netbsd32_symlinkat | |
1943 | }, /* 470 = netbsd32_symlinkat */ | 1944 | }, /* 470 = netbsd32_symlinkat */ | |
1944 | { | 1945 | { | |
1945 | ns(struct netbsd32_unlinkat_args), | 1946 | ns(struct netbsd32_unlinkat_args), | |
1946 | .sy_call = (sy_call_t *)netbsd32_unlinkat | 1947 | .sy_call = (sy_call_t *)netbsd32_unlinkat | |
1947 | }, /* 471 = netbsd32_unlinkat */ | 1948 | }, /* 471 = netbsd32_unlinkat */ | |
1948 | { | 1949 | { | |
1949 | ns(struct netbsd32_futimens_args), | 1950 | ns(struct netbsd32_futimens_args), | |
1950 | .sy_call = (sy_call_t *)netbsd32_futimens | 1951 | .sy_call = (sy_call_t *)netbsd32_futimens | |
1951 | }, /* 472 = netbsd32_futimens */ | 1952 | }, /* 472 = netbsd32_futimens */ | |
1953 | #if defined(QUOTA) || !defined(_KERNEL_OPT) | |||
1952 | { | 1954 | { | |
1953 | ns(struct netbsd32___quotactl_args), | 1955 | ns(struct netbsd32___quotactl_args), | |
1954 | .sy_call = (sy_call_t *)netbsd32___quotactl | 1956 | .sy_call = (sy_call_t *)netbsd32___quotactl | |
1955 | }, /* 473 = netbsd32___quotactl */ | 1957 | }, /* 473 = netbsd32___quotactl */ | |
1958 | #else | |||
1959 | { | |||
1960 | .sy_call = sys_nosys, | |||
1961 | }, /* 473 = filler */ | |||
1962 | #endif | |||
1956 | { | 1963 | { | |
1957 | ns(struct netbsd32_posix_spawn_args), | 1964 | ns(struct netbsd32_posix_spawn_args), | |
1958 | .sy_call = (sy_call_t *)netbsd32_posix_spawn | 1965 | .sy_call = (sy_call_t *)netbsd32_posix_spawn | |
1959 | }, /* 474 = netbsd32_posix_spawn */ | 1966 | }, /* 474 = netbsd32_posix_spawn */ | |
1960 | { | 1967 | { | |
1961 | ns(struct netbsd32_recvmmsg_args), | 1968 | ns(struct netbsd32_recvmmsg_args), | |
1962 | .sy_call = (sy_call_t *)netbsd32_recvmmsg | 1969 | .sy_call = (sy_call_t *)netbsd32_recvmmsg | |
1963 | }, /* 475 = netbsd32_recvmmsg */ | 1970 | }, /* 475 = netbsd32_recvmmsg */ | |
1964 | { | 1971 | { | |
1965 | ns(struct netbsd32_sendmmsg_args), | 1972 | ns(struct netbsd32_sendmmsg_args), | |
1966 | .sy_call = (sy_call_t *)netbsd32_sendmmsg | 1973 | .sy_call = (sy_call_t *)netbsd32_sendmmsg | |
1967 | }, /* 476 = netbsd32_sendmmsg */ | 1974 | }, /* 476 = netbsd32_sendmmsg */ | |
1968 | { | 1975 | { |
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c 2019/06/18 01:37:04 1.31
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c 2019/06/18 16:24:32 1.32
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: netbsd32_systrace_args.c,v 1.31 2019/06/18 01:37:04 christos Exp $ */ | 1 | /* $NetBSD: netbsd32_systrace_args.c,v 1.32 2019/06/18 16:24:32 christos Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * System call argument to DTrace register array converstion. | 4 | * System call argument to DTrace register array converstion. | |
5 | * | 5 | * | |
6 | * DO NOT EDIT-- this file is automatically generated. | 6 | * DO NOT EDIT-- this file is automatically generated. | |
7 | * This file is part of the DTrace syscall provider. | 7 | * This file is part of the DTrace syscall provider. | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | static void | 10 | static void | |
11 | systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_args) | 11 | systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_args) | |
12 | { | 12 | { | |
13 | intptr_t *iarg = (intptr_t *)uarg; | 13 | intptr_t *iarg = (intptr_t *)uarg; | |
14 | switch (sysnum) { | 14 | switch (sysnum) { | |
@@ -3375,34 +3375,37 @@ systrace_args(register_t sysnum, const v | @@ -3375,34 +3375,37 @@ systrace_args(register_t sysnum, const v | |||
3375 | uarg[1] = (intptr_t) SCARG(p, path).i32; /* const netbsd32_charp */ | 3375 | uarg[1] = (intptr_t) SCARG(p, path).i32; /* const netbsd32_charp */ | |
3376 | iarg[2] = SCARG(p, flag); /* int */ | 3376 | iarg[2] = SCARG(p, flag); /* int */ | |
3377 | *n_args = 3; | 3377 | *n_args = 3; | |
3378 | break; | 3378 | break; | |
3379 | } | 3379 | } | |
3380 | /* netbsd32_futimens */ | 3380 | /* netbsd32_futimens */ | |
3381 | case 472: { | 3381 | case 472: { | |
3382 | const struct netbsd32_futimens_args *p = params; | 3382 | const struct netbsd32_futimens_args *p = params; | |
3383 | iarg[0] = SCARG(p, fd); /* int */ | 3383 | iarg[0] = SCARG(p, fd); /* int */ | |
3384 | uarg[1] = (intptr_t) SCARG(p, tptr).i32; /* const netbsd32_timespecp_t */ | 3384 | uarg[1] = (intptr_t) SCARG(p, tptr).i32; /* const netbsd32_timespecp_t */ | |
3385 | *n_args = 2; | 3385 | *n_args = 2; | |
3386 | break; | 3386 | break; | |
3387 | } | 3387 | } | |
3388 | #if defined(QUOTA) || !defined(_KERNEL_OPT) | |||
3388 | /* netbsd32___quotactl */ | 3389 | /* netbsd32___quotactl */ | |
3389 | case 473: { | 3390 | case 473: { | |
3390 | const struct netbsd32___quotactl_args *p = params; | 3391 | const struct netbsd32___quotactl_args *p = params; | |
3391 | uarg[0] = (intptr_t) SCARG(p, path).i32; /* const netbsd32_charp */ | 3392 | uarg[0] = (intptr_t) SCARG(p, path).i32; /* const netbsd32_charp */ | |
3392 | uarg[1] = (intptr_t) SCARG(p, args).i32; /* netbsd32_voidp */ | 3393 | uarg[1] = (intptr_t) SCARG(p, args).i32; /* netbsd32_voidp */ | |
3393 | *n_args = 2; | 3394 | *n_args = 2; | |
3394 | break; | 3395 | break; | |
3395 | } | 3396 | } | |
3397 | #else | |||
3398 | #endif | |||
3396 | /* netbsd32_posix_spawn */ | 3399 | /* netbsd32_posix_spawn */ | |
3397 | case 474: { | 3400 | case 474: { | |
3398 | const struct netbsd32_posix_spawn_args *p = params; | 3401 | const struct netbsd32_posix_spawn_args *p = params; | |
3399 | uarg[0] = (intptr_t) SCARG(p, pid).i32; /* netbsd32_pid_tp */ | 3402 | uarg[0] = (intptr_t) SCARG(p, pid).i32; /* netbsd32_pid_tp */ | |
3400 | uarg[1] = (intptr_t) SCARG(p, path).i32; /* const netbsd32_charp */ | 3403 | uarg[1] = (intptr_t) SCARG(p, path).i32; /* const netbsd32_charp */ | |
3401 | uarg[2] = (intptr_t) SCARG(p, file_actions).i32; /* const netbsd32_posix_spawn_file_actionsp */ | 3404 | uarg[2] = (intptr_t) SCARG(p, file_actions).i32; /* const netbsd32_posix_spawn_file_actionsp */ | |
3402 | uarg[3] = (intptr_t) SCARG(p, attrp).i32; /* const netbsd32_posix_spawnattrp */ | 3405 | uarg[3] = (intptr_t) SCARG(p, attrp).i32; /* const netbsd32_posix_spawnattrp */ | |
3403 | uarg[4] = (intptr_t) SCARG(p, argv).i32; /* netbsd32_charpp */ | 3406 | uarg[4] = (intptr_t) SCARG(p, argv).i32; /* netbsd32_charpp */ | |
3404 | uarg[5] = (intptr_t) SCARG(p, envp).i32; /* netbsd32_charpp */ | 3407 | uarg[5] = (intptr_t) SCARG(p, envp).i32; /* netbsd32_charpp */ | |
3405 | *n_args = 6; | 3408 | *n_args = 6; | |
3406 | break; | 3409 | break; | |
3407 | } | 3410 | } | |
3408 | /* netbsd32_recvmmsg */ | 3411 | /* netbsd32_recvmmsg */ | |
@@ -9208,39 +9211,42 @@ systrace_entry_setargdesc(int sysnum, in | @@ -9208,39 +9211,42 @@ systrace_entry_setargdesc(int sysnum, in | |||
9208 | /* netbsd32_futimens */ | 9211 | /* netbsd32_futimens */ | |
9209 | case 472: | 9212 | case 472: | |
9210 | switch(ndx) { | 9213 | switch(ndx) { | |
9211 | case 0: | 9214 | case 0: | |
9212 | p = "int"; | 9215 | p = "int"; | |
9213 | break; | 9216 | break; | |
9214 | case 1: | 9217 | case 1: | |
9215 | p = "const netbsd32_timespecp_t"; | 9218 | p = "const netbsd32_timespecp_t"; | |
9216 | break; | 9219 | break; | |
9217 | default: | 9220 | default: | |
9218 | break; | 9221 | break; | |
9219 | }; | 9222 | }; | |
9220 | break; | 9223 | break; | |
9224 | #if defined(QUOTA) || !defined(_KERNEL_OPT) | |||
9221 | /* netbsd32___quotactl */ | 9225 | /* netbsd32___quotactl */ | |
9222 | case 473: | 9226 | case 473: | |
9223 | switch(ndx) { | 9227 | switch(ndx) { | |
9224 | case 0: | 9228 | case 0: | |
9225 | p = "const netbsd32_charp"; | 9229 | p = "const netbsd32_charp"; | |
9226 | break; | 9230 | break; | |
9227 | case 1: | 9231 | case 1: | |
9228 | p = "netbsd32_voidp"; | 9232 | p = "netbsd32_voidp"; | |
9229 | break; | 9233 | break; | |
9230 | default: | 9234 | default: | |
9231 | break; | 9235 | break; | |
9232 | }; | 9236 | }; | |
9233 | break; | 9237 | break; | |
9238 | #else | |||
9239 | #endif | |||
9234 | /* netbsd32_posix_spawn */ | 9240 | /* netbsd32_posix_spawn */ | |
9235 | case 474: | 9241 | case 474: | |
9236 | switch(ndx) { | 9242 | switch(ndx) { | |
9237 | case 0: | 9243 | case 0: | |
9238 | p = "netbsd32_pid_tp"; | 9244 | p = "netbsd32_pid_tp"; | |
9239 | break; | 9245 | break; | |
9240 | case 1: | 9246 | case 1: | |
9241 | p = "const netbsd32_charp"; | 9247 | p = "const netbsd32_charp"; | |
9242 | break; | 9248 | break; | |
9243 | case 2: | 9249 | case 2: | |
9244 | p = "const netbsd32_posix_spawn_file_actionsp"; | 9250 | p = "const netbsd32_posix_spawn_file_actionsp"; | |
9245 | break; | 9251 | break; | |
9246 | case 3: | 9252 | case 3: | |
@@ -11332,31 +11338,34 @@ systrace_return_setargdesc(int sysnum, i | @@ -11332,31 +11338,34 @@ systrace_return_setargdesc(int sysnum, i | |||
11332 | if (ndx == 0 || ndx == 1) | 11338 | if (ndx == 0 || ndx == 1) | |
11333 | p = "int"; | 11339 | p = "int"; | |
11334 | break; | 11340 | break; | |
11335 | /* netbsd32_unlinkat */ | 11341 | /* netbsd32_unlinkat */ | |
11336 | case 471: | 11342 | case 471: | |
11337 | if (ndx == 0 || ndx == 1) | 11343 | if (ndx == 0 || ndx == 1) | |
11338 | p = "int"; | 11344 | p = "int"; | |
11339 | break; | 11345 | break; | |
11340 | /* netbsd32_futimens */ | 11346 | /* netbsd32_futimens */ | |
11341 | case 472: | 11347 | case 472: | |
11342 | if (ndx == 0 || ndx == 1) | 11348 | if (ndx == 0 || ndx == 1) | |
11343 | p = "int"; | 11349 | p = "int"; | |
11344 | break; | 11350 | break; | |
11351 | #if defined(QUOTA) || !defined(_KERNEL_OPT) | |||
11345 | /* netbsd32___quotactl */ | 11352 | /* netbsd32___quotactl */ | |
11346 | case 473: | 11353 | case 473: | |
11347 | if (ndx == 0 || ndx == 1) | 11354 | if (ndx == 0 || ndx == 1) | |
11348 | p = "int"; | 11355 | p = "int"; | |
11349 | break; | 11356 | break; | |
11357 | #else | |||
11358 | #endif | |||
11350 | /* netbsd32_posix_spawn */ | 11359 | /* netbsd32_posix_spawn */ | |
11351 | case 474: | 11360 | case 474: | |
11352 | if (ndx == 0 || ndx == 1) | 11361 | if (ndx == 0 || ndx == 1) | |
11353 | p = "int"; | 11362 | p = "int"; | |
11354 | break; | 11363 | break; | |
11355 | /* netbsd32_recvmmsg */ | 11364 | /* netbsd32_recvmmsg */ | |
11356 | case 475: | 11365 | case 475: | |
11357 | if (ndx == 0 || ndx == 1) | 11366 | if (ndx == 0 || ndx == 1) | |
11358 | p = "int"; | 11367 | p = "int"; | |
11359 | break; | 11368 | break; | |
11360 | /* netbsd32_sendmmsg */ | 11369 | /* netbsd32_sendmmsg */ | |
11361 | case 476: | 11370 | case 476: | |
11362 | if (ndx == 0 || ndx == 1) | 11371 | if (ndx == 0 || ndx == 1) |