Module Name: src Committed By: martin Date: Sun Jun 21 12:52:40 UTC 2015
Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen (pset_*) To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.113 -r1.114 src/sys/compat/netbsd32/netbsd32_syscalls.c \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.4 -r1.5 src/sys/compat/netbsd32/netbsd32_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/compat/netbsd32/netbsd32_syscall.h diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.114 src/sys/compat/netbsd32/netbsd32_syscall.h:1.115 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.114 Sun Jun 21 08:29:52 2015 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Sun Jun 21 12:52:40 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.114 2015/06/21 08:29:52 martin Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.115 2015/06/21 12:52:40 martin Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.105 2015/06/21 08:28:36 martin Exp + * created from NetBSD: syscalls.master,v 1.107 2015/06/21 12:51:33 martin Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -1098,6 +1098,18 @@ /* syscall: "netbsd32_mremap" ret: "netbsd32_voidp" args: "netbsd32_voidp" "netbsd32_size_t" "netbsd32_voidp" "netbsd32_size_t" "int" */ #define NETBSD32_SYS_netbsd32_mremap 411 +/* syscall: "netbsd32_pset_create" ret: "int" args: "netbsd32_psetidp_t" */ +#define NETBSD32_SYS_netbsd32_pset_create 412 + +/* syscall: "netbsd32_pset_destroy" ret: "int" args: "psetid_t" */ +#define NETBSD32_SYS_netbsd32_pset_destroy 413 + +/* syscall: "netbsd32_pset_assign" ret: "int" args: "psetid_t" "cpuid_t" "netbsd32_psetidp_t" */ +#define NETBSD32_SYS_netbsd32_pset_assign 414 + +/* syscall: "netbsd32__pset_bind" ret: "int" args: "idtype_t" "id_t" "id_t" "psetid_t" "netbsd32_psetidp_t" */ +#define NETBSD32_SYS_netbsd32__pset_bind 415 + /* syscall: "netbsd32___posix_fadvise50" ret: "int" args: "int" "int" "netbsd32_off_t" "netbsd32_off_t" "int" */ #define NETBSD32_SYS_netbsd32___posix_fadvise50 416 Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.114 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.115 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.114 Sun Jun 21 08:29:52 2015 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sun Jun 21 12:52:40 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.114 2015/06/21 08:29:52 martin Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.115 2015/06/21 12:52:40 martin Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.105 2015/06/21 08:28:36 martin Exp + * created from NetBSD: syscalls.master,v 1.107 2015/06/21 12:51:33 martin Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -2130,6 +2130,32 @@ struct netbsd32_mremap_args { }; check_syscall_args(netbsd32_mremap) +struct netbsd32_pset_create_args { + syscallarg(netbsd32_psetidp_t) psid; +}; +check_syscall_args(netbsd32_pset_create) + +struct netbsd32_pset_destroy_args { + syscallarg(psetid_t) psid; +}; +check_syscall_args(netbsd32_pset_destroy) + +struct netbsd32_pset_assign_args { + syscallarg(psetid_t) psid; + syscallarg(cpuid_t) cpuid; + syscallarg(netbsd32_psetidp_t) opsid; +}; +check_syscall_args(netbsd32_pset_assign) + +struct netbsd32__pset_bind_args { + syscallarg(idtype_t) idtype; + syscallarg(id_t) first_id; + syscallarg(id_t) second_id; + syscallarg(psetid_t) psid; + syscallarg(netbsd32_psetidp_t) opsid; +}; +check_syscall_args(netbsd32__pset_bind) + struct netbsd32___posix_fadvise50_args { syscallarg(int) fd; syscallarg(int) PAD; @@ -3293,6 +3319,14 @@ int netbsd32___mount50(struct lwp *, con int netbsd32_mremap(struct lwp *, const struct netbsd32_mremap_args *, register_t *); +int netbsd32_pset_create(struct lwp *, const struct netbsd32_pset_create_args *, register_t *); + +int netbsd32_pset_destroy(struct lwp *, const struct netbsd32_pset_destroy_args *, register_t *); + +int netbsd32_pset_assign(struct lwp *, const struct netbsd32_pset_assign_args *, register_t *); + +int netbsd32__pset_bind(struct lwp *, const struct netbsd32__pset_bind_args *, register_t *); + int netbsd32___posix_fadvise50(struct lwp *, const struct netbsd32___posix_fadvise50_args *, register_t *); int netbsd32___select50(struct lwp *, const struct netbsd32___select50_args *, register_t *); Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.113 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.114 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.113 Sun Jun 21 08:29:52 2015 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sun Jun 21 12:52:40 2015 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.113 2015/06/21 08:29:52 martin Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.114 2015/06/21 12:52:40 martin Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.105 2015/06/21 08:28:36 martin Exp + * created from NetBSD: syscalls.master,v 1.107 2015/06/21 12:51:33 martin Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.113 2015/06/21 08:29:52 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.114 2015/06/21 12:52:40 martin Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -254,7 +254,7 @@ const char *const netbsd32_syscallnames[ /* 207 */ "netbsd32_getpgid", /* 208 */ "netbsd32_reboot", /* 209 */ "netbsd32_poll", - /* 210 */ "#210 (unimplemented)", + /* 210 */ "#210 (unimplemented { int | netbsd32 | | afssys ( long id , long a1 , long a2 , long a3 , long a4 , long a5 , long a6 ) ; })", /* 211 */ "#211 (unimplemented)", /* 212 */ "#212 (unimplemented)", /* 213 */ "#213 (unimplemented)", @@ -418,8 +418,8 @@ const char *const netbsd32_syscallnames[ /* 338 */ "#338 (unimplemented)", /* 339 */ "#339 (unimplemented)", /* 340 */ "netbsd32___sigaction_sigtramp", - /* 341 */ "#341 (unimplemented)", - /* 342 */ "#342 (unimplemented)", + /* 341 */ "#341 (unimplemented { int | netbsd32 | | pmc_get_info ( int ctr , int op , void * args ) ; })", + /* 342 */ "#342 (unimplemented { int | netbsd32 | | pmc_control ( int ctr , int op , void * args ) ; })", /* 343 */ "netbsd32_rasctl", /* 344 */ "kqueue", /* 345 */ "compat_50_netbsd32_kevent", @@ -493,10 +493,10 @@ const char *const netbsd32_syscallnames[ /* 409 */ "#409 (unimplemented)", /* 410 */ "netbsd32___mount50", /* 411 */ "netbsd32_mremap", - /* 412 */ "#412 (unimplemented)", - /* 413 */ "#413 (unimplemented)", - /* 414 */ "#414 (unimplemented)", - /* 415 */ "#415 (unimplemented)", + /* 412 */ "netbsd32_pset_create", + /* 413 */ "netbsd32_pset_destroy", + /* 414 */ "netbsd32_pset_assign", + /* 415 */ "netbsd32__pset_bind", /* 416 */ "netbsd32___posix_fadvise50", /* 417 */ "netbsd32___select50", /* 418 */ "netbsd32___gettimeofday50", Index: src/sys/compat/netbsd32/netbsd32_sysent.c diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.113 src/sys/compat/netbsd32/netbsd32_sysent.c:1.114 --- src/sys/compat/netbsd32/netbsd32_sysent.c:1.113 Sun Jun 21 08:29:52 2015 +++ src/sys/compat/netbsd32/netbsd32_sysent.c Sun Jun 21 12:52:40 2015 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_sysent.c,v 1.113 2015/06/21 08:29:52 martin Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.114 2015/06/21 12:52:40 martin Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.105 2015/06/21 08:28:36 martin Exp + * created from NetBSD: syscalls.master,v 1.107 2015/06/21 12:51:33 martin Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.113 2015/06/21 08:29:52 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.114 2015/06/21 12:52:40 martin Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -1765,17 +1765,21 @@ struct sysent netbsd32_sysent[] = { .sy_call = (sy_call_t *)netbsd32_mremap }, /* 411 = netbsd32_mremap */ { - .sy_call = sys_nosys, - }, /* 412 = filler */ - { - .sy_call = sys_nosys, - }, /* 413 = filler */ - { - .sy_call = sys_nosys, - }, /* 414 = filler */ - { - .sy_call = sys_nosys, - }, /* 415 = filler */ + ns(struct netbsd32_pset_create_args), + .sy_call = (sy_call_t *)netbsd32_pset_create + }, /* 412 = netbsd32_pset_create */ + { + ns(struct netbsd32_pset_destroy_args), + .sy_call = (sy_call_t *)netbsd32_pset_destroy + }, /* 413 = netbsd32_pset_destroy */ + { + ns(struct netbsd32_pset_assign_args), + .sy_call = (sy_call_t *)netbsd32_pset_assign + }, /* 414 = netbsd32_pset_assign */ + { + ns(struct netbsd32__pset_bind_args), + .sy_call = (sy_call_t *)netbsd32__pset_bind + }, /* 415 = netbsd32__pset_bind */ { ns(struct netbsd32___posix_fadvise50_args), .sy_call = (sy_call_t *)netbsd32___posix_fadvise50 Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.4 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.5 --- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.4 Sun Jun 21 08:29:52 2015 +++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Sun Jun 21 12:52:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_systrace_args.c,v 1.4 2015/06/21 08:29:52 martin Exp $ */ +/* $NetBSD: netbsd32_systrace_args.c,v 1.5 2015/06/21 12:52:40 martin Exp $ */ /* * System call argument to DTrace register array converstion. @@ -2865,6 +2865,40 @@ systrace_args(register_t sysnum, const v *n_args = 5; break; } + /* netbsd32_pset_create */ + case 412: { + struct netbsd32_pset_create_args *p = params; + uarg[0] = (intptr_t) SCARG(p, psid).i32; /* netbsd32_psetidp_t */ + *n_args = 1; + break; + } + /* netbsd32_pset_destroy */ + case 413: { + struct netbsd32_pset_destroy_args *p = params; + iarg[0] = SCARG(p, psid); /* psetid_t */ + *n_args = 1; + break; + } + /* netbsd32_pset_assign */ + case 414: { + struct netbsd32_pset_assign_args *p = params; + iarg[0] = SCARG(p, psid); /* psetid_t */ + iarg[1] = SCARG(p, cpuid); /* cpuid_t */ + uarg[2] = (intptr_t) SCARG(p, opsid).i32; /* netbsd32_psetidp_t */ + *n_args = 3; + break; + } + /* netbsd32__pset_bind */ + case 415: { + struct netbsd32__pset_bind_args *p = params; + iarg[0] = SCARG(p, idtype); /* idtype_t */ + iarg[1] = SCARG(p, first_id); /* id_t */ + iarg[2] = SCARG(p, second_id); /* id_t */ + iarg[3] = SCARG(p, psid); /* psetid_t */ + uarg[4] = (intptr_t) SCARG(p, opsid).i32; /* netbsd32_psetidp_t */ + *n_args = 5; + break; + } /* netbsd32___posix_fadvise50 */ case 416: { struct netbsd32___posix_fadvise50_args *p = params; @@ -8207,6 +8241,64 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* netbsd32_pset_create */ + case 412: + switch(ndx) { + case 0: + p = "netbsd32_psetidp_t"; + break; + default: + break; + }; + break; + /* netbsd32_pset_destroy */ + case 413: + switch(ndx) { + case 0: + p = "psetid_t"; + break; + default: + break; + }; + break; + /* netbsd32_pset_assign */ + case 414: + switch(ndx) { + case 0: + p = "psetid_t"; + break; + case 1: + p = "cpuid_t"; + break; + case 2: + p = "netbsd32_psetidp_t"; + break; + default: + break; + }; + break; + /* netbsd32__pset_bind */ + case 415: + switch(ndx) { + case 0: + p = "idtype_t"; + break; + case 1: + p = "id_t"; + break; + case 2: + p = "id_t"; + break; + case 3: + p = "psetid_t"; + break; + case 4: + p = "netbsd32_psetidp_t"; + break; + default: + break; + }; + break; /* netbsd32___posix_fadvise50 */ case 416: switch(ndx) { @@ -10890,6 +10982,26 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "netbsd32_voidp"; break; + /* netbsd32_pset_create */ + case 412: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* netbsd32_pset_destroy */ + case 413: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* netbsd32_pset_assign */ + case 414: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* netbsd32__pset_bind */ + case 415: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* netbsd32___posix_fadvise50 */ case 416: if (ndx == 0 || ndx == 1)