Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Regen for native futex calls.



details:   https://anonhg.NetBSD.org/src/rev/19c6a542e7cb
branches:  trunk
changeset: 931330:19c6a542e7cb
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Apr 26 18:59:47 2020 +0000

description:
Regen for native futex calls.

diffstat:

 sys/kern/init_sysent.c                    |   28 ++++---
 sys/kern/syscalls.c                       |   18 ++--
 sys/kern/syscalls_autoload.c              |    6 +-
 sys/kern/systrace_args.c                  |  104 +++++++++++++++++++++++++++++-
 sys/rump/include/rump/rump_syscalls.h     |    4 +-
 sys/rump/librump/rumpkern/rump_syscalls.c |   25 +++----
 sys/sys/syscall.h                         |   15 +++-
 sys/sys/syscallargs.h                     |   40 ++++++++++-
 8 files changed, 195 insertions(+), 45 deletions(-)

diffs (truncated from 415 to 300 lines):

diff -r 673ba7725ccb -r 19c6a542e7cb sys/kern/init_sysent.c
--- a/sys/kern/init_sysent.c    Sun Apr 26 18:56:49 2020 +0000
+++ b/sys/kern/init_sysent.c    Sun Apr 26 18:59:47 2020 +0000
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.329 2020/04/22 21:25:17 thorpej Exp $ */
+/* $NetBSD: init_sysent.c,v 1.330 2020/04/26 18:59:47 thorpej Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp
+ * created from        NetBSD: syscalls.master,v 1.303 2020/04/26 18:53:33 thorpej Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.329 2020/04/22 21:25:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.330 2020/04/26 18:59:47 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
@@ -2359,14 +2359,20 @@
                .sy_call = (sy_call_t *)sys___fhstatvfs190
        },              /* 486 = __fhstatvfs190 */
        {
-               .sy_call = sys_nosys,
-       },              /* 487 = filler */
-       {
-               .sy_call = sys_nosys,
-       },              /* 488 = filler */
-       {
-               .sy_call = sys_nosys,
-       },              /* 489 = filler */
+               ns(struct sys___futex_args),
+               .sy_flags = SYCALL_ARG_PTR,
+               .sy_call = (sy_call_t *)sys___futex
+       },              /* 487 = __futex */
+       {
+               ns(struct sys___futex_set_robust_list_args),
+               .sy_flags = SYCALL_ARG_PTR,
+               .sy_call = (sy_call_t *)sys___futex_set_robust_list
+       },              /* 488 = __futex_set_robust_list */
+       {
+               ns(struct sys___futex_get_robust_list_args),
+               .sy_flags = SYCALL_ARG_PTR,
+               .sy_call = (sy_call_t *)sys___futex_get_robust_list
+       },              /* 489 = __futex_get_robust_list */
        {
                .sy_call = sys_nosys,
        },              /* 490 = filler */
diff -r 673ba7725ccb -r 19c6a542e7cb sys/kern/syscalls.c
--- a/sys/kern/syscalls.c       Sun Apr 26 18:56:49 2020 +0000
+++ b/sys/kern/syscalls.c       Sun Apr 26 18:59:47 2020 +0000
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.317 2020/04/22 21:25:17 thorpej Exp $ */
+/* $NetBSD: syscalls.c,v 1.318 2020/04/26 18:59:47 thorpej Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp
+ * created from        NetBSD: syscalls.master,v 1.303 2020/04/26 18:53:33 thorpej Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.317 2020/04/22 21:25:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.318 2020/04/26 18:59:47 thorpej Exp $");
 
 #if defined(_KERNEL_OPT)
 #ifdef _KERNEL_OPT
@@ -536,9 +536,9 @@
        /* 484 */       "__statvfs190",
        /* 485 */       "__fstatvfs190",
        /* 486 */       "__fhstatvfs190",
-       /* 487 */       "# filler",
-       /* 488 */       "# filler",
-       /* 489 */       "# filler",
+       /* 487 */       "__futex",
+       /* 488 */       "__futex_set_robust_list",
+       /* 489 */       "__futex_get_robust_list",
        /* 490 */       "# filler",
        /* 491 */       "# filler",
        /* 492 */       "# filler",
@@ -1073,9 +1073,9 @@
        /* 484 */       "statvfs1",
        /* 485 */       "fstatvfs1",
        /* 486 */       "fhstatvfs1",
-       /* 487 */       NULL, /* filler */
-       /* 488 */       NULL, /* filler */
-       /* 489 */       NULL, /* filler */
+       /* 487 */       NULL, /* __futex */
+       /* 488 */       NULL, /* __futex_set_robust_list */
+       /* 489 */       NULL, /* __futex_get_robust_list */
        /* 490 */       NULL, /* filler */
        /* 491 */       NULL, /* filler */
        /* 492 */       NULL, /* filler */
