regendiff -r1.340 -r1.341 src/sys/kern/init_sysent.c
(christos)
--- src/sys/kern/init_sysent.c 2023/07/10 02:37:05 1.340
+++ src/sys/kern/init_sysent.c 2023/07/28 18:20:28 1.341
@@ -1,24 +1,24 @@ | @@ -1,24 +1,24 @@ | |||
1 | /* $NetBSD: init_sysent.c,v 1.340 2023/07/10 02:37:05 christos Exp $ */ | 1 | /* $NetBSD: init_sysent.c,v 1.341 2023/07/28 18:20:28 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.310 2023/07/10 02:33:04 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #include <sys/cdefs.h> | 10 | #include <sys/cdefs.h> | |
11 | __KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.340 2023/07/10 02:37:05 christos Exp $"); | 11 | __KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.341 2023/07/28 18:20:28 christos Exp $"); | |
12 | 12 | |||
13 | #ifdef _KERNEL_OPT | 13 | #ifdef _KERNEL_OPT | |
14 | #include "opt_modular.h" | 14 | #include "opt_modular.h" | |
15 | #include "opt_ntp.h" | 15 | #include "opt_ntp.h" | |
16 | #include "opt_sysv.h" | 16 | #include "opt_sysv.h" | |
17 | #endif | 17 | #endif | |
18 | #include <sys/param.h> | 18 | #include <sys/param.h> | |
19 | #include <sys/systm.h> | 19 | #include <sys/systm.h> | |
20 | #include <sys/signal.h> | 20 | #include <sys/signal.h> | |
21 | #include <sys/socket.h> | 21 | #include <sys/socket.h> | |
22 | #include <sys/mount.h> | 22 | #include <sys/mount.h> | |
23 | #include <sys/sched.h> | 23 | #include <sys/sched.h> | |
24 | #include <sys/idtype.h> | 24 | #include <sys/idtype.h> | |
@@ -117,26 +117,32 @@ __KERNEL_RCSID(0, "$NetBSD: init_sysent. | @@ -117,26 +117,32 @@ __KERNEL_RCSID(0, "$NetBSD: init_sysent. | |||
117 | 117 | |||
118 | #ifdef COMPAT_80 | 118 | #ifdef COMPAT_80 | |
119 | #define compat_80(func) __CONCAT(compat_80_,func) | 119 | #define compat_80(func) __CONCAT(compat_80_,func) | |
120 | #else | 120 | #else | |
121 | #define compat_80(func) sys_nosys | 121 | #define compat_80(func) sys_nosys | |
122 | #endif | 122 | #endif | |
123 | 123 | |||
124 | #ifdef COMPAT_90 | 124 | #ifdef COMPAT_90 | |
125 | #define compat_90(func) __CONCAT(compat_90_,func) | 125 | #define compat_90(func) __CONCAT(compat_90_,func) | |
126 | #else | 126 | #else | |
127 | #define compat_90(func) sys_nosys | 127 | #define compat_90(func) sys_nosys | |
128 | #endif | 128 | #endif | |
129 | 129 | |||
130 | #ifdef COMPAT_100 | |||
131 | #define compat_100(func) __CONCAT(compat_100_,func) | |||
132 | #else | |||
133 | #define compat_100(func) sys_nosys | |||
134 | #endif | |||
135 | ||||
130 | #define s(type) sizeof(type) | 136 | #define s(type) sizeof(type) | |
131 | #define n(type) (sizeof(type)/sizeof (register_t)) | 137 | #define n(type) (sizeof(type)/sizeof (register_t)) | |
132 | #define ns(type) .sy_narg = n(type), .sy_argsize = s(type) | 138 | #define ns(type) .sy_narg = n(type), .sy_argsize = s(type) | |
133 | 139 | |||
134 | struct sysent sysent[] = { | 140 | struct sysent sysent[] = { | |
135 | { | 141 | { | |
136 | ns(struct sys_syscall_args), | 142 | ns(struct sys_syscall_args), | |
137 | .sy_flags = SYCALL_INDIRECT, | 143 | .sy_flags = SYCALL_INDIRECT, | |
138 | .sy_call = (sy_call_t *)sys_syscall | 144 | .sy_call = (sy_call_t *)sys_syscall | |
139 | }, /* 0 = syscall */ | 145 | }, /* 0 = syscall */ | |
140 | { | 146 | { | |
141 | ns(struct sys_exit_args), | 147 | ns(struct sys_exit_args), | |
142 | .sy_call = (sy_call_t *)sys_exit | 148 | .sy_call = (sy_call_t *)sys_exit | |
@@ -2102,30 +2108,30 @@ struct sysent sysent[] = { | @@ -2102,30 +2108,30 @@ struct sysent sysent[] = { | |||
2102 | .sy_call = (sy_call_t *)sys_nomodule | 2108 | .sy_call = (sy_call_t *)sys_nomodule | |
2103 | }, /* 432 = __mq_timedsend50 */ | 2109 | }, /* 432 = __mq_timedsend50 */ | |
2104 | { | 2110 | { | |
2105 | ns(struct sys___mq_timedreceive50_args), | 2111 | ns(struct sys___mq_timedreceive50_args), | |
2106 | .sy_flags = SYCALL_ARG_PTR, | 2112 | .sy_flags = SYCALL_ARG_PTR, | |
2107 | .sy_call = (sy_call_t *)sys_nomodule | 2113 | .sy_call = (sy_call_t *)sys_nomodule | |
2108 | }, /* 433 = __mq_timedreceive50 */ | 2114 | }, /* 433 = __mq_timedreceive50 */ | |
2109 | { | 2115 | { | |
2110 | ns(struct compat_60_sys__lwp_park_args), | 2116 | ns(struct compat_60_sys__lwp_park_args), | |
2111 | .sy_flags = SYCALL_ARG_PTR, | 2117 | .sy_flags = SYCALL_ARG_PTR, | |
2112 | .sy_call = (sy_call_t *)sys_nomodule | 2118 | .sy_call = (sy_call_t *)sys_nomodule | |
2113 | }, /* 434 = compat_60__lwp_park */ | 2119 | }, /* 434 = compat_60__lwp_park */ | |
2114 | { | 2120 | { | |
2115 | ns(struct sys___kevent50_args), | 2121 | ns(struct compat_100_sys___kevent50_args), | |
2116 | .sy_flags = SYCALL_ARG_PTR, | 2122 | .sy_flags = SYCALL_ARG_PTR, | |
2117 | .sy_call = (sy_call_t *)sys___kevent50 | 2123 | .sy_call = (sy_call_t *)sys_nomodule | |
2118 | }, /* 435 = __kevent50 */ | 2124 | }, /* 435 = compat_100___kevent50 */ | |
2119 | { | 2125 | { | |
2120 | ns(struct sys___pselect50_args), | 2126 | ns(struct sys___pselect50_args), | |
2121 | .sy_flags = SYCALL_ARG_PTR, | 2127 | .sy_flags = SYCALL_ARG_PTR, | |
2122 | .sy_call = (sy_call_t *)sys___pselect50 | 2128 | .sy_call = (sy_call_t *)sys___pselect50 | |
2123 | }, /* 436 = __pselect50 */ | 2129 | }, /* 436 = __pselect50 */ | |
2124 | { | 2130 | { | |
2125 | ns(struct sys___pollts50_args), | 2131 | ns(struct sys___pollts50_args), | |
2126 | .sy_flags = SYCALL_ARG_PTR, | 2132 | .sy_flags = SYCALL_ARG_PTR, | |
2127 | .sy_call = (sy_call_t *)sys___pollts50 | 2133 | .sy_call = (sy_call_t *)sys___pollts50 | |
2128 | }, /* 437 = __pollts50 */ | 2134 | }, /* 437 = __pollts50 */ | |
2129 | { | 2135 | { | |
2130 | ns(struct sys___aio_suspend50_args), | 2136 | ns(struct sys___aio_suspend50_args), | |
2131 | .sy_flags = SYCALL_ARG_PTR, | 2137 | .sy_flags = SYCALL_ARG_PTR, | |
@@ -2433,37 +2439,44 @@ struct sysent sysent[] = { | @@ -2433,37 +2439,44 @@ struct sysent sysent[] = { | |||
2433 | .sy_call = (sy_call_t *)sys___acl_aclcheck_fd | 2439 | .sy_call = (sy_call_t *)sys___acl_aclcheck_fd | |
2434 | }, /* 498 = __acl_aclcheck_fd */ | 2440 | }, /* 498 = __acl_aclcheck_fd */ | |
2435 | { | 2441 | { | |
2436 | ns(struct sys_lpathconf_args), | 2442 | ns(struct sys_lpathconf_args), | |
2437 | .sy_flags = SYCALL_ARG_PTR, | 2443 | .sy_flags = SYCALL_ARG_PTR, | |
2438 | .sy_call = (sy_call_t *)sys_lpathconf | 2444 | .sy_call = (sy_call_t *)sys_lpathconf | |
2439 | }, /* 499 = lpathconf */ | 2445 | }, /* 499 = lpathconf */ | |
2440 | { | 2446 | { | |
2441 | ns(struct sys_memfd_create_args), | 2447 | ns(struct sys_memfd_create_args), | |
2442 | .sy_flags = SYCALL_ARG_PTR, | 2448 | .sy_flags = SYCALL_ARG_PTR, | |
2443 | .sy_call = (sy_call_t *)sys_memfd_create | 2449 | .sy_call = (sy_call_t *)sys_memfd_create | |
2444 | }, /* 500 = memfd_create */ | 2450 | }, /* 500 = memfd_create */ | |
2445 | { | 2451 | { | |
2446 | .sy_call = sys_nosys, | 2452 | ns(struct sys___kevent100_args), | |
2447 | }, /* 501 = filler */ | 2453 | .sy_flags = SYCALL_ARG_PTR, | |
2454 | .sy_call = (sy_call_t *)sys___kevent100 | |||
2455 | }, /* 501 = __kevent100 */ | |||
2448 | { | 2456 | { | |
2449 | .sy_call = sys_nosys, | 2457 | ns(struct sys_epoll_create1_args), | |
2450 | }, /* 502 = filler */ | 2458 | .sy_call = (sy_call_t *)sys_epoll_create1 | |
2459 | }, /* 502 = epoll_create1 */ | |||
2451 | { | 2460 | { | |
2452 | .sy_call = sys_nosys, | 2461 | ns(struct sys_epoll_ctl_args), | |
2453 | }, /* 503 = filler */ | 2462 | .sy_flags = SYCALL_ARG_PTR, | |
2463 | .sy_call = (sy_call_t *)sys_epoll_ctl | |||
2464 | }, /* 503 = epoll_ctl */ | |||
2454 | { | 2465 | { | |
2455 | .sy_call = sys_nosys, | 2466 | ns(struct sys_epoll_pwait2_args), | |
2456 | }, /* 504 = filler */ | 2467 | .sy_flags = SYCALL_ARG_PTR, | |
2468 | .sy_call = (sy_call_t *)sys_epoll_pwait2 | |||
2469 | }, /* 504 = epoll_pwait2 */ | |||
2457 | { | 2470 | { | |
2458 | .sy_call = sys_nosys, | 2471 | .sy_call = sys_nosys, | |
2459 | }, /* 505 = filler */ | 2472 | }, /* 505 = filler */ | |
2460 | { | 2473 | { | |
2461 | .sy_call = sys_nosys, | 2474 | .sy_call = sys_nosys, | |
2462 | }, /* 506 = filler */ | 2475 | }, /* 506 = filler */ | |
2463 | { | 2476 | { | |
2464 | .sy_call = sys_nosys, | 2477 | .sy_call = sys_nosys, | |
2465 | }, /* 507 = filler */ | 2478 | }, /* 507 = filler */ | |
2466 | { | 2479 | { | |
2467 | .sy_call = sys_nosys, | 2480 | .sy_call = sys_nosys, | |
2468 | }, /* 508 = filler */ | 2481 | }, /* 508 = filler */ | |
2469 | { | 2482 | { | |
@@ -2481,17 +2494,17 @@ const uint32_t sysent_nomodbits[] = { | @@ -2481,17 +2494,17 @@ const uint32_t sysent_nomodbits[] = { | |||
2481 | 0x042c4180, /* syscalls 0- 31 */ | 2494 | 0x042c4180, /* syscalls 0- 31 */ | |
2482 | 0xc0b14140, /* syscalls 32- 63 */ | 2495 | 0xc0b14140, /* syscalls 32- 63 */ | |
2483 | 0x23f80083, /* syscalls 64- 95 */ | 2496 | 0x23f80083, /* syscalls 64- 95 */ | |
2484 | 0x2437f0ea, /* syscalls 96-127 */ | 2497 | 0x2437f0ea, /* syscalls 96-127 */ | |
2485 | 0x7877f406, /* syscalls 128-159 */ | 2498 | 0x7877f406, /* syscalls 128-159 */ | |
2486 | 0x7f008e1e, /* syscalls 160-191 */ | 2499 | 0x7f008e1e, /* syscalls 160-191 */ | |
2487 | 0xf0044010, /* syscalls 192-223 */ | 2500 | 0xf0044010, /* syscalls 192-223 */ | |
2488 | 0xff9167ff, /* syscalls 224-255 */ | 2501 | 0xff9167ff, /* syscalls 224-255 */ | |
2489 | 0x01d107ff, /* syscalls 256-287 */ | 2502 | 0x01d107ff, /* syscalls 256-287 */ | |
2490 | 0x0000fc88, /* syscalls 288-319 */ | 2503 | 0x0000fc88, /* syscalls 288-319 */ | |
2491 | 0x0200fc01, /* syscalls 320-351 */ | 2504 | 0x0200fc01, /* syscalls 320-351 */ | |
2492 | 0x006000f0, /* syscalls 352-383 */ | 2505 | 0x006000f0, /* syscalls 352-383 */ | |
2493 | 0x007fe338, /* syscalls 384-415 */ | 2506 | 0x007fe338, /* syscalls 384-415 */ | |
2494 | 0x1c470040, /* syscalls 416-447 */ | 2507 | 0x1c4f0040, /* syscalls 416-447 */ | |
2495 | 0x00000000, /* syscalls 448-479 */ | 2508 | 0x00000000, /* syscalls 448-479 */ | |
2496 | 0x00000000, /* syscalls 480-511 */ | 2509 | 0x00000000, /* syscalls 480-511 */ | |
2497 | }; | 2510 | }; |
--- src/sys/kern/syscalls.c 2023/07/10 02:37:05 1.328
+++ src/sys/kern/syscalls.c 2023/07/28 18:20:28 1.329
@@ -1,24 +1,24 @@ | @@ -1,24 +1,24 @@ | |||
1 | /* $NetBSD: syscalls.c,v 1.328 2023/07/10 02:37:05 christos Exp $ */ | 1 | /* $NetBSD: syscalls.c,v 1.329 2023/07/28 18:20:28 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.310 2023/07/10 02:33:04 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #include <sys/cdefs.h> | 10 | #include <sys/cdefs.h> | |
11 | __KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.328 2023/07/10 02:37:05 christos Exp $"); | 11 | __KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.329 2023/07/28 18:20:28 christos Exp $"); | |
12 | 12 | |||
13 | #if defined(_KERNEL_OPT) | 13 | #if defined(_KERNEL_OPT) | |
14 | #ifdef _KERNEL_OPT | 14 | #ifdef _KERNEL_OPT | |
15 | #include "opt_modular.h" | 15 | #include "opt_modular.h" | |
16 | #include "opt_ntp.h" | 16 | #include "opt_ntp.h" | |
17 | #include "opt_sysv.h" | 17 | #include "opt_sysv.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/socket.h> | 22 | #include <sys/socket.h> | |
23 | #include <sys/mount.h> | 23 | #include <sys/mount.h> | |
24 | #include <sys/sched.h> | 24 | #include <sys/sched.h> | |
@@ -471,27 +471,27 @@ const char *const syscallnames[] = { | @@ -471,27 +471,27 @@ const char *const syscallnames[] = { | |||
471 | /* 422 */ "__lfs_segwait50", | 471 | /* 422 */ "__lfs_segwait50", | |
472 | /* 423 */ "__futimes50", | 472 | /* 423 */ "__futimes50", | |
473 | /* 424 */ "__lutimes50", | 473 | /* 424 */ "__lutimes50", | |
474 | /* 425 */ "__setitimer50", | 474 | /* 425 */ "__setitimer50", | |
475 | /* 426 */ "__getitimer50", | 475 | /* 426 */ "__getitimer50", | |
476 | /* 427 */ "__clock_gettime50", | 476 | /* 427 */ "__clock_gettime50", | |
477 | /* 428 */ "__clock_settime50", | 477 | /* 428 */ "__clock_settime50", | |
478 | /* 429 */ "__clock_getres50", | 478 | /* 429 */ "__clock_getres50", | |
479 | /* 430 */ "__nanosleep50", | 479 | /* 430 */ "__nanosleep50", | |
480 | /* 431 */ "____sigtimedwait50", | 480 | /* 431 */ "____sigtimedwait50", | |
481 | /* 432 */ "__mq_timedsend50", | 481 | /* 432 */ "__mq_timedsend50", | |
482 | /* 433 */ "__mq_timedreceive50", | 482 | /* 433 */ "__mq_timedreceive50", | |
483 | /* 434 */ "compat_60__lwp_park", | 483 | /* 434 */ "compat_60__lwp_park", | |
484 | /* 435 */ "__kevent50", | 484 | /* 435 */ "compat_100___kevent50", | |
485 | /* 436 */ "__pselect50", | 485 | /* 436 */ "__pselect50", | |
486 | /* 437 */ "__pollts50", | 486 | /* 437 */ "__pollts50", | |
487 | /* 438 */ "__aio_suspend50", | 487 | /* 438 */ "__aio_suspend50", | |
488 | /* 439 */ "__stat50", | 488 | /* 439 */ "__stat50", | |
489 | /* 440 */ "__fstat50", | 489 | /* 440 */ "__fstat50", | |
490 | /* 441 */ "__lstat50", | 490 | /* 441 */ "__lstat50", | |
491 | /* 442 */ "____semctl50", | 491 | /* 442 */ "____semctl50", | |
492 | /* 443 */ "__shmctl50", | 492 | /* 443 */ "__shmctl50", | |
493 | /* 444 */ "__msgctl50", | 493 | /* 444 */ "__msgctl50", | |
494 | /* 445 */ "__getrusage50", | 494 | /* 445 */ "__getrusage50", | |
495 | /* 446 */ "__timer_settime50", | 495 | /* 446 */ "__timer_settime50", | |
496 | /* 447 */ "__timer_gettime50", | 496 | /* 447 */ "__timer_gettime50", | |
497 | #if defined(NTP) || !defined(_KERNEL_OPT) | 497 | #if defined(NTP) || !defined(_KERNEL_OPT) | |
@@ -541,30 +541,30 @@ const char *const syscallnames[] = { | @@ -541,30 +541,30 @@ const char *const syscallnames[] = { | |||
541 | /* 488 */ "__acl_set_link", | 541 | /* 488 */ "__acl_set_link", | |
542 | /* 489 */ "__acl_delete_link", | 542 | /* 489 */ "__acl_delete_link", | |
543 | /* 490 */ "__acl_aclcheck_link", | 543 | /* 490 */ "__acl_aclcheck_link", | |
544 | /* 491 */ "__acl_get_file", | 544 | /* 491 */ "__acl_get_file", | |
545 | /* 492 */ "__acl_set_file", | 545 | /* 492 */ "__acl_set_file", | |
546 | /* 493 */ "__acl_get_fd", | 546 | /* 493 */ "__acl_get_fd", | |
547 | /* 494 */ "__acl_set_fd", | 547 | /* 494 */ "__acl_set_fd", | |
548 | /* 495 */ "__acl_delete_file", | 548 | /* 495 */ "__acl_delete_file", | |
549 | /* 496 */ "__acl_delete_fd", | 549 | /* 496 */ "__acl_delete_fd", | |
550 | /* 497 */ "__acl_aclcheck_file", | 550 | /* 497 */ "__acl_aclcheck_file", | |
551 | /* 498 */ "__acl_aclcheck_fd", | 551 | /* 498 */ "__acl_aclcheck_fd", | |
552 | /* 499 */ "lpathconf", | 552 | /* 499 */ "lpathconf", | |
553 | /* 500 */ "memfd_create", | 553 | /* 500 */ "memfd_create", | |
554 | /* 501 */ "# filler", | 554 | /* 501 */ "__kevent100", | |
555 | /* 502 */ "# filler", | 555 | /* 502 */ "epoll_create1", | |
556 | /* 503 */ "# filler", | 556 | /* 503 */ "epoll_ctl", | |
557 | /* 504 */ "# filler", | 557 | /* 504 */ "epoll_pwait2", | |
558 | /* 505 */ "# filler", | 558 | /* 505 */ "# filler", | |
559 | /* 506 */ "# filler", | 559 | /* 506 */ "# filler", | |
560 | /* 507 */ "# filler", | 560 | /* 507 */ "# filler", | |
561 | /* 508 */ "# filler", | 561 | /* 508 */ "# filler", | |
562 | /* 509 */ "# filler", | 562 | /* 509 */ "# filler", | |
563 | /* 510 */ "# filler", | 563 | /* 510 */ "# filler", | |
564 | /* 511 */ "# filler", | 564 | /* 511 */ "# filler", | |
565 | }; | 565 | }; | |
566 | 566 | |||
567 | 567 | |||
568 | /* libc style syscall names */ | 568 | /* libc style syscall names */ | |
569 | const char *const altsyscallnames[] = { | 569 | const char *const altsyscallnames[] = { | |
570 | /* 0 */ NULL, /* syscall */ | 570 | /* 0 */ NULL, /* syscall */ | |
@@ -1008,27 +1008,27 @@ const char *const altsyscallnames[] = { | @@ -1008,27 +1008,27 @@ const char *const altsyscallnames[] = { | |||
1008 | /* 422 */ "lfs_segwait", | 1008 | /* 422 */ "lfs_segwait", | |
1009 | /* 423 */ "futimes", | 1009 | /* 423 */ "futimes", | |
1010 | /* 424 */ "lutimes", | 1010 | /* 424 */ "lutimes", | |
1011 | /* 425 */ "setitimer", | 1011 | /* 425 */ "setitimer", | |
1012 | /* 426 */ "getitimer", | 1012 | /* 426 */ "getitimer", | |
1013 | /* 427 */ "clock_gettime", | 1013 | /* 427 */ "clock_gettime", | |
1014 | /* 428 */ "clock_settime", | 1014 | /* 428 */ "clock_settime", | |
1015 | /* 429 */ "clock_getres", | 1015 | /* 429 */ "clock_getres", | |
1016 | /* 430 */ "nanosleep", | 1016 | /* 430 */ "nanosleep", | |
1017 | /* 431 */ "__sigtimedwait", | 1017 | /* 431 */ "__sigtimedwait", | |
1018 | /* 432 */ "mq_timedsend", | 1018 | /* 432 */ "mq_timedsend", | |
1019 | /* 433 */ "mq_timedreceive", | 1019 | /* 433 */ "mq_timedreceive", | |
1020 | /* 434 */ NULL, /* compat_60__lwp_park */ | 1020 | /* 434 */ NULL, /* compat_60__lwp_park */ | |
1021 | /* 435 */ "kevent", | 1021 | /* 435 */ NULL, /* compat_100___kevent50 */ | |
1022 | /* 436 */ "pselect", | 1022 | /* 436 */ "pselect", | |
1023 | /* 437 */ "pollts", | 1023 | /* 437 */ "pollts", | |
1024 | /* 438 */ "aio_suspend", | 1024 | /* 438 */ "aio_suspend", | |
1025 | /* 439 */ "stat", | 1025 | /* 439 */ "stat", | |
1026 | /* 440 */ "fstat", | 1026 | /* 440 */ "fstat", | |
1027 | /* 441 */ "lstat", | 1027 | /* 441 */ "lstat", | |
1028 | /* 442 */ "__semctl", | 1028 | /* 442 */ "__semctl", | |
1029 | /* 443 */ "shmctl", | 1029 | /* 443 */ "shmctl", | |
1030 | /* 444 */ "msgctl", | 1030 | /* 444 */ "msgctl", | |
1031 | /* 445 */ "getrusage", | 1031 | /* 445 */ "getrusage", | |
1032 | /* 446 */ "timer_settime", | 1032 | /* 446 */ "timer_settime", | |
1033 | /* 447 */ "timer_gettime", | 1033 | /* 447 */ "timer_gettime", | |
1034 | #if defined(NTP) || !defined(_KERNEL_OPT) | 1034 | #if defined(NTP) || !defined(_KERNEL_OPT) | |
@@ -1078,25 +1078,25 @@ const char *const altsyscallnames[] = { | @@ -1078,25 +1078,25 @@ const char *const altsyscallnames[] = { | |||
1078 | /* 488 */ NULL, /* __acl_set_link */ | 1078 | /* 488 */ NULL, /* __acl_set_link */ | |
1079 | /* 489 */ NULL, /* __acl_delete_link */ | 1079 | /* 489 */ NULL, /* __acl_delete_link */ | |
1080 | /* 490 */ NULL, /* __acl_aclcheck_link */ | 1080 | /* 490 */ NULL, /* __acl_aclcheck_link */ | |
1081 | /* 491 */ NULL, /* __acl_get_file */ | 1081 | /* 491 */ NULL, /* __acl_get_file */ | |
1082 | /* 492 */ NULL, /* __acl_set_file */ | 1082 | /* 492 */ NULL, /* __acl_set_file */ | |
1083 | /* 493 */ NULL, /* __acl_get_fd */ | 1083 | /* 493 */ NULL, /* __acl_get_fd */ | |
1084 | /* 494 */ NULL, /* __acl_set_fd */ | 1084 | /* 494 */ NULL, /* __acl_set_fd */ | |
1085 | /* 495 */ NULL, /* __acl_delete_file */ | 1085 | /* 495 */ NULL, /* __acl_delete_file */ | |
1086 | /* 496 */ NULL, /* __acl_delete_fd */ | 1086 | /* 496 */ NULL, /* __acl_delete_fd */ | |
1087 | /* 497 */ NULL, /* __acl_aclcheck_file */ | 1087 | /* 497 */ NULL, /* __acl_aclcheck_file */ | |
1088 | /* 498 */ NULL, /* __acl_aclcheck_fd */ | 1088 | /* 498 */ NULL, /* __acl_aclcheck_fd */ | |
1089 | /* 499 */ NULL, /* lpathconf */ | 1089 | /* 499 */ NULL, /* lpathconf */ | |
1090 | /* 500 */ NULL, /* memfd_create */ | 1090 | /* 500 */ NULL, /* memfd_create */ | |
1091 | /* 501 */ NULL, /* filler */ | 1091 | /* 501 */ "kevent", | |
1092 | /* 502 */ NULL, /* filler */ | 1092 | /* 502 */ NULL, /* epoll_create1 */ | |
1093 | /* 503 */ NULL, /* filler */ | 1093 | /* 503 */ NULL, /* epoll_ctl */ | |
1094 | /* 504 */ NULL, /* filler */ | 1094 | /* 504 */ NULL, /* epoll_pwait2 */ | |
1095 | /* 505 */ NULL, /* filler */ | 1095 | /* 505 */ NULL, /* filler */ | |
1096 | /* 506 */ NULL, /* filler */ | 1096 | /* 506 */ NULL, /* filler */ | |
1097 | /* 507 */ NULL, /* filler */ | 1097 | /* 507 */ NULL, /* filler */ | |
1098 | /* 508 */ NULL, /* filler */ | 1098 | /* 508 */ NULL, /* filler */ | |
1099 | /* 509 */ NULL, /* filler */ | 1099 | /* 509 */ NULL, /* filler */ | |
1100 | /* 510 */ NULL, /* filler */ | 1100 | /* 510 */ NULL, /* filler */ | |
1101 | /* 511 */ NULL, /* filler */ | 1101 | /* 511 */ NULL, /* filler */ | |
1102 | }; | 1102 | }; |
--- src/sys/kern/syscalls_autoload.c 2023/07/10 02:37:05 1.44
+++ src/sys/kern/syscalls_autoload.c 2023/07/28 18:20:28 1.45
@@ -1,24 +1,24 @@ | @@ -1,24 +1,24 @@ | |||
1 | /* $NetBSD: syscalls_autoload.c,v 1.44 2023/07/10 02:37:05 christos Exp $ */ | 1 | /* $NetBSD: syscalls_autoload.c,v 1.45 2023/07/28 18:20:28 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.310 2023/07/10 02:33:04 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #include <sys/cdefs.h> | 10 | #include <sys/cdefs.h> | |
11 | __KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.44 2023/07/10 02:37:05 christos Exp $"); | 11 | __KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.45 2023/07/28 18:20:28 christos Exp $"); | |
12 | 12 | |||
13 | #ifdef _KERNEL_OPT | 13 | #ifdef _KERNEL_OPT | |
14 | #include "opt_modular.h" | 14 | #include "opt_modular.h" | |
15 | #include "opt_ntp.h" | 15 | #include "opt_ntp.h" | |
16 | #include "opt_sysv.h" | 16 | #include "opt_sysv.h" | |
17 | #endif | 17 | #endif | |
18 | #include <sys/param.h> | 18 | #include <sys/param.h> | |
19 | #include <sys/systm.h> | 19 | #include <sys/systm.h> | |
20 | #include <sys/signal.h> | 20 | #include <sys/signal.h> | |
21 | #include <sys/socket.h> | 21 | #include <sys/socket.h> | |
22 | #include <sys/mount.h> | 22 | #include <sys/mount.h> | |
23 | #include <sys/sched.h> | 23 | #include <sys/sched.h> | |
24 | #include <sys/idtype.h> | 24 | #include <sys/idtype.h> | |
@@ -190,22 +190,23 @@ static struct sc_autoload netbsd_syscall | @@ -190,22 +190,23 @@ static struct sc_autoload netbsd_syscall | |||
190 | { SYS_compat_50___fhstat40, "compat_50" }, | 190 | { SYS_compat_50___fhstat40, "compat_50" }, | |
191 | { SYS_aio_cancel, "aio" }, | 191 | { SYS_aio_cancel, "aio" }, | |
192 | { SYS_aio_error, "aio" }, | 192 | { SYS_aio_error, "aio" }, | |
193 | { SYS_aio_fsync, "aio" }, | 193 | { SYS_aio_fsync, "aio" }, | |
194 | { SYS_aio_read, "aio" }, | 194 | { SYS_aio_read, "aio" }, | |
195 | { SYS_aio_return, "aio" }, | 195 | { SYS_aio_return, "aio" }, | |
196 | { SYS_compat_50_aio_suspend, "compat" }, | 196 | { SYS_compat_50_aio_suspend, "compat" }, | |
197 | { SYS_aio_write, "aio" }, | 197 | { SYS_aio_write, "aio" }, | |
198 | { SYS_lio_listio, "aio" }, | 198 | { SYS_lio_listio, "aio" }, | |
199 | { SYS___lfs_segwait50, "lfs" }, | 199 | { SYS___lfs_segwait50, "lfs" }, | |
200 | { SYS___mq_timedsend50, "mqueue" }, | 200 | { SYS___mq_timedsend50, "mqueue" }, | |
201 | { SYS___mq_timedreceive50, "mqueue" }, | 201 | { SYS___mq_timedreceive50, "mqueue" }, | |
202 | { SYS_compat_60__lwp_park, "compat_60" }, | 202 | { SYS_compat_60__lwp_park, "compat_60" }, | |
203 | { SYS_compat_100___kevent50, "compat_100" }, | |||
203 | { SYS___aio_suspend50, "aio" }, | 204 | { SYS___aio_suspend50, "aio" }, | |
204 | { SYS_____semctl50, "sysv_ipc" }, | 205 | { SYS_____semctl50, "sysv_ipc" }, | |
205 | { SYS___shmctl50, "sysv_ipc" }, | 206 | { SYS___shmctl50, "sysv_ipc" }, | |
206 | { SYS___msgctl50, "sysv_ipc" }, | 207 | { SYS___msgctl50, "sysv_ipc" }, | |
207 | #if defined(NTP) || !defined(_KERNEL_OPT) | 208 | #if defined(NTP) || !defined(_KERNEL_OPT) | |
208 | #else | 209 | #else | |
209 | #endif | 210 | #endif | |
210 | { 0, NULL } | 211 | { 0, NULL } | |
211 | }; | 212 | }; |
--- src/sys/kern/systrace_args.c 2023/07/10 02:37:05 1.50
+++ src/sys/kern/systrace_args.c 2023/07/28 18:20:28 1.51
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: systrace_args.c,v 1.50 2023/07/10 02:37:05 christos Exp $ */ | 1 | /* $NetBSD: systrace_args.c,v 1.51 2023/07/28 18:20:28 christos Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * System call argument to DTrace register array conversion. | 4 | * System call argument to DTrace register array conversion. | |
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) { | |
@@ -2508,29 +2508,29 @@ systrace_args(register_t sysnum, const v | @@ -2508,29 +2508,29 @@ systrace_args(register_t sysnum, const v | |||
2508 | iarg[2] = SCARG(p, op); /* int */ | 2508 | iarg[2] = SCARG(p, op); /* int */ | |
2509 | *n_args = 3; | 2509 | *n_args = 3; | |
2510 | break; | 2510 | break; | |
2511 | } | 2511 | } | |
2512 | /* sys_kqueue */ | 2512 | /* sys_kqueue */ | |
2513 | case 344: { | 2513 | case 344: { | |
2514 | *n_args = 0; | 2514 | *n_args = 0; | |
2515 | break; | 2515 | break; | |
2516 | } | 2516 | } | |
2517 | /* sys_kevent */ | 2517 | /* sys_kevent */ | |
2518 | case 345: { | 2518 | case 345: { | |
2519 | const struct compat_50_sys_kevent_args *p = params; | 2519 | const struct compat_50_sys_kevent_args *p = params; | |
2520 | iarg[0] = SCARG(p, fd); /* int */ | 2520 | iarg[0] = SCARG(p, fd); /* int */ | |
2521 | uarg[1] = (intptr_t) SCARG(p, changelist); /* const struct kevent * */ | 2521 | uarg[1] = (intptr_t) SCARG(p, changelist); /* const struct kevent100 * */ | |
2522 | uarg[2] = SCARG(p, nchanges); /* size_t */ | 2522 | uarg[2] = SCARG(p, nchanges); /* size_t */ | |
2523 | uarg[3] = (intptr_t) SCARG(p, eventlist); /* struct kevent * */ | 2523 | uarg[3] = (intptr_t) SCARG(p, eventlist); /* struct kevent100 * */ | |
2524 | uarg[4] = SCARG(p, nevents); /* size_t */ | 2524 | uarg[4] = SCARG(p, nevents); /* size_t */ | |
2525 | uarg[5] = (intptr_t) SCARG(p, timeout); /* const struct timespec50 * */ | 2525 | uarg[5] = (intptr_t) SCARG(p, timeout); /* const struct timespec50 * */ | |
2526 | *n_args = 6; | 2526 | *n_args = 6; | |
2527 | break; | 2527 | break; | |
2528 | } | 2528 | } | |
2529 | /* sys__sched_setparam */ | 2529 | /* sys__sched_setparam */ | |
2530 | case 346: { | 2530 | case 346: { | |
2531 | const struct sys__sched_setparam_args *p = params; | 2531 | const struct sys__sched_setparam_args *p = params; | |
2532 | iarg[0] = SCARG(p, pid); /* pid_t */ | 2532 | iarg[0] = SCARG(p, pid); /* pid_t */ | |
2533 | iarg[1] = SCARG(p, lid); /* lwpid_t */ | 2533 | iarg[1] = SCARG(p, lid); /* lwpid_t */ | |
2534 | iarg[2] = SCARG(p, policy); /* int */ | 2534 | iarg[2] = SCARG(p, policy); /* int */ | |
2535 | uarg[3] = (intptr_t) SCARG(p, params); /* const struct sched_param * */ | 2535 | uarg[3] = (intptr_t) SCARG(p, params); /* const struct sched_param * */ | |
2536 | *n_args = 4; | 2536 | *n_args = 4; | |
@@ -3275,31 +3275,31 @@ systrace_args(register_t sysnum, const v | @@ -3275,31 +3275,31 @@ systrace_args(register_t sysnum, const v | |||
3275 | } | 3275 | } | |
3276 | /* sys__lwp_park */ | 3276 | /* sys__lwp_park */ | |
3277 | case 434: { | 3277 | case 434: { | |
3278 | const struct compat_60_sys__lwp_park_args *p = params; | 3278 | const struct compat_60_sys__lwp_park_args *p = params; | |
3279 | uarg[0] = (intptr_t) SCARG(p, ts); /* const struct timespec * */ | 3279 | uarg[0] = (intptr_t) SCARG(p, ts); /* const struct timespec * */ | |
3280 | iarg[1] = SCARG(p, unpark); /* lwpid_t */ | 3280 | iarg[1] = SCARG(p, unpark); /* lwpid_t */ | |
3281 | uarg[2] = (intptr_t) SCARG(p, hint); /* const void * */ | 3281 | uarg[2] = (intptr_t) SCARG(p, hint); /* const void * */ | |
3282 | uarg[3] = (intptr_t) SCARG(p, unparkhint); /* const void * */ | 3282 | uarg[3] = (intptr_t) SCARG(p, unparkhint); /* const void * */ | |
3283 | *n_args = 4; | 3283 | *n_args = 4; | |
3284 | break; | 3284 | break; | |
3285 | } | 3285 | } | |
3286 | /* sys___kevent50 */ | 3286 | /* sys___kevent50 */ | |
3287 | case 435: { | 3287 | case 435: { | |
3288 | const struct sys___kevent50_args *p = params; | 3288 | const struct compat_100_sys___kevent50_args *p = params; | |
3289 | iarg[0] = SCARG(p, fd); /* int */ | 3289 | iarg[0] = SCARG(p, fd); /* int */ | |
3290 | uarg[1] = (intptr_t) SCARG(p, changelist); /* const struct kevent * */ | 3290 | uarg[1] = (intptr_t) SCARG(p, changelist); /* const struct kevent100 * */ | |
3291 | uarg[2] = SCARG(p, nchanges); /* size_t */ | 3291 | uarg[2] = SCARG(p, nchanges); /* size_t */ | |
3292 | uarg[3] = (intptr_t) SCARG(p, eventlist); /* struct kevent * */ | 3292 | uarg[3] = (intptr_t) SCARG(p, eventlist); /* struct kevent100 * */ | |
3293 | uarg[4] = SCARG(p, nevents); /* size_t */ | 3293 | uarg[4] = SCARG(p, nevents); /* size_t */ | |
3294 | uarg[5] = (intptr_t) SCARG(p, timeout); /* const struct timespec * */ | 3294 | uarg[5] = (intptr_t) SCARG(p, timeout); /* const struct timespec * */ | |
3295 | *n_args = 6; | 3295 | *n_args = 6; | |
3296 | break; | 3296 | break; | |
3297 | } | 3297 | } | |
3298 | /* sys___pselect50 */ | 3298 | /* sys___pselect50 */ | |
3299 | case 436: { | 3299 | case 436: { | |
3300 | const struct sys___pselect50_args *p = params; | 3300 | const struct sys___pselect50_args *p = params; | |
3301 | iarg[0] = SCARG(p, nd); /* int */ | 3301 | iarg[0] = SCARG(p, nd); /* int */ | |
3302 | uarg[1] = (intptr_t) SCARG(p, in); /* fd_set * */ | 3302 | uarg[1] = (intptr_t) SCARG(p, in); /* fd_set * */ | |
3303 | uarg[2] = (intptr_t) SCARG(p, ou); /* fd_set * */ | 3303 | uarg[2] = (intptr_t) SCARG(p, ou); /* fd_set * */ | |
3304 | uarg[3] = (intptr_t) SCARG(p, ex); /* fd_set * */ | 3304 | uarg[3] = (intptr_t) SCARG(p, ex); /* fd_set * */ | |
3305 | uarg[4] = (intptr_t) SCARG(p, ts); /* const struct timespec * */ | 3305 | uarg[4] = (intptr_t) SCARG(p, ts); /* const struct timespec * */ | |
@@ -3885,26 +3885,66 @@ systrace_args(register_t sysnum, const v | @@ -3885,26 +3885,66 @@ systrace_args(register_t sysnum, const v | |||
3885 | uarg[0] = (intptr_t) SCARG(p, path); /* const char * */ | 3885 | uarg[0] = (intptr_t) SCARG(p, path); /* const char * */ | |
3886 | iarg[1] = SCARG(p, name); /* int */ | 3886 | iarg[1] = SCARG(p, name); /* int */ | |
3887 | *n_args = 2; | 3887 | *n_args = 2; | |
3888 | break; | 3888 | break; | |
3889 | } | 3889 | } | |
3890 | /* sys_memfd_create */ | 3890 | /* sys_memfd_create */ | |
3891 | case 500: { | 3891 | case 500: { | |
3892 | const struct sys_memfd_create_args *p = params; | 3892 | const struct sys_memfd_create_args *p = params; | |
3893 | uarg[0] = (intptr_t) SCARG(p, name); /* const char * */ | 3893 | uarg[0] = (intptr_t) SCARG(p, name); /* const char * */ | |
3894 | uarg[1] = SCARG(p, flags); /* unsigned int */ | 3894 | uarg[1] = SCARG(p, flags); /* unsigned int */ | |
3895 | *n_args = 2; | 3895 | *n_args = 2; | |
3896 | break; | 3896 | break; | |
3897 | } | 3897 | } | |
3898 | /* sys___kevent100 */ | |||
3899 | case 501: { | |||
3900 | const struct sys___kevent100_args *p = params; | |||
3901 | iarg[0] = SCARG(p, fd); /* int */ | |||
3902 | uarg[1] = (intptr_t) SCARG(p, changelist); /* const struct kevent * */ | |||
3903 | uarg[2] = SCARG(p, nchanges); /* size_t */ | |||
3904 | uarg[3] = (intptr_t) SCARG(p, eventlist); /* struct kevent * */ | |||
3905 | uarg[4] = SCARG(p, nevents); /* size_t */ | |||
3906 | uarg[5] = (intptr_t) SCARG(p, timeout); /* const struct timespec * */ | |||
3907 | *n_args = 6; | |||
3908 | break; | |||
3909 | } | |||
3910 | /* sys_epoll_create1 */ | |||
3911 | case 502: { | |||
3912 | const struct sys_epoll_create1_args *p = params; | |||
3913 | iarg[0] = SCARG(p, flags); /* int */ | |||
3914 | *n_args = 1; | |||
3915 | break; | |||
3916 | } | |||
3917 | /* sys_epoll_ctl */ | |||
3918 | case 503: { | |||
3919 | const struct sys_epoll_ctl_args *p = params; | |||
3920 | iarg[0] = SCARG(p, epfd); /* int */ | |||
3921 | iarg[1] = SCARG(p, op); /* int */ | |||
3922 | iarg[2] = SCARG(p, fd); /* int */ | |||
3923 | uarg[3] = (intptr_t) SCARG(p, event); /* struct epoll_event * */ | |||
3924 | *n_args = 4; | |||
3925 | break; | |||
3926 | } | |||
3927 | /* sys_epoll_pwait2 */ | |||
3928 | case 504: { | |||
3929 | const struct sys_epoll_pwait2_args *p = params; | |||
3930 | iarg[0] = SCARG(p, epfd); /* int */ | |||
3931 | uarg[1] = (intptr_t) SCARG(p, events); /* struct epoll_event * */ | |||
3932 | iarg[2] = SCARG(p, maxevents); /* int */ | |||
3933 | uarg[3] = (intptr_t) SCARG(p, timeout); /* const struct timespec * */ | |||
3934 | uarg[4] = (intptr_t) SCARG(p, sigmask); /* const sigset_t * */ | |||
3935 | *n_args = 5; | |||
3936 | break; | |||
3937 | } | |||
3898 | default: | 3938 | default: | |
3899 | *n_args = 0; | 3939 | *n_args = 0; | |
3900 | break; | 3940 | break; | |
3901 | }; | 3941 | }; | |
3902 | } | 3942 | } | |
3903 | static void | 3943 | static void | |
3904 | systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) | 3944 | systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) | |
3905 | { | 3945 | { | |
3906 | const char *p = NULL; | 3946 | const char *p = NULL; | |
3907 | switch (sysnum) { | 3947 | switch (sysnum) { | |
3908 | /* sys_syscall */ | 3948 | /* sys_syscall */ | |
3909 | case 0: | 3949 | case 0: | |
3910 | switch(ndx) { | 3950 | switch(ndx) { | |
@@ -8013,33 +8053,33 @@ systrace_entry_setargdesc(int sysnum, in | @@ -8013,33 +8053,33 @@ systrace_entry_setargdesc(int sysnum, in | |||
8013 | break; | 8053 | break; | |
8014 | }; | 8054 | }; | |
8015 | break; | 8055 | break; | |
8016 | /* sys_kqueue */ | 8056 | /* sys_kqueue */ | |
8017 | case 344: | 8057 | case 344: | |
8018 | break; | 8058 | break; | |
8019 | /* sys_kevent */ | 8059 | /* sys_kevent */ | |
8020 | case 345: | 8060 | case 345: | |
8021 | switch(ndx) { | 8061 | switch(ndx) { | |
8022 | case 0: | 8062 | case 0: | |
8023 | p = "int"; | 8063 | p = "int"; | |
8024 | break; | 8064 | break; | |
8025 | case 1: | 8065 | case 1: | |
8026 | p = "const struct kevent *"; | 8066 | p = "const struct kevent100 *"; | |
8027 | break; | 8067 | break; | |
8028 | case 2: | 8068 | case 2: | |
8029 | p = "size_t"; | 8069 | p = "size_t"; | |
8030 | break; | 8070 | break; | |
8031 | case 3: | 8071 | case 3: | |
8032 | p = "struct kevent *"; | 8072 | p = "struct kevent100 *"; | |
8033 | break; | 8073 | break; | |
8034 | case 4: | 8074 | case 4: | |
8035 | p = "size_t"; | 8075 | p = "size_t"; | |
8036 | break; | 8076 | break; | |
8037 | case 5: | 8077 | case 5: | |
8038 | p = "const struct timespec50 *"; | 8078 | p = "const struct timespec50 *"; | |
8039 | break; | 8079 | break; | |
8040 | default: | 8080 | default: | |
8041 | break; | 8081 | break; | |
8042 | }; | 8082 | }; | |
8043 | break; | 8083 | break; | |
8044 | /* sys__sched_setparam */ | 8084 | /* sys__sched_setparam */ | |
8045 | case 346: | 8085 | case 346: | |
@@ -9395,33 +9435,33 @@ systrace_entry_setargdesc(int sysnum, in | @@ -9395,33 +9435,33 @@ systrace_entry_setargdesc(int sysnum, in | |||
9395 | p = "const void *"; | 9435 | p = "const void *"; | |
9396 | break; | 9436 | break; | |
9397 | default: | 9437 | default: | |
9398 | break; | 9438 | break; | |
9399 | }; | 9439 | }; | |
9400 | break; | 9440 | break; | |
9401 | /* sys___kevent50 */ | 9441 | /* sys___kevent50 */ | |
9402 | case 435: | 9442 | case 435: | |
9403 | switch(ndx) { | 9443 | switch(ndx) { | |
9404 | case 0: | 9444 | case 0: | |
9405 | p = "int"; | 9445 | p = "int"; | |
9406 | break; | 9446 | break; | |
9407 | case 1: | 9447 | case 1: | |
9408 | p = "const struct kevent *"; | 9448 | p = "const struct kevent100 *"; | |
9409 | break; | 9449 | break; | |
9410 | case 2: | 9450 | case 2: | |
9411 | p = "size_t"; | 9451 | p = "size_t"; | |
9412 | break; | 9452 | break; | |
9413 | case 3: | 9453 | case 3: | |
9414 | p = "struct kevent *"; | 9454 | p = "struct kevent100 *"; | |
9415 | break; | 9455 | break; | |
9416 | case 4: | 9456 | case 4: | |
9417 | p = "size_t"; | 9457 | p = "size_t"; | |
9418 | break; | 9458 | break; | |
9419 | case 5: | 9459 | case 5: | |
9420 | p = "const struct timespec *"; | 9460 | p = "const struct timespec *"; | |
9421 | break; | 9461 | break; | |
9422 | default: | 9462 | default: | |
9423 | break; | 9463 | break; | |
9424 | }; | 9464 | }; | |
9425 | break; | 9465 | break; | |
9426 | /* sys___pselect50 */ | 9466 | /* sys___pselect50 */ | |
9427 | case 436: | 9467 | case 436: | |
@@ -10503,26 +10543,102 @@ systrace_entry_setargdesc(int sysnum, in | @@ -10503,26 +10543,102 @@ systrace_entry_setargdesc(int sysnum, in | |||
10503 | /* sys_memfd_create */ | 10543 | /* sys_memfd_create */ | |
10504 | case 500: | 10544 | case 500: | |
10505 | switch(ndx) { | 10545 | switch(ndx) { | |
10506 | case 0: | 10546 | case 0: | |
10507 | p = "const char *"; | 10547 | p = "const char *"; | |
10508 | break; | 10548 | break; | |
10509 | case 1: | 10549 | case 1: | |
10510 | p = "unsigned int"; | 10550 | p = "unsigned int"; | |
10511 | break; | 10551 | break; | |
10512 | default: | 10552 | default: | |
10513 | break; | 10553 | break; | |
10514 | }; | 10554 | }; | |
10515 | break; | 10555 | break; | |
10556 | /* sys___kevent100 */ | |||
10557 | case 501: | |||
10558 | switch(ndx) { | |||
10559 | case 0: | |||
10560 | p = "int"; | |||
10561 | break; | |||
10562 | case 1: | |||
10563 | p = "const struct kevent *"; | |||
10564 | break; | |||
10565 | case 2: | |||
10566 | p = "size_t"; | |||
10567 | break; | |||
10568 | case 3: | |||
10569 | p = "struct kevent *"; | |||
10570 | break; | |||
10571 | case 4: | |||
10572 | p = "size_t"; | |||
10573 | break; | |||
10574 | case 5: | |||
10575 | p = "const struct timespec *"; | |||
10576 | break; | |||
10577 | default: | |||
10578 | break; | |||
10579 | }; | |||
10580 | break; | |||
10581 | /* sys_epoll_create1 */ | |||
10582 | case 502: | |||
10583 | switch(ndx) { | |||
10584 | case 0: | |||
10585 | p = "int"; | |||
10586 | break; | |||
10587 | default: | |||
10588 | break; | |||
10589 | }; | |||
10590 | break; | |||
10591 | /* sys_epoll_ctl */ | |||
10592 | case 503: | |||
10593 | switch(ndx) { | |||
10594 | case 0: | |||
10595 | p = "int"; | |||
10596 | break; | |||
10597 | case 1: | |||
10598 | p = "int"; | |||
10599 | break; | |||
10600 | case 2: | |||
10601 | p = "int"; | |||
10602 | break; | |||
10603 | case 3: | |||
10604 | p = "struct epoll_event *"; | |||
10605 | break; | |||
10606 | default: | |||
10607 | break; | |||
10608 | }; | |||
10609 | break; | |||
10610 | /* sys_epoll_pwait2 */ | |||
10611 | case 504: | |||
10612 | switch(ndx) { | |||
10613 | case 0: | |||
10614 | p = "int"; | |||
10615 | break; | |||
10616 | case 1: | |||
10617 | p = "struct epoll_event *"; | |||
10618 | break; | |||
10619 | case 2: | |||
10620 | p = "int"; | |||
10621 | break; | |||
10622 | case 3: | |||
10623 | p = "const struct timespec *"; | |||
10624 | break; | |||
10625 | case 4: | |||
10626 | p = "const sigset_t *"; | |||
10627 | break; | |||
10628 | default: | |||
10629 | break; | |||
10630 | }; | |||
10631 | break; | |||
10516 | default: | 10632 | default: | |
10517 | break; | 10633 | break; | |
10518 | }; | 10634 | }; | |
10519 | if (p != NULL) | 10635 | if (p != NULL) | |
10520 | strlcpy(desc, p, descsz); | 10636 | strlcpy(desc, p, descsz); | |
10521 | } | 10637 | } | |
10522 | static void | 10638 | static void | |
10523 | systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) | 10639 | systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) | |
10524 | { | 10640 | { | |
10525 | const char *p = NULL; | 10641 | const char *p = NULL; | |
10526 | switch (sysnum) { | 10642 | switch (sysnum) { | |
10527 | /* sys_syscall */ | 10643 | /* sys_syscall */ | |
10528 | case 0: | 10644 | case 0: | |
@@ -12710,19 +12826,39 @@ systrace_return_setargdesc(int sysnum, i | @@ -12710,19 +12826,39 @@ systrace_return_setargdesc(int sysnum, i | |||
12710 | if (ndx == 0 || ndx == 1) | 12826 | if (ndx == 0 || ndx == 1) | |
12711 | p = "int"; | 12827 | p = "int"; | |
12712 | break; | 12828 | break; | |
12713 | /* sys_lpathconf */ | 12829 | /* sys_lpathconf */ | |
12714 | case 499: | 12830 | case 499: | |
12715 | if (ndx == 0 || ndx == 1) | 12831 | if (ndx == 0 || ndx == 1) | |
12716 | p = "long"; | 12832 | p = "long"; | |
12717 | break; | 12833 | break; | |
12718 | /* sys_memfd_create */ | 12834 | /* sys_memfd_create */ | |
12719 | case 500: | 12835 | case 500: | |
12720 | if (ndx == 0 || ndx == 1) | 12836 | if (ndx == 0 || ndx == 1) | |
12721 | p = "int"; | 12837 | p = "int"; | |
12722 | break; | 12838 | break; | |
12839 | /* sys___kevent100 */ | |||
12840 | case 501: | |||
12841 | if (ndx == 0 || ndx == 1) | |||
12842 | p = "int"; | |||
12843 | break; | |||
12844 | /* sys_epoll_create1 */ | |||
12845 | case 502: | |||
12846 | if (ndx == 0 || ndx == 1) | |||
12847 | p = "int"; | |||
12848 | break; | |||
12849 | /* sys_epoll_ctl */ | |||
12850 | case 503: | |||
12851 | if (ndx == 0 || ndx == 1) | |||
12852 | p = "int"; | |||
12853 | break; | |||
12854 | /* sys_epoll_pwait2 */ | |||
12855 | case 504: | |||
12856 | if (ndx == 0 || ndx == 1) | |||
12857 | p = "int"; | |||
12858 | break; | |||
12723 | default: | 12859 | default: | |
12724 | break; | 12860 | break; | |
12725 | }; | 12861 | }; | |
12726 | if (p != NULL) | 12862 | if (p != NULL) | |
12727 | strlcpy(desc, p, descsz); | 12863 | strlcpy(desc, p, descsz); | |
12728 | } | 12864 | } |
--- src/sys/rump/include/rump/rump_syscalls.h 2023/07/10 02:37:05 1.127
+++ src/sys/rump/include/rump/rump_syscalls.h 2023/07/28 18:20:28 1.128
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | /* $NetBSD: rump_syscalls.h,v 1.127 2023/07/10 02:37:05 christos Exp $ */ | 1 | /* $NetBSD: rump_syscalls.h,v 1.128 2023/07/28 18:20:28 christos Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * System call protos in rump namespace. | 4 | * System call protos in rump namespace. | |
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.310 2023/07/10 02:33:04 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #ifndef _RUMP_RUMP_SYSCALLS_H_ | 10 | #ifndef _RUMP_RUMP_SYSCALLS_H_ | |
11 | #define _RUMP_RUMP_SYSCALLS_H_ | 11 | #define _RUMP_RUMP_SYSCALLS_H_ | |
12 | 12 | |||
13 | #ifdef _KERNEL | 13 | #ifdef _KERNEL | |
14 | #error Interface not supported inside kernel | 14 | #error Interface not supported inside kernel | |
15 | #endif /* _KERNEL */ | 15 | #endif /* _KERNEL */ | |
16 | 16 | |||
17 | #include <rump/rump_syscalls_compat.h> | 17 | #include <rump/rump_syscalls_compat.h> | |
18 | 18 | |||
19 | #ifndef RUMP_SYS_RENAME___GETCWD | 19 | #ifndef RUMP_SYS_RENAME___GETCWD | |
20 | #define RUMP_SYS_RENAME___GETCWD rump___sysimpl___getcwd | 20 | #define RUMP_SYS_RENAME___GETCWD rump___sysimpl___getcwd | |
@@ -451,27 +451,27 @@ | @@ -451,27 +451,27 @@ | |||
451 | #ifndef RUMP_SYS_RENAME_GETXATTR | 451 | #ifndef RUMP_SYS_RENAME_GETXATTR | |
452 | #define RUMP_SYS_RENAME_GETXATTR rump___sysimpl_getxattr | 452 | #define RUMP_SYS_RENAME_GETXATTR rump___sysimpl_getxattr | |
453 | #endif | 453 | #endif | |
454 | 454 | |||
455 | #ifndef RUMP_SYS_RENAME_IOCTL | 455 | #ifndef RUMP_SYS_RENAME_IOCTL | |
456 | #define RUMP_SYS_RENAME_IOCTL rump___sysimpl_ioctl | 456 | #define RUMP_SYS_RENAME_IOCTL rump___sysimpl_ioctl | |
457 | #endif | 457 | #endif | |
458 | 458 | |||
459 | #ifndef RUMP_SYS_RENAME_ISSETUGID | 459 | #ifndef RUMP_SYS_RENAME_ISSETUGID | |
460 | #define RUMP_SYS_RENAME_ISSETUGID rump___sysimpl_issetugid | 460 | #define RUMP_SYS_RENAME_ISSETUGID rump___sysimpl_issetugid | |
461 | #endif | 461 | #endif | |
462 | 462 | |||
463 | #ifndef RUMP_SYS_RENAME_KEVENT | 463 | #ifndef RUMP_SYS_RENAME_KEVENT | |
464 | #define RUMP_SYS_RENAME_KEVENT rump___sysimpl_kevent50 | 464 | #define RUMP_SYS_RENAME_KEVENT rump___sysimpl_kevent100 | |
465 | #endif | 465 | #endif | |
466 | 466 | |||
467 | #ifndef RUMP_SYS_RENAME_KQUEUE | 467 | #ifndef RUMP_SYS_RENAME_KQUEUE | |
468 | #define RUMP_SYS_RENAME_KQUEUE rump___sysimpl_kqueue | 468 | #define RUMP_SYS_RENAME_KQUEUE rump___sysimpl_kqueue | |
469 | #endif | 469 | #endif | |
470 | 470 | |||
471 | #ifndef RUMP_SYS_RENAME_KQUEUE1 | 471 | #ifndef RUMP_SYS_RENAME_KQUEUE1 | |
472 | #define RUMP_SYS_RENAME_KQUEUE1 rump___sysimpl_kqueue1 | 472 | #define RUMP_SYS_RENAME_KQUEUE1 rump___sysimpl_kqueue1 | |
473 | #endif | 473 | #endif | |
474 | 474 | |||
475 | #ifndef RUMP_SYS_RENAME_KTRACE | 475 | #ifndef RUMP_SYS_RENAME_KTRACE | |
476 | #define RUMP_SYS_RENAME_KTRACE rump___sysimpl_ktrace | 476 | #define RUMP_SYS_RENAME_KTRACE rump___sysimpl_ktrace | |
477 | #endif | 477 | #endif |
--- src/sys/rump/librump/rumpkern/rump_syscalls.c 2023/07/10 02:37:05 1.158
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c 2023/07/28 18:20:29 1.159
@@ -1,31 +1,31 @@ | @@ -1,31 +1,31 @@ | |||
1 | /* $NetBSD: rump_syscalls.c,v 1.158 2023/07/10 02:37:05 christos Exp $ */ | 1 | /* $NetBSD: rump_syscalls.c,v 1.159 2023/07/28 18:20:29 christos Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * System call vector and marshalling for rump. | 4 | * System call vector and marshalling for rump. | |
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.310 2023/07/10 02:33:04 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #ifdef RUMP_CLIENT | 10 | #ifdef RUMP_CLIENT | |
11 | #include <rump/rumpuser_port.h> | 11 | #include <rump/rumpuser_port.h> | |
12 | #endif /* RUMP_CLIENT */ | 12 | #endif /* RUMP_CLIENT */ | |
13 | 13 | |||
14 | #include <sys/param.h> | 14 | #include <sys/param.h> | |
15 | 15 | |||
16 | #ifdef __NetBSD__ | 16 | #ifdef __NetBSD__ | |
17 | #include <sys/cdefs.h> | 17 | #include <sys/cdefs.h> | |
18 | __KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.158 2023/07/10 02:37:05 christos Exp $"); | 18 | __KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.159 2023/07/28 18:20:29 christos Exp $"); | |
19 | 19 | |||
20 | #include <sys/fstypes.h> | 20 | #include <sys/fstypes.h> | |
21 | #include <sys/proc.h> | 21 | #include <sys/proc.h> | |
22 | #endif /* __NetBSD__ */ | 22 | #endif /* __NetBSD__ */ | |
23 | 23 | |||
24 | #ifdef RUMP_CLIENT | 24 | #ifdef RUMP_CLIENT | |
25 | #include <errno.h> | 25 | #include <errno.h> | |
26 | #include <stdint.h> | 26 | #include <stdint.h> | |
27 | #include <stdlib.h> | 27 | #include <stdlib.h> | |
28 | #include <string.h> | 28 | #include <string.h> | |
29 | 29 | |||
30 | #include <srcsys/syscall.h> | 30 | #include <srcsys/syscall.h> | |
31 | #include <srcsys/syscallargs.h> | 31 | #include <srcsys/syscallargs.h> | |
@@ -3510,29 +3510,29 @@ __strong_alias(_sys_kqueue,rump___sysimp | @@ -3510,29 +3510,29 @@ __strong_alias(_sys_kqueue,rump___sysimp | |||
3510 | 3510 | |||
3511 | #ifdef RUMP_SYS_COMPAT | 3511 | #ifdef RUMP_SYS_COMPAT | |
3512 | int rump___sysimpl_kevent(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *); | 3512 | int rump___sysimpl_kevent(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *); | |
3513 | int | 3513 | int | |
3514 | rump___sysimpl_kevent(int fd, const struct kevent * changelist, size_t nchanges, struct kevent * eventlist, size_t nevents, const struct timespec * timeout) | 3514 | rump___sysimpl_kevent(int fd, const struct kevent * changelist, size_t nchanges, struct kevent * eventlist, size_t nevents, const struct timespec * timeout) | |
3515 | { | 3515 | { | |
3516 | register_t retval[2]; | 3516 | register_t retval[2]; | |
3517 | int error = 0; | 3517 | int error = 0; | |
3518 | int rv = -1; | 3518 | int rv = -1; | |
3519 | struct compat_50_sys_kevent_args callarg; | 3519 | struct compat_50_sys_kevent_args callarg; | |
3520 | 3520 | |||
3521 | memset(&callarg, 0, sizeof(callarg)); | 3521 | memset(&callarg, 0, sizeof(callarg)); | |
3522 | SPARG(&callarg, fd) = fd; | 3522 | SPARG(&callarg, fd) = fd; | |
3523 | SPARG(&callarg, changelist) = changelist; | 3523 | SPARG(&callarg, changelist) = (const struct kevent100 *)changelist; | |
3524 | SPARG(&callarg, nchanges) = nchanges; | 3524 | SPARG(&callarg, nchanges) = nchanges; | |
3525 | SPARG(&callarg, eventlist) = eventlist; | 3525 | SPARG(&callarg, eventlist) = (struct kevent100 *)eventlist; | |
3526 | SPARG(&callarg, nevents) = nevents; | 3526 | SPARG(&callarg, nevents) = nevents; | |
3527 | SPARG(&callarg, timeout) = (const struct timespec50 *)timeout; | 3527 | SPARG(&callarg, timeout) = (const struct timespec50 *)timeout; | |
3528 | 3528 | |||
3529 | error = rsys_syscall(SYS_compat_50_kevent, &callarg, sizeof(callarg), retval); | 3529 | error = rsys_syscall(SYS_compat_50_kevent, &callarg, sizeof(callarg), retval); | |
3530 | rsys_seterrno(error); | 3530 | rsys_seterrno(error); | |
3531 | if (error == 0) { | 3531 | if (error == 0) { | |
3532 | if (sizeof(int) > sizeof(register_t)) | 3532 | if (sizeof(int) > sizeof(register_t)) | |
3533 | rv = *(int *)retval; | 3533 | rv = *(int *)retval; | |
3534 | else | 3534 | else | |
3535 | rv = *retval; | 3535 | rv = *retval; | |
3536 | } | 3536 | } | |
3537 | return rv; | 3537 | return rv; | |
3538 | } | 3538 | } | |
@@ -5315,59 +5315,61 @@ rump___sysimpl_nanosleep50(const struct | @@ -5315,59 +5315,61 @@ rump___sysimpl_nanosleep50(const struct | |||
5315 | rv = *(int *)retval; | 5315 | rv = *(int *)retval; | |
5316 | else | 5316 | else | |
5317 | rv = *retval; | 5317 | rv = *retval; | |
5318 | } | 5318 | } | |
5319 | return rv; | 5319 | return rv; | |
5320 | } | 5320 | } | |
5321 | #ifdef RUMP_KERNEL_IS_LIBC | 5321 | #ifdef RUMP_KERNEL_IS_LIBC | |
5322 | __weak_alias(nanosleep,rump___sysimpl_nanosleep50); | 5322 | __weak_alias(nanosleep,rump___sysimpl_nanosleep50); | |
5323 | __weak_alias(__nanosleep50,rump___sysimpl_nanosleep50); | 5323 | __weak_alias(__nanosleep50,rump___sysimpl_nanosleep50); | |
5324 | __weak_alias(___nanosleep50,rump___sysimpl_nanosleep50); | 5324 | __weak_alias(___nanosleep50,rump___sysimpl_nanosleep50); | |
5325 | __strong_alias(_sys___nanosleep50,rump___sysimpl_nanosleep50); | 5325 | __strong_alias(_sys___nanosleep50,rump___sysimpl_nanosleep50); | |
5326 | #endif /* RUMP_KERNEL_IS_LIBC */ | 5326 | #endif /* RUMP_KERNEL_IS_LIBC */ | |
5327 | 5327 | |||
5328 | #ifdef RUMP_SYS_COMPAT | |||
5328 | int rump___sysimpl_kevent50(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *); | 5329 | int rump___sysimpl_kevent50(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *); | |
5329 | int | 5330 | int | |
5330 | rump___sysimpl_kevent50(int fd, const struct kevent * changelist, size_t nchanges, struct kevent * eventlist, size_t nevents, const struct timespec * timeout) | 5331 | rump___sysimpl_kevent50(int fd, const struct kevent * changelist, size_t nchanges, struct kevent * eventlist, size_t nevents, const struct timespec * timeout) | |
5331 | { | 5332 | { | |
5332 | register_t retval[2]; | 5333 | register_t retval[2]; | |
5333 | int error = 0; | 5334 | int error = 0; | |
5334 | int rv = -1; | 5335 | int rv = -1; | |
5335 | struct sys___kevent50_args callarg; | 5336 | struct compat_100_sys___kevent50_args callarg; | |
5336 | 5337 | |||
5337 | memset(&callarg, 0, sizeof(callarg)); | 5338 | memset(&callarg, 0, sizeof(callarg)); | |
5338 | SPARG(&callarg, fd) = fd; | 5339 | SPARG(&callarg, fd) = fd; | |
5339 | SPARG(&callarg, changelist) = changelist; | 5340 | SPARG(&callarg, changelist) = (const struct kevent100 *)changelist; | |
5340 | SPARG(&callarg, nchanges) = nchanges; | 5341 | SPARG(&callarg, nchanges) = nchanges; | |
5341 | SPARG(&callarg, eventlist) = eventlist; | 5342 | SPARG(&callarg, eventlist) = (struct kevent100 *)eventlist; | |
5342 | SPARG(&callarg, nevents) = nevents; | 5343 | SPARG(&callarg, nevents) = nevents; | |
5343 | SPARG(&callarg, timeout) = timeout; | 5344 | SPARG(&callarg, timeout) = timeout; | |
5344 | 5345 | |||
5345 | error = rsys_syscall(SYS___kevent50, &callarg, sizeof(callarg), retval); | 5346 | error = rsys_syscall(SYS_compat_100___kevent50, &callarg, sizeof(callarg), retval); | |
5346 | rsys_seterrno(error); | 5347 | rsys_seterrno(error); | |
5347 | if (error == 0) { | 5348 | if (error == 0) { | |
5348 | if (sizeof(int) > sizeof(register_t)) | 5349 | if (sizeof(int) > sizeof(register_t)) | |
5349 | rv = *(int *)retval; | 5350 | rv = *(int *)retval; | |
5350 | else | 5351 | else | |
5351 | rv = *retval; | 5352 | rv = *retval; | |
5352 | } | 5353 | } | |
5353 | return rv; | 5354 | return rv; | |
5354 | } | 5355 | } | |
5355 | #ifdef RUMP_KERNEL_IS_LIBC | 5356 | #ifdef RUMP_KERNEL_IS_LIBC | |
5356 | __weak_alias(kevent,rump___sysimpl_kevent50); | 5357 | __weak_alias(kevent,rump___sysimpl_kevent50); | |
5357 | __weak_alias(__kevent50,rump___sysimpl_kevent50); | 5358 | __weak_alias(__kevent50,rump___sysimpl_kevent50); | |
5358 | __weak_alias(___kevent50,rump___sysimpl_kevent50); | 5359 | __weak_alias(___kevent50,rump___sysimpl_kevent50); | |
5359 | __strong_alias(_sys___kevent50,rump___sysimpl_kevent50); | 5360 | __strong_alias(_sys___kevent50,rump___sysimpl_kevent50); | |
5360 | #endif /* RUMP_KERNEL_IS_LIBC */ | 5361 | #endif /* RUMP_KERNEL_IS_LIBC */ | |
5362 | #endif /* RUMP_SYS_COMPAT */ | |||
5361 | 5363 | |||
5362 | int rump___sysimpl_pselect50(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *); | 5364 | int rump___sysimpl_pselect50(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *); | |
5363 | int | 5365 | int | |
5364 | rump___sysimpl_pselect50(int nd, fd_set * in, fd_set * ou, fd_set * ex, const struct timespec * ts, const sigset_t * mask) | 5366 | rump___sysimpl_pselect50(int nd, fd_set * in, fd_set * ou, fd_set * ex, const struct timespec * ts, const sigset_t * mask) | |
5365 | { | 5367 | { | |
5366 | register_t retval[2]; | 5368 | register_t retval[2]; | |
5367 | int error = 0; | 5369 | int error = 0; | |
5368 | int rv = -1; | 5370 | int rv = -1; | |
5369 | struct sys___pselect50_args callarg; | 5371 | struct sys___pselect50_args callarg; | |
5370 | 5372 | |||
5371 | memset(&callarg, 0, sizeof(callarg)); | 5373 | memset(&callarg, 0, sizeof(callarg)); | |
5372 | SPARG(&callarg, nd) = nd; | 5374 | SPARG(&callarg, nd) = nd; | |
5373 | SPARG(&callarg, in) = in; | 5375 | SPARG(&callarg, in) = in; | |
@@ -6602,26 +6604,60 @@ rump___sysimpl_lpathconf(const char * pa | @@ -6602,26 +6604,60 @@ rump___sysimpl_lpathconf(const char * pa | |||
6602 | if (sizeof(long) > sizeof(register_t)) | 6604 | if (sizeof(long) > sizeof(register_t)) | |
6603 | rv = *(long *)retval; | 6605 | rv = *(long *)retval; | |
6604 | else | 6606 | else | |
6605 | rv = *retval; | 6607 | rv = *retval; | |
6606 | } | 6608 | } | |
6607 | return rv; | 6609 | return rv; | |
6608 | } | 6610 | } | |
6609 | #ifdef RUMP_KERNEL_IS_LIBC | 6611 | #ifdef RUMP_KERNEL_IS_LIBC | |
6610 | __weak_alias(lpathconf,rump___sysimpl_lpathconf); | 6612 | __weak_alias(lpathconf,rump___sysimpl_lpathconf); | |
6611 | __weak_alias(_lpathconf,rump___sysimpl_lpathconf); | 6613 | __weak_alias(_lpathconf,rump___sysimpl_lpathconf); | |
6612 | __strong_alias(_sys_lpathconf,rump___sysimpl_lpathconf); | 6614 | __strong_alias(_sys_lpathconf,rump___sysimpl_lpathconf); | |
6613 | #endif /* RUMP_KERNEL_IS_LIBC */ | 6615 | #endif /* RUMP_KERNEL_IS_LIBC */ | |
6614 | 6616 | |||
6617 | int rump___sysimpl_kevent100(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *); | |||
6618 | int | |||
6619 | rump___sysimpl_kevent100(int fd, const struct kevent * changelist, size_t nchanges, struct kevent * eventlist, size_t nevents, const struct timespec * timeout) | |||
6620 | { | |||
6621 | register_t retval[2]; | |||
6622 | int error = 0; | |||
6623 | int rv = -1; | |||
6624 | struct sys___kevent100_args callarg; | |||
6625 | ||||
6626 | memset(&callarg, 0, sizeof(callarg)); | |||
6627 | SPARG(&callarg, fd) = fd; | |||
6628 | SPARG(&callarg, changelist) = changelist; | |||
6629 | SPARG(&callarg, nchanges) = nchanges; | |||
6630 | SPARG(&callarg, eventlist) = eventlist; | |||
6631 | SPARG(&callarg, nevents) = nevents; | |||
6632 | SPARG(&callarg, timeout) = timeout; | |||
6633 | ||||
6634 | error = rsys_syscall(SYS___kevent100, &callarg, sizeof(callarg), retval); | |||
6635 | rsys_seterrno(error); | |||
6636 | if (error == 0) { | |||
6637 | if (sizeof(int) > sizeof(register_t)) | |||
6638 | rv = *(int *)retval; | |||
6639 | else | |||
6640 | rv = *retval; | |||
6641 | } | |||
6642 | return rv; | |||
6643 | } | |||
6644 | #ifdef RUMP_KERNEL_IS_LIBC | |||
6645 | __weak_alias(kevent,rump___sysimpl_kevent100); | |||
6646 | __weak_alias(__kevent100,rump___sysimpl_kevent100); | |||
6647 | __weak_alias(___kevent100,rump___sysimpl_kevent100); | |||
6648 | __strong_alias(_sys___kevent100,rump___sysimpl_kevent100); | |||
6649 | #endif /* RUMP_KERNEL_IS_LIBC */ | |||
6650 | ||||
6615 | int rump_sys_pipe(int *); | 6651 | int rump_sys_pipe(int *); | |
6616 | int | 6652 | int | |
6617 | rump_sys_pipe(int *fd) | 6653 | rump_sys_pipe(int *fd) | |
6618 | { | 6654 | { | |
6619 | register_t retval[2]; | 6655 | register_t retval[2]; | |
6620 | int error = 0; | 6656 | int error = 0; | |
6621 | 6657 | |||
6622 | error = rsys_syscall(SYS_pipe, NULL, 0, retval); | 6658 | error = rsys_syscall(SYS_pipe, NULL, 0, retval); | |
6623 | if (error) { | 6659 | if (error) { | |
6624 | rsys_seterrno(error); | 6660 | rsys_seterrno(error); | |
6625 | } else { | 6661 | } else { | |
6626 | fd[0] = retval[0]; | 6662 | fd[0] = retval[0]; | |
6627 | fd[1] = retval[1]; | 6663 | fd[1] = retval[1]; | |
@@ -8313,29 +8349,29 @@ struct sysent rump_sysent[] = { | @@ -8313,29 +8349,29 @@ struct sysent rump_sysent[] = { | |||
8313 | { | 8349 | { | |
8314 | .sy_flags = SYCALL_NOSYS, | 8350 | .sy_flags = SYCALL_NOSYS, | |
8315 | .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, | 8351 | .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, | |
8316 | }, /* 432 = __mq_timedsend50 */ | 8352 | }, /* 432 = __mq_timedsend50 */ | |
8317 | { | 8353 | { | |
8318 | .sy_flags = SYCALL_NOSYS, | 8354 | .sy_flags = SYCALL_NOSYS, | |
8319 | .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, | 8355 | .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, | |
8320 | }, /* 433 = __mq_timedreceive50 */ | 8356 | }, /* 433 = __mq_timedreceive50 */ | |
8321 | { | 8357 | { | |
8322 | .sy_flags = SYCALL_NOSYS, | 8358 | .sy_flags = SYCALL_NOSYS, | |
8323 | .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, | 8359 | .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, | |
8324 | }, /* 434 = _lwp_park */ | 8360 | }, /* 434 = _lwp_park */ | |
8325 | { | 8361 | { | |
8326 | ns(struct sys___kevent50_args), | 8362 | ns(struct compat_100_sys___kevent50_args), | |
8327 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8363 | .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, | |
8328 | }, /* 435 = __kevent50 */ | 8364 | }, /* 435 = compat_100___kevent50 */ | |
8329 | { | 8365 | { | |
8330 | ns(struct sys___pselect50_args), | 8366 | ns(struct sys___pselect50_args), | |
8331 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8367 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8332 | }, /* 436 = __pselect50 */ | 8368 | }, /* 436 = __pselect50 */ | |
8333 | { | 8369 | { | |
8334 | ns(struct sys___pollts50_args), | 8370 | ns(struct sys___pollts50_args), | |
8335 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8371 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8336 | }, /* 437 = __pollts50 */ | 8372 | }, /* 437 = __pollts50 */ | |
8337 | { | 8373 | { | |
8338 | ns(struct sys___aio_suspend50_args), | 8374 | ns(struct sys___aio_suspend50_args), | |
8339 | .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, | 8375 | .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, | |
8340 | }, /* 438 = __aio_suspend50 */ | 8376 | }, /* 438 = __aio_suspend50 */ | |
8341 | { | 8377 | { | |
@@ -8564,41 +8600,38 @@ struct sysent rump_sysent[] = { | @@ -8564,41 +8600,38 @@ struct sysent rump_sysent[] = { | |||
8564 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8600 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8565 | }, /* 497 = __acl_aclcheck_file */ | 8601 | }, /* 497 = __acl_aclcheck_file */ | |
8566 | { | 8602 | { | |
8567 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8603 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8568 | }, /* 498 = __acl_aclcheck_fd */ | 8604 | }, /* 498 = __acl_aclcheck_fd */ | |
8569 | { | 8605 | { | |
8570 | ns(struct sys_lpathconf_args), | 8606 | ns(struct sys_lpathconf_args), | |
8571 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8607 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8572 | }, /* 499 = lpathconf */ | 8608 | }, /* 499 = lpathconf */ | |
8573 | { | 8609 | { | |
8574 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8610 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8575 | }, /* 500 = memfd_create */ | 8611 | }, /* 500 = memfd_create */ | |
8576 | { | 8612 | { | |
8577 | .sy_flags = SYCALL_NOSYS, | 8613 | ns(struct sys___kevent100_args), | |
8578 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8614 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8579 | }, /* 501 = filler */ | 8615 | }, /* 501 = __kevent100 */ | |
8580 | { | 8616 | { | |
8581 | .sy_flags = SYCALL_NOSYS, | |||
8582 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8617 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8583 | }, /* 502 = filler */ | 8618 | }, /* 502 = epoll_create1 */ | |
8584 | { | 8619 | { | |
8585 | .sy_flags = SYCALL_NOSYS, | |||
8586 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8620 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8587 | }, /* 503 = filler */ | 8621 | }, /* 503 = epoll_ctl */ | |
8588 | { | 8622 | { | |
8589 | .sy_flags = SYCALL_NOSYS, | |||
8590 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8623 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8591 | }, /* 504 = filler */ | 8624 | }, /* 504 = epoll_pwait2 */ | |
8592 | { | 8625 | { | |
8593 | .sy_flags = SYCALL_NOSYS, | 8626 | .sy_flags = SYCALL_NOSYS, | |
8594 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8627 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8595 | }, /* 505 = filler */ | 8628 | }, /* 505 = filler */ | |
8596 | { | 8629 | { | |
8597 | .sy_flags = SYCALL_NOSYS, | 8630 | .sy_flags = SYCALL_NOSYS, | |
8598 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8631 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8599 | }, /* 506 = filler */ | 8632 | }, /* 506 = filler */ | |
8600 | { | 8633 | { | |
8601 | .sy_flags = SYCALL_NOSYS, | 8634 | .sy_flags = SYCALL_NOSYS, | |
8602 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | 8635 | .sy_call = (sy_call_t *)(void *)rumpns_enosys, | |
8603 | }, /* 507 = filler */ | 8636 | }, /* 507 = filler */ | |
8604 | { | 8637 | { | |
@@ -8623,20 +8656,20 @@ const uint32_t rump_sysent_nomodbits[] = | @@ -8623,20 +8656,20 @@ const uint32_t rump_sysent_nomodbits[] = | |||
8623 | 0x042c4180, /* syscalls 0- 31 */ | 8656 | 0x042c4180, /* syscalls 0- 31 */ | |
8624 | 0xc0b14140, /* syscalls 32- 63 */ | 8657 | 0xc0b14140, /* syscalls 32- 63 */ | |
8625 | 0x23f80083, /* syscalls 64- 95 */ | 8658 | 0x23f80083, /* syscalls 64- 95 */ | |
8626 | 0x2437f0ea, /* syscalls 96-127 */ | 8659 | 0x2437f0ea, /* syscalls 96-127 */ | |
8627 | 0x7877f406, /* syscalls 128-159 */ | 8660 | 0x7877f406, /* syscalls 128-159 */ | |
8628 | 0x7f008e1e, /* syscalls 160-191 */ | 8661 | 0x7f008e1e, /* syscalls 160-191 */ | |
8629 | 0xf0044010, /* syscalls 192-223 */ | 8662 | 0xf0044010, /* syscalls 192-223 */ | |
8630 | 0xff9167ff, /* syscalls 224-255 */ | 8663 | 0xff9167ff, /* syscalls 224-255 */ | |
8631 | 0x01d107ff, /* syscalls 256-287 */ | 8664 | 0x01d107ff, /* syscalls 256-287 */ | |
8632 | 0x0000fc88, /* syscalls 288-319 */ | 8665 | 0x0000fc88, /* syscalls 288-319 */ | |
8633 | 0x0200fc01, /* syscalls 320-351 */ | 8666 | 0x0200fc01, /* syscalls 320-351 */ | |
8634 | 0x006000f0, /* syscalls 352-383 */ | 8667 | 0x006000f0, /* syscalls 352-383 */ | |
8635 | 0x007fe338, /* syscalls 384-415 */ | 8668 | 0x007fe338, /* syscalls 384-415 */ | |
8636 | 0x1c470040, /* syscalls 416-447 */ | 8669 | 0x1c4f0040, /* syscalls 416-447 */ | |
8637 | 0x00000000, /* syscalls 448-479 */ | 8670 | 0x00000000, /* syscalls 448-479 */ | |
8638 | 0x00000000, /* syscalls 480-511 */ | 8671 | 0x00000000, /* syscalls 480-511 */ | |
8639 | }; | 8672 | }; | |
8640 | CTASSERT(__arraycount(rump_sysent) == SYS_NSYSENT); | 8673 | CTASSERT(__arraycount(rump_sysent) == SYS_NSYSENT); | |
8641 | __strong_alias(rumpns_sysent,rump_sysent); | 8674 | __strong_alias(rumpns_sysent,rump_sysent); | |
8642 | #endif /* RUMP_CLIENT */ | 8675 | #endif /* RUMP_CLIENT */ |
--- src/sys/rump/librump/rumpkern/rumpkern_syscalls.c 2023/07/10 02:37:05 1.7
+++ src/sys/rump/librump/rumpkern/rumpkern_syscalls.c 2023/07/28 18:20:29 1.8
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | /* $NetBSD: rumpkern_syscalls.c,v 1.7 2023/07/10 02:37:05 christos Exp $ */ | 1 | /* $NetBSD: rumpkern_syscalls.c,v 1.8 2023/07/28 18:20:29 christos Exp $ */ | |
2 | 2 | |||
3 | /* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */ | 3 | /* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */ | |
4 | 4 | |||
5 | #include <sys/cdefs.h> | 5 | #include <sys/cdefs.h> | |
6 | __KERNEL_RCSID(0, "$NetBSD: rumpkern_syscalls.c,v 1.7 2023/07/10 02:37:05 christos Exp $"); | 6 | __KERNEL_RCSID(0, "$NetBSD: rumpkern_syscalls.c,v 1.8 2023/07/28 18:20:29 christos Exp $"); | |
7 | 7 | |||
8 | #include <sys/param.h> | 8 | #include <sys/param.h> | |
9 | 9 | |||
10 | #include <rump-sys/kern.h> | 10 | #include <rump-sys/kern.h> | |
11 | 11 | |||
12 | extern sy_call_t sys_read; | 12 | extern sy_call_t sys_read; | |
13 | extern sy_call_t sys_write; | 13 | extern sy_call_t sys_write; | |
14 | extern sy_call_t sys_close; | 14 | extern sy_call_t sys_close; | |
15 | extern sy_call_t sys_getpid_with_ppid; | 15 | extern sy_call_t sys_getpid_with_ppid; | |
16 | extern sy_call_t sys_setuid; | 16 | extern sy_call_t sys_setuid; | |
17 | extern sy_call_t sys_getuid_with_euid; | 17 | extern sy_call_t sys_getuid_with_euid; | |
18 | extern sy_call_t sys_geteuid; | 18 | extern sy_call_t sys_geteuid; | |
19 | extern sy_call_t sys_getppid; | 19 | extern sy_call_t sys_getppid; | |
@@ -57,27 +57,26 @@ extern sy_call_t sys_issetugid; | @@ -57,27 +57,26 @@ extern sy_call_t sys_issetugid; | |||
57 | extern sy_call_t sys_utrace; | 57 | extern sy_call_t sys_utrace; | |
58 | extern sy_call_t sys_kqueue; | 58 | extern sy_call_t sys_kqueue; | |
59 | extern sy_call_t sys___posix_fadvise50; | 59 | extern sy_call_t sys___posix_fadvise50; | |
60 | extern sy_call_t sys___select50; | 60 | extern sy_call_t sys___select50; | |
61 | extern sy_call_t sys___gettimeofday50; | 61 | extern sy_call_t sys___gettimeofday50; | |
62 | extern sy_call_t sys___settimeofday50; | 62 | extern sy_call_t sys___settimeofday50; | |
63 | extern sy_call_t sys___adjtime50; | 63 | extern sy_call_t sys___adjtime50; | |
64 | extern sy_call_t sys___setitimer50; | 64 | extern sy_call_t sys___setitimer50; | |
65 | extern sy_call_t sys___getitimer50; | 65 | extern sy_call_t sys___getitimer50; | |
66 | extern sy_call_t sys___clock_gettime50; | 66 | extern sy_call_t sys___clock_gettime50; | |
67 | extern sy_call_t sys___clock_settime50; | 67 | extern sy_call_t sys___clock_settime50; | |
68 | extern sy_call_t sys___clock_getres50; | 68 | extern sy_call_t sys___clock_getres50; | |
69 | extern sy_call_t sys___nanosleep50; | 69 | extern sy_call_t sys___nanosleep50; | |
70 | extern sy_call_t sys___kevent50; | |||
71 | extern sy_call_t sys___pselect50; | 70 | extern sy_call_t sys___pselect50; | |
72 | extern sy_call_t sys___pollts50; | 71 | extern sy_call_t sys___pollts50; | |
73 | extern sy_call_t sys___fstat50; | 72 | extern sy_call_t sys___fstat50; | |
74 | extern sy_call_t sys___timer_settime50; | 73 | extern sy_call_t sys___timer_settime50; | |
75 | extern sy_call_t sys___timer_gettime50; | 74 | extern sy_call_t sys___timer_gettime50; | |
76 | extern sy_call_t sys_pipe2; | 75 | extern sy_call_t sys_pipe2; | |
77 | extern sy_call_t sys_dup3; | 76 | extern sy_call_t sys_dup3; | |
78 | extern sy_call_t sys_kqueue1; | 77 | extern sy_call_t sys_kqueue1; | |
79 | extern sy_call_t sys_clock_nanosleep; | 78 | extern sy_call_t sys_clock_nanosleep; | |
80 | extern sy_call_t sys_clock_getcpuclockid2; | 79 | extern sy_call_t sys_clock_getcpuclockid2; | |
81 | 80 | |||
82 | static const struct rump_onesyscall mysys[] = { | 81 | static const struct rump_onesyscall mysys[] = { | |
83 | { 3, sys_read }, | 82 | { 3, sys_read }, | |
@@ -128,27 +127,26 @@ static const struct rump_onesyscall mysy | @@ -128,27 +127,26 @@ static const struct rump_onesyscall mysy | |||
128 | { 306, sys_utrace }, | 127 | { 306, sys_utrace }, | |
129 | { 344, sys_kqueue }, | 128 | { 344, sys_kqueue }, | |
130 | { 416, sys___posix_fadvise50 }, | 129 | { 416, sys___posix_fadvise50 }, | |
131 | { 417, sys___select50 }, | 130 | { 417, sys___select50 }, | |
132 | { 418, sys___gettimeofday50 }, | 131 | { 418, sys___gettimeofday50 }, | |
133 | { 419, sys___settimeofday50 }, | 132 | { 419, sys___settimeofday50 }, | |
134 | { 421, sys___adjtime50 }, | 133 | { 421, sys___adjtime50 }, | |
135 | { 425, sys___setitimer50 }, | 134 | { 425, sys___setitimer50 }, | |
136 | { 426, sys___getitimer50 }, | 135 | { 426, sys___getitimer50 }, | |
137 | { 427, sys___clock_gettime50 }, | 136 | { 427, sys___clock_gettime50 }, | |
138 | { 428, sys___clock_settime50 }, | 137 | { 428, sys___clock_settime50 }, | |
139 | { 429, sys___clock_getres50 }, | 138 | { 429, sys___clock_getres50 }, | |
140 | { 430, sys___nanosleep50 }, | 139 | { 430, sys___nanosleep50 }, | |
141 | { 435, sys___kevent50 }, | |||
142 | { 436, sys___pselect50 }, | 140 | { 436, sys___pselect50 }, | |
143 | { 437, sys___pollts50 }, | 141 | { 437, sys___pollts50 }, | |
144 | { 440, sys___fstat50 }, | 142 | { 440, sys___fstat50 }, | |
145 | { 446, sys___timer_settime50 }, | 143 | { 446, sys___timer_settime50 }, | |
146 | { 447, sys___timer_gettime50 }, | 144 | { 447, sys___timer_gettime50 }, | |
147 | { 453, sys_pipe2 }, | 145 | { 453, sys_pipe2 }, | |
148 | { 454, sys_dup3 }, | 146 | { 454, sys_dup3 }, | |
149 | { 455, sys_kqueue1 }, | 147 | { 455, sys_kqueue1 }, | |
150 | { 477, sys_clock_nanosleep }, | 148 | { 477, sys_clock_nanosleep }, | |
151 | { 482, sys_clock_getcpuclockid2 }, | 149 | { 482, sys_clock_getcpuclockid2 }, | |
152 | }; | 150 | }; | |
153 | 151 | |||
154 | RUMP_COMPONENT(RUMP_COMPONENT_SYSCALL) | 152 | RUMP_COMPONENT(RUMP_COMPONENT_SYSCALL) |
--- src/sys/sys/syscall.h 2023/07/28 18:19:01 1.323
+++ src/sys/sys/syscall.h 2023/07/28 18:20:28 1.324
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | /* $NetBSD: syscall.h,v 1.323 2023/07/28 18:19:01 christos Exp $ */ | 1 | /* $NetBSD: syscall.h,v 1.324 2023/07/28 18:20:28 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.310 2023/07/10 02:33:04 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #ifndef _SYS_SYSCALL_H_ | 10 | #ifndef _SYS_SYSCALL_H_ | |
11 | #define _SYS_SYSCALL_H_ | 11 | #define _SYS_SYSCALL_H_ | |
12 | 12 | |||
13 | #define SYS_MAXSYSARGS 8 | 13 | #define SYS_MAXSYSARGS 8 | |
14 | 14 | |||
15 | /* syscall: "syscall" ret: "int" args: "int" "..." */ | 15 | /* syscall: "syscall" ret: "int" args: "int" "..." */ | |
16 | #define SYS_syscall 0 | 16 | #define SYS_syscall 0 | |
17 | 17 | |||
18 | /* syscall: "exit" ret: "void" args: "int" */ | 18 | /* syscall: "exit" ret: "void" args: "int" */ | |
19 | #define SYS_exit 1 | 19 | #define SYS_exit 1 | |
20 | 20 |
--- src/sys/sys/syscallargs.h 2023/07/10 02:37:05 1.306
+++ src/sys/sys/syscallargs.h 2023/07/28 18:20:28 1.307
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | /* $NetBSD: syscallargs.h,v 1.306 2023/07/10 02:37:05 christos Exp $ */ | 1 | /* $NetBSD: syscallargs.h,v 1.307 2023/07/28 18:20:28 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.310 2023/07/10 02:33:04 christos Exp | 7 | * created from NetBSD: syscalls.master,v 1.311 2023/07/28 18:19:01 christos Exp | |
8 | */ | 8 | */ | |
9 | 9 | |||
10 | #ifndef _SYS_SYSCALLARGS_H_ | 10 | #ifndef _SYS_SYSCALLARGS_H_ | |
11 | #define _SYS_SYSCALLARGS_H_ | 11 | #define _SYS_SYSCALLARGS_H_ | |
12 | 12 | |||
13 | #ifndef RUMP_CLIENT | 13 | #ifndef RUMP_CLIENT | |
14 | #include <sys/idtype.h> | 14 | #include <sys/idtype.h> | |
15 | #include <sys/mount.h> | 15 | #include <sys/mount.h> | |
16 | #include <sys/sched.h> | 16 | #include <sys/sched.h> | |
17 | #include <sys/acl.h> | 17 | #include <sys/acl.h> | |
18 | #endif | 18 | #endif | |
19 | 19 | |||
20 | #include <sys/socket.h> | 20 | #include <sys/socket.h> | |
@@ -2182,29 +2182,29 @@ check_syscall_args(sys___sigaction_sigtr | @@ -2182,29 +2182,29 @@ check_syscall_args(sys___sigaction_sigtr | |||
2182 | #endif /* !RUMP_CLIENT */ | 2182 | #endif /* !RUMP_CLIENT */ | |
2183 | 2183 | |||
2184 | #ifndef RUMP_CLIENT | 2184 | #ifndef RUMP_CLIENT | |
2185 | struct sys_rasctl_args { | 2185 | struct sys_rasctl_args { | |
2186 | syscallarg(void *) addr; | 2186 | syscallarg(void *) addr; | |
2187 | syscallarg(size_t) len; | 2187 | syscallarg(size_t) len; | |
2188 | syscallarg(int) op; | 2188 | syscallarg(int) op; | |
2189 | }; | 2189 | }; | |
2190 | check_syscall_args(sys_rasctl) | 2190 | check_syscall_args(sys_rasctl) | |
2191 | #endif /* !RUMP_CLIENT */ | 2191 | #endif /* !RUMP_CLIENT */ | |
2192 | 2192 | |||
2193 | struct compat_50_sys_kevent_args { | 2193 | struct compat_50_sys_kevent_args { | |
2194 | syscallarg(int) fd; | 2194 | syscallarg(int) fd; | |
2195 | syscallarg(const struct kevent *) changelist; | 2195 | syscallarg(const struct kevent100 *) changelist; | |
2196 | syscallarg(size_t) nchanges; | 2196 | syscallarg(size_t) nchanges; | |
2197 | syscallarg(struct kevent *) eventlist; | 2197 | syscallarg(struct kevent100 *) eventlist; | |
2198 | syscallarg(size_t) nevents; | 2198 | syscallarg(size_t) nevents; | |
2199 | syscallarg(const struct timespec50 *) timeout; | 2199 | syscallarg(const struct timespec50 *) timeout; | |
2200 | }; | 2200 | }; | |
2201 | check_syscall_args(compat_50_sys_kevent) | 2201 | check_syscall_args(compat_50_sys_kevent) | |
2202 | 2202 | |||
2203 | #ifndef RUMP_CLIENT | 2203 | #ifndef RUMP_CLIENT | |
2204 | struct sys__sched_setparam_args { | 2204 | struct sys__sched_setparam_args { | |
2205 | syscallarg(pid_t) pid; | 2205 | syscallarg(pid_t) pid; | |
2206 | syscallarg(lwpid_t) lid; | 2206 | syscallarg(lwpid_t) lid; | |
2207 | syscallarg(int) policy; | 2207 | syscallarg(int) policy; | |
2208 | syscallarg(const struct sched_param *) params; | 2208 | syscallarg(const struct sched_param *) params; | |
2209 | }; | 2209 | }; | |
2210 | check_syscall_args(sys__sched_setparam) | 2210 | check_syscall_args(sys__sched_setparam) | |
@@ -2826,35 +2826,35 @@ struct sys___mq_timedreceive50_args { | @@ -2826,35 +2826,35 @@ struct sys___mq_timedreceive50_args { | |||
2826 | check_syscall_args(sys___mq_timedreceive50) | 2826 | check_syscall_args(sys___mq_timedreceive50) | |
2827 | #endif /* !RUMP_CLIENT */ | 2827 | #endif /* !RUMP_CLIENT */ | |
2828 | 2828 | |||
2829 | #ifndef RUMP_CLIENT | 2829 | #ifndef RUMP_CLIENT | |
2830 | struct compat_60_sys__lwp_park_args { | 2830 | struct compat_60_sys__lwp_park_args { | |
2831 | syscallarg(const struct timespec *) ts; | 2831 | syscallarg(const struct timespec *) ts; | |
2832 | syscallarg(lwpid_t) unpark; | 2832 | syscallarg(lwpid_t) unpark; | |
2833 | syscallarg(const void *) hint; | 2833 | syscallarg(const void *) hint; | |
2834 | syscallarg(const void *) unparkhint; | 2834 | syscallarg(const void *) unparkhint; | |
2835 | }; | 2835 | }; | |
2836 | check_syscall_args(compat_60_sys__lwp_park) | 2836 | check_syscall_args(compat_60_sys__lwp_park) | |
2837 | #endif /* !RUMP_CLIENT */ | 2837 | #endif /* !RUMP_CLIENT */ | |
2838 | 2838 | |||
2839 | struct sys___kevent50_args { | 2839 | struct compat_100_sys___kevent50_args { | |
2840 | syscallarg(int) fd; | 2840 | syscallarg(int) fd; | |
2841 | syscallarg(const struct kevent *) changelist; | 2841 | syscallarg(const struct kevent100 *) changelist; | |
2842 | syscallarg(size_t) nchanges; | 2842 | syscallarg(size_t) nchanges; | |
2843 | syscallarg(struct kevent *) eventlist; | 2843 | syscallarg(struct kevent100 *) eventlist; | |
2844 | syscallarg(size_t) nevents; | 2844 | syscallarg(size_t) nevents; | |
2845 | syscallarg(const struct timespec *) timeout; | 2845 | syscallarg(const struct timespec *) timeout; | |
2846 | }; | 2846 | }; | |
2847 | check_syscall_args(sys___kevent50) | 2847 | check_syscall_args(compat_100_sys___kevent50) | |
2848 | 2848 | |||
2849 | struct sys___pselect50_args { | 2849 | struct sys___pselect50_args { | |
2850 | syscallarg(int) nd; | 2850 | syscallarg(int) nd; | |
2851 | syscallarg(fd_set *) in; | 2851 | syscallarg(fd_set *) in; | |
2852 | syscallarg(fd_set *) ou; | 2852 | syscallarg(fd_set *) ou; | |
2853 | syscallarg(fd_set *) ex; | 2853 | syscallarg(fd_set *) ex; | |
2854 | syscallarg(const struct timespec *) ts; | 2854 | syscallarg(const struct timespec *) ts; | |
2855 | syscallarg(const sigset_t *) mask; | 2855 | syscallarg(const sigset_t *) mask; | |
2856 | }; | 2856 | }; | |
2857 | check_syscall_args(sys___pselect50) | 2857 | check_syscall_args(sys___pselect50) | |
2858 | 2858 | |||
2859 | struct sys___pollts50_args { | 2859 | struct sys___pollts50_args { | |
2860 | syscallarg(struct pollfd *) fds; | 2860 | syscallarg(struct pollfd *) fds; | |
@@ -3354,26 +3354,64 @@ struct sys_lpathconf_args { | @@ -3354,26 +3354,64 @@ struct sys_lpathconf_args { | |||
3354 | syscallarg(const char *) path; | 3354 | syscallarg(const char *) path; | |
3355 | syscallarg(int) name; | 3355 | syscallarg(int) name; | |
3356 | }; | 3356 | }; | |
3357 | check_syscall_args(sys_lpathconf) | 3357 | check_syscall_args(sys_lpathconf) | |
3358 | 3358 | |||
3359 | #ifndef RUMP_CLIENT | 3359 | #ifndef RUMP_CLIENT | |
3360 | struct sys_memfd_create_args { | 3360 | struct sys_memfd_create_args { | |
3361 | syscallarg(const char *) name; | 3361 | syscallarg(const char *) name; | |
3362 | syscallarg(unsigned int) flags; | 3362 | syscallarg(unsigned int) flags; | |
3363 | }; | 3363 | }; | |
3364 | check_syscall_args(sys_memfd_create) | 3364 | check_syscall_args(sys_memfd_create) | |
3365 | #endif /* !RUMP_CLIENT */ | 3365 | #endif /* !RUMP_CLIENT */ | |
3366 | 3366 | |||
3367 | struct sys___kevent100_args { | |||
3368 | syscallarg(int) fd; | |||
3369 | syscallarg(const struct kevent *) changelist; | |||
3370 | syscallarg(size_t) nchanges; | |||
3371 | syscallarg(struct kevent *) eventlist; | |||
3372 | syscallarg(size_t) nevents; | |||
3373 | syscallarg(const struct timespec *) timeout; | |||
3374 | }; | |||
3375 | check_syscall_args(sys___kevent100) | |||
3376 | ||||
3377 | #ifndef RUMP_CLIENT | |||
3378 | struct sys_epoll_create1_args { | |||
3379 | syscallarg(int) flags; | |||
3380 | }; | |||
3381 | check_syscall_args(sys_epoll_create1) | |||
3382 | #endif /* !RUMP_CLIENT */ | |||
3383 | ||||
3384 | #ifndef RUMP_CLIENT | |||
3385 | struct sys_epoll_ctl_args { | |||
3386 | syscallarg(int) epfd; | |||
3387 | syscallarg(int) op; | |||
3388 | syscallarg(int) fd; | |||
3389 | syscallarg(struct epoll_event *) event; | |||
3390 | }; | |||
3391 | check_syscall_args(sys_epoll_ctl) | |||
3392 | #endif /* !RUMP_CLIENT */ | |||
3393 | ||||
3394 | #ifndef RUMP_CLIENT | |||
3395 | struct sys_epoll_pwait2_args { | |||
3396 | syscallarg(int) epfd; | |||
3397 | syscallarg(struct epoll_event *) events; | |||
3398 | syscallarg(int) maxevents; | |||
3399 | syscallarg(const struct timespec *) timeout; | |||
3400 | syscallarg(const sigset_t *) sigmask; | |||
3401 | }; | |||
3402 | check_syscall_args(sys_epoll_pwait2) | |||
3403 | #endif /* !RUMP_CLIENT */ | |||
3404 | ||||
3367 | /* | 3405 | /* | |
3368 | * System call prototypes. | 3406 | * System call prototypes. | |
3369 | */ | 3407 | */ | |
3370 | 3408 | |||
3371 | #ifndef RUMP_CLIENT | 3409 | #ifndef RUMP_CLIENT | |
3372 | int sys_syscall(struct lwp *, const struct sys_syscall_args *, register_t *); | 3410 | int sys_syscall(struct lwp *, const struct sys_syscall_args *, register_t *); | |
3373 | 3411 | |||
3374 | int sys_exit(struct lwp *, const struct sys_exit_args *, register_t *); | 3412 | int sys_exit(struct lwp *, const struct sys_exit_args *, register_t *); | |
3375 | 3413 | |||
3376 | int sys_fork(struct lwp *, const void *, register_t *); | 3414 | int sys_fork(struct lwp *, const void *, register_t *); | |
3377 | 3415 | |||
3378 | int sys_read(struct lwp *, const struct sys_read_args *, register_t *); | 3416 | int sys_read(struct lwp *, const struct sys_read_args *, register_t *); | |
3379 | 3417 | |||
@@ -4147,27 +4185,27 @@ int sys___clock_settime50(struct lwp *, | @@ -4147,27 +4185,27 @@ int sys___clock_settime50(struct lwp *, | |||
4147 | 4185 | |||
4148 | int sys___clock_getres50(struct lwp *, const struct sys___clock_getres50_args *, register_t *); | 4186 | int sys___clock_getres50(struct lwp *, const struct sys___clock_getres50_args *, register_t *); | |
4149 | 4187 | |||
4150 | int sys___nanosleep50(struct lwp *, const struct sys___nanosleep50_args *, register_t *); | 4188 | int sys___nanosleep50(struct lwp *, const struct sys___nanosleep50_args *, register_t *); | |
4151 | 4189 | |||
4152 | int sys_____sigtimedwait50(struct lwp *, const struct sys_____sigtimedwait50_args *, register_t *); | 4190 | int sys_____sigtimedwait50(struct lwp *, const struct sys_____sigtimedwait50_args *, register_t *); | |
4153 | 4191 | |||
4154 | int sys___mq_timedsend50(struct lwp *, const struct sys___mq_timedsend50_args *, register_t *); | 4192 | int sys___mq_timedsend50(struct lwp *, const struct sys___mq_timedsend50_args *, register_t *); | |
4155 | 4193 | |||
4156 | int sys___mq_timedreceive50(struct lwp *, const struct sys___mq_timedreceive50_args *, register_t *); | 4194 | int sys___mq_timedreceive50(struct lwp *, const struct sys___mq_timedreceive50_args *, register_t *); | |
4157 | 4195 | |||
4158 | int compat_60_sys__lwp_park(struct lwp *, const struct compat_60_sys__lwp_park_args *, register_t *); | 4196 | int compat_60_sys__lwp_park(struct lwp *, const struct compat_60_sys__lwp_park_args *, register_t *); | |
4159 | 4197 | |||
4160 | int sys___kevent50(struct lwp *, const struct sys___kevent50_args *, register_t *); | 4198 | int compat_100_sys___kevent50(struct lwp *, const struct compat_100_sys___kevent50_args *, register_t *); | |
4161 | 4199 | |||
4162 | int sys___pselect50(struct lwp *, const struct sys___pselect50_args *, register_t *); | 4200 | int sys___pselect50(struct lwp *, const struct sys___pselect50_args *, register_t *); | |
4163 | 4201 | |||
4164 | int sys___pollts50(struct lwp *, const struct sys___pollts50_args *, register_t *); | 4202 | int sys___pollts50(struct lwp *, const struct sys___pollts50_args *, register_t *); | |
4165 | 4203 | |||
4166 | int sys___aio_suspend50(struct lwp *, const struct sys___aio_suspend50_args *, register_t *); | 4204 | int sys___aio_suspend50(struct lwp *, const struct sys___aio_suspend50_args *, register_t *); | |
4167 | 4205 | |||
4168 | int sys___stat50(struct lwp *, const struct sys___stat50_args *, register_t *); | 4206 | int sys___stat50(struct lwp *, const struct sys___stat50_args *, register_t *); | |
4169 | 4207 | |||
4170 | int sys___fstat50(struct lwp *, const struct sys___fstat50_args *, register_t *); | 4208 | int sys___fstat50(struct lwp *, const struct sys___fstat50_args *, register_t *); | |
4171 | 4209 | |||
4172 | int sys___lstat50(struct lwp *, const struct sys___lstat50_args *, register_t *); | 4210 | int sys___lstat50(struct lwp *, const struct sys___lstat50_args *, register_t *); | |
4173 | 4211 | |||
@@ -4280,15 +4318,23 @@ int sys___acl_set_fd(struct lwp *, const | @@ -4280,15 +4318,23 @@ int sys___acl_set_fd(struct lwp *, const | |||
4280 | 4318 | |||
4281 | int sys___acl_delete_file(struct lwp *, const struct sys___acl_delete_file_args *, register_t *); | 4319 | int sys___acl_delete_file(struct lwp *, const struct sys___acl_delete_file_args *, register_t *); | |
4282 | 4320 | |||
4283 | int sys___acl_delete_fd(struct lwp *, const struct sys___acl_delete_fd_args *, register_t *); | 4321 | int sys___acl_delete_fd(struct lwp *, const struct sys___acl_delete_fd_args *, register_t *); | |
4284 | 4322 | |||
4285 | int sys___acl_aclcheck_file(struct lwp *, const struct sys___acl_aclcheck_file_args *, register_t *); | 4323 | int sys___acl_aclcheck_file(struct lwp *, const struct sys___acl_aclcheck_file_args *, register_t *); | |
4286 | 4324 | |||
4287 | int sys___acl_aclcheck_fd(struct lwp *, const struct sys___acl_aclcheck_fd_args *, register_t *); | 4325 | int sys___acl_aclcheck_fd(struct lwp *, const struct sys___acl_aclcheck_fd_args *, register_t *); | |
4288 | 4326 | |||
4289 | int sys_lpathconf(struct lwp *, const struct sys_lpathconf_args *, register_t *); | 4327 | int sys_lpathconf(struct lwp *, const struct sys_lpathconf_args *, register_t *); | |
4290 | 4328 | |||
4291 | int sys_memfd_create(struct lwp *, const struct sys_memfd_create_args *, register_t *); | 4329 | int sys_memfd_create(struct lwp *, const struct sys_memfd_create_args *, register_t *); | |
4292 | 4330 | |||
4331 | int sys___kevent100(struct lwp *, const struct sys___kevent100_args *, register_t *); | |||
4332 | ||||
4333 | int sys_epoll_create1(struct lwp *, const struct sys_epoll_create1_args *, register_t *); | |||
4334 | ||||
4335 | int sys_epoll_ctl(struct lwp *, const struct sys_epoll_ctl_args *, register_t *); | |||
4336 | ||||
4337 | int sys_epoll_pwait2(struct lwp *, const struct sys_epoll_pwait2_args *, register_t *); | |||
4338 | ||||
4293 | #endif /* !RUMP_CLIENT */ | 4339 | #endif /* !RUMP_CLIENT */ | |
4294 | #endif /* _SYS_SYSCALLARGS_H_ */ | 4340 | #endif /* _SYS_SYSCALLARGS_H_ */ |