Source-Changes-HG archive

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

[src/trunk]: src/sys Regen for futex call relocation.



details:   https://anonhg.NetBSD.org/src/rev/446cdc363648
branches:  trunk
changeset: 1009559:446cdc363648
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Apr 26 19:16:35 2020 +0000

description:
Regen for futex call relocation.

diffstat:

 sys/kern/init_sysent.c                    |   50 +++---
 sys/kern/syscalls.c                       |   30 ++--
 sys/kern/syscalls_autoload.c              |    6 +-
 sys/kern/systrace_args.c                  |  206 +++++++++++++++---------------
 sys/rump/include/rump/rump_syscalls.h     |    4 +-
 sys/rump/librump/rumpkern/rump_syscalls.c |   44 +++---
 sys/sys/syscall.h                         |   24 +-
 sys/sys/syscallargs.h                     |   76 +++++-----
 8 files changed, 220 insertions(+), 220 deletions(-)

diffs (truncated from 685 to 300 lines):

diff -r 9a944b4b3497 -r 446cdc363648 sys/kern/init_sysent.c
--- a/sys/kern/init_sysent.c    Sun Apr 26 19:15:55 2020 +0000
+++ b/sys/kern/init_sysent.c    Sun Apr 26 19:16:35 2020 +0000
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.330 2020/04/26 18:59:47 thorpej Exp $ */
+/* $NetBSD: init_sysent.c,v 1.331 2020/04/26 19:16:36 thorpej Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.303 2020/04/26 18:53:33 thorpej Exp
+ * created from        NetBSD: syscalls.master,v 1.304 2020/04/26 19:15:55 thorpej Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.330 2020/04/26 18:59:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.331 2020/04/26 19:16:36 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
@@ -857,14 +857,20 @@
                .sy_call = (sy_call_t *)sys_sysarch
        },              /* 165 = sysarch */
        {
-               .sy_call = sys_nosys,
-       },              /* 166 = filler */
-       {
-               .sy_call = sys_nosys,
-       },              /* 167 = filler */
-       {
-               .sy_call = sys_nosys,
-       },              /* 168 = filler */
+               ns(struct sys___futex_args),
+               .sy_flags = SYCALL_ARG_PTR,
+               .sy_call = (sy_call_t *)sys___futex
+       },              /* 166 = __futex */
+       {
+               ns(struct sys___futex_set_robust_list_args),
+               .sy_flags = SYCALL_ARG_PTR,
+               .sy_call = (sy_call_t *)sys___futex_set_robust_list
+       },              /* 167 = __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
+       },              /* 168 = __futex_get_robust_list */
 #if !defined(_LP64)
        {
                ns(struct compat_10_sys_semsys_args),
@@ -2359,20 +2365,14 @@
                .sy_call = (sy_call_t *)sys___fhstatvfs190
        },              /* 486 = __fhstatvfs190 */
        {
-               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,
+       },              /* 487 = filler */
+       {
+               .sy_call = sys_nosys,
+       },              /* 488 = filler */
+       {
+               .sy_call = sys_nosys,
+       },              /* 489 = filler */
        {
                .sy_call = sys_nosys,
        },              /* 490 = filler */
diff -r 9a944b4b3497 -r 446cdc363648 sys/kern/syscalls.c
--- a/sys/kern/syscalls.c       Sun Apr 26 19:15:55 2020 +0000
+++ b/sys/kern/syscalls.c       Sun Apr 26 19:16:35 2020 +0000
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.318 2020/04/26 18:59:47 thorpej Exp $ */
+/* $NetBSD: syscalls.c,v 1.319 2020/04/26 19:16:36 thorpej Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.303 2020/04/26 18:53:33 thorpej Exp
+ * created from        NetBSD: syscalls.master,v 1.304 2020/04/26 19:15:55 thorpej Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.318 2020/04/26 18:59:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.319 2020/04/26 19:16:36 thorpej Exp $");
 
 #if defined(_KERNEL_OPT)
 #ifdef _KERNEL_OPT
@@ -195,9 +195,9 @@
        /* 163 */       "compat_09_osetdomainname",
        /* 164 */       "compat_09_ouname",
        /* 165 */       "sysarch",