diff -r 673ba7725ccb -r 19c6a542e7cb sys/kern/syscalls_autoload.c
--- a/sys/kern/syscalls_autoload.c      Sun Apr 26 18:56:49 2020 +0000
+++ b/sys/kern/syscalls_autoload.c      Sun Apr 26 18:59:47 2020 +0000
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.34 2020/04/22 21:25:17 thorpej Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.35 2020/04/26 18:59:47 thorpej Exp $ */
 
 /*
  * System call autoload table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp
+ * created from        NetBSD: syscalls.master,v 1.303 2020/04/26 18:53:33 thorpej Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.34 2020/04/22 21:25:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.35 2020/04/26 18:59:47 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
diff -r 673ba7725ccb -r 19c6a542e7cb sys/kern/systrace_args.c
--- a/sys/kern/systrace_args.c  Sun Apr 26 18:56:49 2020 +0000
+++ b/sys/kern/systrace_args.c  Sun Apr 26 18:59:47 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.36 2020/04/22 21:25:17 thorpej Exp $ */
+/* $NetBSD: systrace_args.c,v 1.37 2020/04/26 18:59:47 thorpej Exp $ */
 
 /*
  * System call argument to DTrace register array converstion.
@@ -3701,6 +3701,36 @@
                *n_args = 4;
                break;
        }
+       /* sys___futex */
+       case 487: {
+               const struct sys___futex_args *p = params;
+               uarg[0] = (intptr_t) SCARG(p, uaddr); /* int * */
+               iarg[1] = SCARG(p, op); /* int */
+               iarg[2] = SCARG(p, val); /* int */
+               uarg[3] = (intptr_t) SCARG(p, timeout); /* const struct timespec * */
+               uarg[4] = (intptr_t) SCARG(p, uaddr2); /* int * */
+               iarg[5] = SCARG(p, val2); /* int */
+               iarg[6] = SCARG(p, val3); /* int */
+               *n_args = 7;
+               break;
+       }
+       /* sys___futex_set_robust_list */
+       case 488: {
+               const struct sys___futex_set_robust_list_args *p = params;
+               uarg[0] = (intptr_t) SCARG(p, head); /* void * */
+               uarg[1] = SCARG(p, len); /* size_t */
+               *n_args = 2;
+               break;
+       }
+       /* sys___futex_get_robust_list */
+       case 489: {
+               const struct sys___futex_get_robust_list_args *p = params;
+               iarg[0] = SCARG(p, lwpid); /* lwpid_t */
+               uarg[1] = (intptr_t) SCARG(p, headp); /* void ** */
+               uarg[2] = (intptr_t) SCARG(p, lenp); /* size_t * */
+               *n_args = 3;
+               break;
+       }
        default:
                *n_args = 0;
                break;
@@ -9979,6 +10009,63 @@
                        break;
                };
                break;
+       /* sys___futex */
+       case 487:
+               switch(ndx) {
+               case 0:
+                       p = "int *";
+                       break;
+               case 1:
+                       p = "int";
+                       break;
+               case 2:
+                       p = "int";
+                       break;
+               case 3:
+                       p = "const struct timespec *";
+                       break;
+               case 4:
+                       p = "int *";
+                       break;
+               case 5:
+                       p = "int";
+                       break;
+               case 6:
+                       p = "int";
+                       break;
+               default:
+                       break;
+               };
+               break;
+       /* sys___futex_set_robust_list */
+       case 488:
+               switch(ndx) {
+               case 0:
+                       p = "void *";
+                       break;
+               case 1:
+                       p = "size_t";
+                       break;
+               default:
+                       break;
+               };
+               break;
+       /* sys___futex_get_robust_list */
+       case 489:
+               switch(ndx) {
+               case 0:
+                       p = "lwpid_t";
+                       break;
+               case 1:
+                       p = "void **";
+                       break;
+               case 2:
+                       p = "size_t *";
+                       break;
+               default:
+                       break;
+               };
+               break;
        default:
                break;
        };
@@ -12076,6 +12163,21 @@
                if (ndx == 0 || ndx == 1)
                        p = "int";
                break;
+       /* sys___futex */
+       case 487:
+               if (ndx == 0 || ndx == 1)
+                       p = "int";
+               break;
+       /* sys___futex_set_robust_list */
+       case 488:
+               if (ndx == 0 || ndx == 1)
+                       p = "int";
+               break;
+       /* sys___futex_get_robust_list */
+       case 489:
+               if (ndx == 0 || ndx == 1)
+                       p = "int";
+               break;
        default:
                break;
        };
diff -r 673ba7725ccb -r 19c6a542e7cb sys/rump/include/rump/rump_syscalls.h
--- a/sys/rump/include/rump/rump_syscalls.h     Sun Apr 26 18:56:49 2020 +0000
+++ b/sys/rump/include/rump/rump_syscalls.h     Sun Apr 26 18:59:47 2020 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.116 2020/04/25 15:42:15 bouyer Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.117 2020/04/26 18:59:48 thorpej Exp $ */
 
 /*
  * System call protos in rump namespace.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp
+ * created from        NetBSD: syscalls.master,v 1.303 2020/04/26 18:53:33 thorpej Exp
  */
 
 #ifndef _RUMP_RUMP_SYSCALLS_H_
diff -r 673ba7725ccb -r 19c6a542e7cb sys/rump/librump/rumpkern/rump_syscalls.c
--- a/sys/rump/librump/rumpkern/rump_syscalls.c Sun Apr 26 18:56:49 2020 +0000
+++ b/sys/rump/librump/rumpkern/rump_syscalls.c Sun Apr 26 18:59:47 2020 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.147 2020/04/25 15:42:15 bouyer Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.148 2020/04/26 18:59:48 thorpej Exp $ */
 
 /*
  * System call vector and marshalling for rump.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp
+ * created from        NetBSD: syscalls.master,v 1.303 2020/04/26 18:53:33 thorpej Exp
  */
 
 #ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
 
 #ifdef __NetBSD__
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.147 2020/04/25 15:42:15 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.148 2020/04/26 18:59:48 thorpej Exp $");
 
 #include <sys/fstypes.h>
 #include <sys/proc.h>
@@ -8448,17 +8448,14 @@
                .sy_call = (sy_call_t *)(void *)rumpns_enosys,
        },              /* 486 = __fhstatvfs190 */
        {
-               .sy_flags = SYCALL_NOSYS,
-               .sy_call = (sy_call_t *)(void *)rumpns_enosys,
-       },              /* 487 = filler */
-       {
-               .sy_flags = SYCALL_NOSYS,



Home | Main Index | Thread Index | Old Index