-       /* 166 */       "#166 (unimplemented)",
-       /* 167 */       "#167 (unimplemented)",
-       /* 168 */       "#168 (unimplemented)",
+       /* 166 */       "__futex",
+       /* 167 */       "__futex_set_robust_list",
+       /* 168 */       "__futex_get_robust_list",
 #if !defined(_LP64)
        /* 169 */       "compat_10_osemsys",
 #else
@@ -536,9 +536,9 @@
        /* 484 */       "__statvfs190",
        /* 485 */       "__fstatvfs190",
        /* 486 */       "__fhstatvfs190",
-       /* 487 */       "__futex",
-       /* 488 */       "__futex_set_robust_list",
-       /* 489 */       "__futex_get_robust_list",
+       /* 487 */       "# filler",
+       /* 488 */       "# filler",
+       /* 489 */       "# filler",
        /* 490 */       "# filler",
        /* 491 */       "# filler",
        /* 492 */       "# filler",
@@ -732,9 +732,9 @@
        /* 163 */       NULL, /* compat_09_osetdomainname */
        /* 164 */       NULL, /* compat_09_ouname */
        /* 165 */       NULL, /* sysarch */
-       /* 166 */       NULL, /* unimplemented */
-       /* 167 */       NULL, /* unimplemented */
-       /* 168 */       NULL, /* unimplemented */
+       /* 166 */       NULL, /* __futex */
+       /* 167 */       NULL, /* __futex_set_robust_list */
+       /* 168 */       NULL, /* __futex_get_robust_list */
 #if !defined(_LP64)
        /* 169 */       NULL, /* compat_10_osemsys */
 #else
@@ -1073,9 +1073,9 @@
        /* 484 */       "statvfs1",
        /* 485 */       "fstatvfs1",
        /* 486 */       "fhstatvfs1",
-       /* 487 */       NULL, /* __futex */
-       /* 488 */       NULL, /* __futex_set_robust_list */
-       /* 489 */       NULL, /* __futex_get_robust_list */
+       /* 487 */       NULL, /* filler */
+       /* 488 */       NULL, /* filler */
+       /* 489 */       NULL, /* filler */
        /* 490 */       NULL, /* filler */
        /* 491 */       NULL, /* filler */
        /* 492 */       NULL, /* filler */
diff -r 9a944b4b3497 -r 446cdc363648 sys/kern/syscalls_autoload.c
--- a/sys/kern/syscalls_autoload.c      Sun Apr 26 19:15:55 2020 +0000
+++ b/sys/kern/syscalls_autoload.c      Sun Apr 26 19:16:35 2020 +0000
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.35 2020/04/26 18:59:47 thorpej Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.36 2020/04/26 19:16:36 thorpej Exp $ */
 
 /*
  * System call autoload table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.303 2020/04/26 18:53:33 thorpej Exp
+ * created from        NetBSD: syscalls.master,v 1.304 2020/04/26 19:15:55 thorpej Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.35 2020/04/26 18:59:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.36 2020/04/26 19:16:36 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
diff -r 9a944b4b3497 -r 446cdc363648 sys/kern/systrace_args.c
--- a/sys/kern/systrace_args.c  Sun Apr 26 19:15:55 2020 +0000
+++ b/sys/kern/systrace_args.c  Sun Apr 26 19:16:35 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.37 2020/04/26 18:59:47 thorpej Exp $ */
+/* $NetBSD: systrace_args.c,v 1.38 2020/04/26 19:16:36 thorpej Exp $ */
 
 /*
  * System call argument to DTrace register array converstion.
@@ -1191,6 +1191,36 @@
                *n_args = 2;
                break;
        }
+       /* sys___futex */
+       case 166: {
+               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 167: {
+               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 168: {
+               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;
+       }
 #if !defined(_LP64)
        /* sys_semsys */
        case 169: {
@@ -3701,36 +3731,6 @@
                *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;
@@ -5643,6 +5643,63 @@
                        break;
                };
                break;
+       /* sys___futex */
+       case 166:
+               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 167:
+               switch(ndx) {
+               case 0:
+                       p = "void *";
+                       break;
+               case 1:
+                       p = "size_t";
+                       break;
+               default:
+                       break;
+               };



Home | Main Index | Thread Index | Old Index