re: CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
OK, things are more sane now. I reverted this change, since it was totally unnecessary. I need to get more sleep before doing some of these things. :) Thanks for keeping me honest! On Thu, 24 Jan 2019, Paul Goyette wrote: Just for sanity's sake, I will take another look at this change and see if there's another way to handle it. On Thu, 24 Jan 2019, Paul Goyette wrote: On Thu, 24 Jan 2019, matthew green wrote: Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:24:52 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: Use the hook to get the value of machine32 hm. why does the module need to use the hook? doesn't it know the value internally, since it has to publish it via the hook? i don't understand the value of using hooks inside the publisher. they are useful for external consumers, i thought. In this case the symbol is defined as __weak and might not exist. So we use a hook function to return a value if the hook has been set, or a default value if the hook has not been set. The hook's struct itself is always present/allocated. I suppose I could have avoided the hook by simply having another machine32_ptr variable, rather than a hook function. But I wasn't totally clear on whether there were any race conditions during a module unload which could result in retrieving a pointer to a value which just got removed from memory. Of course, if we had a reasonable way of dealing with weak symbols, this mess would not be needed. +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++ +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++ +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Jan 25 10:13:07 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: Revert previous change(s). There's no good reason to use the hook when the required value is available locally (in the current module). Thanks mrg@ for pointing this out. To generate a diff of this commit: cvs rdiff -u -r1.38.2.5 -r1.38.2.6 src/sys/compat/netbsd32/netbsd32_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Jan 25 10:13:07 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: Revert previous change(s). There's no good reason to use the hook when the required value is available locally (in the current module). Thanks mrg@ for pointing this out. To generate a diff of this commit: cvs rdiff -u -r1.38.2.5 -r1.38.2.6 src/sys/compat/netbsd32/netbsd32_sysctl.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_sysctl.c diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.5 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.6 --- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.5 Thu Jan 24 04:32:41 2019 +++ src/sys/compat/netbsd32/netbsd32_sysctl.c Fri Jan 25 10:13:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.5 2019/01/24 04:32:41 pgoyette Exp $ */ +/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.6 2019/01/25 10:13:07 pgoyette Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.5 2019/01/24 04:32:41 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.6 2019/01/25 10:13:07 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys #include #include #include -#include #include @@ -123,7 +122,7 @@ void netbsd32_sysctl_init(void) { const struct sysctlnode *_root = _sysctl_root; - const char *m; + extern const char machine32[]; sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT, @@ -171,11 +170,10 @@ netbsd32_sysctl_init(void) CTLTYPE_INT, "alignbytes", NULL, NULL, ALIGNBYTES32, NULL, 0, CTL_HW, HW_ALIGNBYTES, CTL_EOL); - MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m); sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT, CTLTYPE_STRING, "machine", NULL, - NULL, 0, __UNCONST(m), 0, + NULL, 0, __UNCONST(), 0, CTL_HW, HW_MACHINE, CTL_EOL); sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT|CTLFLAG_READONLY,
re: CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Just for sanity's sake, I will take another look at this change and see if there's another way to handle it. On Thu, 24 Jan 2019, Paul Goyette wrote: On Thu, 24 Jan 2019, matthew green wrote: Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:24:52 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: Use the hook to get the value of machine32 hm. why does the module need to use the hook? doesn't it know the value internally, since it has to publish it via the hook? i don't understand the value of using hooks inside the publisher. they are useful for external consumers, i thought. In this case the symbol is defined as __weak and might not exist. So we use a hook function to return a value if the hook has been set, or a default value if the hook has not been set. The hook's struct itself is always present/allocated. I suppose I could have avoided the hook by simply having another machine32_ptr variable, rather than a hook function. But I wasn't totally clear on whether there were any race conditions during a module unload which could result in retrieving a pointer to a value which just got removed from memory. Of course, if we had a reasonable way of dealing with weak symbols, this mess would not be needed. +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++ +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++
re: CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
On Thu, 24 Jan 2019, matthew green wrote: Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:24:52 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: Use the hook to get the value of machine32 hm. why does the module need to use the hook? doesn't it know the value internally, since it has to publish it via the hook? i don't understand the value of using hooks inside the publisher. they are useful for external consumers, i thought. In this case the symbol is defined as __weak and might not exist. So we use a hook function to return a value if the hook has been set, or a default value if the hook has not been set. The hook's struct itself is always present/allocated. I suppose I could have avoided the hook by simply having another machine32_ptr variable, rather than a hook function. But I wasn't totally clear on whether there were any race conditions during a module unload which could result in retrieving a pointer to a value which just got removed from memory. Of course, if we had a reasonable way of dealing with weak symbols, this mess would not be needed. +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++
re: CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
> Module Name: src > Committed By: pgoyette > Date: Thu Jan 24 04:24:52 UTC 2019 > > Modified Files: > src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c > > Log Message: > Use the hook to get the value of machine32 hm. why does the module need to use the hook? doesn't it know the value internally, since it has to publish it via the hook? i don't understand the value of using hooks inside the publisher. they are useful for external consumers, i thought. .mrg.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:32:41 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: I must be getting tired - use the correct name of the hook To generate a diff of this commit: cvs rdiff -u -r1.38.2.4 -r1.38.2.5 src/sys/compat/netbsd32/netbsd32_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:32:41 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: I must be getting tired - use the correct name of the hook To generate a diff of this commit: cvs rdiff -u -r1.38.2.4 -r1.38.2.5 src/sys/compat/netbsd32/netbsd32_sysctl.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_sysctl.c diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.4 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.5 --- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.4 Thu Jan 24 04:31:19 2019 +++ src/sys/compat/netbsd32/netbsd32_sysctl.c Thu Jan 24 04:32:41 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.4 2019/01/24 04:31:19 pgoyette Exp $ */ +/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.5 2019/01/24 04:32:41 pgoyette Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.4 2019/01/24 04:31:19 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.5 2019/01/24 04:32:41 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -171,7 +171,7 @@ netbsd32_sysctl_init(void) CTLTYPE_INT, "alignbytes", NULL, NULL, ALIGNBYTES32, NULL, 0, CTL_HW, HW_ALIGNBYTES, CTL_EOL); - MODULE_CALL_HOOK(netbsd32_machine_32_hook, (), machine, m); + MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m); sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT, CTLTYPE_STRING, "machine", NULL,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:31:19 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: I wrote this stuff, when will I ever learn to use MODULE_CALL_HOOK instead of MODULE_HOOK_CALL ? :) To generate a diff of this commit: cvs rdiff -u -r1.38.2.3 -r1.38.2.4 src/sys/compat/netbsd32/netbsd32_sysctl.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_sysctl.c diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.3 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.4 --- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.3 Thu Jan 24 04:24:52 2019 +++ src/sys/compat/netbsd32/netbsd32_sysctl.c Thu Jan 24 04:31:19 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.3 2019/01/24 04:24:52 pgoyette Exp $ */ +/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.4 2019/01/24 04:31:19 pgoyette Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.3 2019/01/24 04:24:52 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.4 2019/01/24 04:31:19 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -171,7 +171,7 @@ netbsd32_sysctl_init(void) CTLTYPE_INT, "alignbytes", NULL, NULL, ALIGNBYTES32, NULL, 0, CTL_HW, HW_ALIGNBYTES, CTL_EOL); - MODULE_HOOK_CALL(netbsd32_machine_32_hook, (), machine, m); + MODULE_CALL_HOOK(netbsd32_machine_32_hook, (), machine, m); sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT, CTLTYPE_STRING, "machine", NULL,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:31:19 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: I wrote this stuff, when will I ever learn to use MODULE_CALL_HOOK instead of MODULE_HOOK_CALL ? :) To generate a diff of this commit: cvs rdiff -u -r1.38.2.3 -r1.38.2.4 src/sys/compat/netbsd32/netbsd32_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:24:52 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: Use the hook to get the value of machine32 To generate a diff of this commit: cvs rdiff -u -r1.38.2.2 -r1.38.2.3 src/sys/compat/netbsd32/netbsd32_sysctl.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_sysctl.c diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.2 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.3 --- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.2 Thu Jan 24 03:41:48 2019 +++ src/sys/compat/netbsd32/netbsd32_sysctl.c Thu Jan 24 04:24:52 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.2 2019/01/24 03:41:48 pgoyette Exp $ */ +/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.3 2019/01/24 04:24:52 pgoyette Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.2 2019/01/24 03:41:48 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.3 2019/01/24 04:24:52 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -171,6 +171,7 @@ netbsd32_sysctl_init(void) CTLTYPE_INT, "alignbytes", NULL, NULL, ALIGNBYTES32, NULL, 0, CTL_HW, HW_ALIGNBYTES, CTL_EOL); + MODULE_HOOK_CALL(netbsd32_machine_32_hook, (), machine, m); sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT, CTLTYPE_STRING, "machine", NULL,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:24:52 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: Use the hook to get the value of machine32 To generate a diff of this commit: cvs rdiff -u -r1.38.2.2 -r1.38.2.3 src/sys/compat/netbsd32/netbsd32_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:16:03 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_exec_elf32.c Log Message: Use correct macro name To generate a diff of this commit: cvs rdiff -u -r1.40.14.1 -r1.40.14.2 \ src/sys/compat/netbsd32/netbsd32_exec_elf32.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_exec_elf32.c diff -u src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40.14.1 src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40.14.2 --- src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40.14.1 Thu Jan 24 03:41:48 2019 +++ src/sys/compat/netbsd32/netbsd32_exec_elf32.c Thu Jan 24 04:16:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_exec_elf32.c,v 1.40.14.1 2019/01/24 03:41:48 pgoyette Exp $ */ +/* $NetBSD: netbsd32_exec_elf32.c,v 1.40.14.2 2019/01/24 04:16:03 pgoyette Exp $ */ /* from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */ /* @@ -57,7 +57,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.40.14.1 2019/01/24 03:41:48 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.40.14.2 2019/01/24 04:16:03 pgoyette Exp $"); #define ELFSIZE 32 @@ -112,7 +112,7 @@ ELFNAME2(netbsd32,probe_noteless)(struct const char *m; if (itp && epp->ep_interp == NULL) { - MODULE_HOOK_CALL(netbsd32_machine32_hook, (), machine, m); + MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m); (void)compat_elf_check_interp(epp, itp, m); } #ifdef _LP64
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:16:03 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_exec_elf32.c Log Message: Use correct macro name To generate a diff of this commit: cvs rdiff -u -r1.40.14.1 -r1.40.14.2 \ src/sys/compat/netbsd32/netbsd32_exec_elf32.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 03:41:48 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_exec_elf32.c netbsd32_sysctl.c Log Message: Found a couple other consumers of machine32 - adapt them to use the hook To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.14.1 src/sys/compat/netbsd32/netbsd32_exec_elf32.c cvs rdiff -u -r1.38.2.1 -r1.38.2.2 src/sys/compat/netbsd32/netbsd32_sysctl.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_exec_elf32.c diff -u src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40 src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40.14.1 --- src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40 Sat Aug 6 15:13:13 2016 +++ src/sys/compat/netbsd32/netbsd32_exec_elf32.c Thu Jan 24 03:41:48 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_exec_elf32.c,v 1.40 2016/08/06 15:13:13 maxv Exp $ */ +/* $NetBSD: netbsd32_exec_elf32.c,v 1.40.14.1 2019/01/24 03:41:48 pgoyette Exp $ */ /* from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */ /* @@ -57,7 +57,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.40 2016/08/06 15:13:13 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.40.14.1 2019/01/24 03:41:48 pgoyette Exp $"); #define ELFSIZE 32 @@ -72,6 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_exe #include #include #include +#include #include @@ -108,9 +109,11 @@ int ELFNAME2(netbsd32,probe_noteless)(struct lwp *l, struct exec_package *epp, void *eh, char *itp, vaddr_t *pos) { + const char *m; + if (itp && epp->ep_interp == NULL) { - extern const char machine32[]; - (void)compat_elf_check_interp(epp, itp, machine32); + MODULE_HOOK_CALL(netbsd32_machine32_hook, (), machine, m); + (void)compat_elf_check_interp(epp, itp, m); } #ifdef _LP64 epp->ep_flags |= EXEC_32 | EXEC_FORCEAUX; Index: src/sys/compat/netbsd32/netbsd32_sysctl.c diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.1 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.2 --- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.1 Mon Jun 25 07:25:48 2018 +++ src/sys/compat/netbsd32/netbsd32_sysctl.c Thu Jan 24 03:41:48 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.1 2018/06/25 07:25:48 pgoyette Exp $ */ +/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.2 2019/01/24 03:41:48 pgoyette Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.1 2018/06/25 07:25:48 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.2 2019/01/24 03:41:48 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys #include #include #include +#include #include @@ -122,7 +123,7 @@ void netbsd32_sysctl_init(void) { const struct sysctlnode *_root = _sysctl_root; - extern const char machine32[]; + const char *m; sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT, @@ -173,7 +174,7 @@ netbsd32_sysctl_init(void) sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT, CTLTYPE_STRING, "machine", NULL, - NULL, 0, __UNCONST(), 0, + NULL, 0, __UNCONST(m), 0, CTL_HW, HW_MACHINE, CTL_EOL); sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT|CTLFLAG_READONLY,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 03:41:48 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_exec_elf32.c netbsd32_sysctl.c Log Message: Found a couple other consumers of machine32 - adapt them to use the hook To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.14.1 src/sys/compat/netbsd32/netbsd32_exec_elf32.c cvs rdiff -u -r1.38.2.1 -r1.38.2.2 src/sys/compat/netbsd32/netbsd32_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Jan 9 10:38:22 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen - otherwise compat_40_mount() is wrongly included in sysent.c Missed this during earlier conflict resolution. To generate a diff of this commit: cvs rdiff -u -r1.134.2.17 -r1.134.2.18 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.16 -r1.134.2.17 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.17 -r1.132.2.18 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.16 -r1.13.2.17 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.16 -r1.132.2.17 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.15 -r1.24.2.16 \ 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.134.2.17 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.18 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.17 Wed Dec 26 14:01:46 2018 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Jan 9 10:38:21 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.134.2.17 2018/12/26 14:01:46 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.134.2.18 2019/01/09 10:38:21 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp + * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.16 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.17 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.16 Wed Dec 26 14:01:46 2018 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Jan 9 10:38:21 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.16 2018/12/26 14:01:46 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.17 2019/01/09 10:38:21 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp + * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.17 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.18 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.17 Wed Dec 26 14:01:46 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Jan 9 10:38:21 2019 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.17 2018/12/26 14:01:46 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.18 2019/01/09 10:38:21 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp + * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.17 2018/12/26 14:01:46 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.18 2019/01/09 10:38:21 pgoyette Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.16 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.17 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.16 Wed Dec 26 14:01:46 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed Jan 9 10:38:21 2019 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.16 2018/12/26 14:01:46 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.17 2019/01/09 10:38:21 pgoyette Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp + * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.16 2018/12/26 14:01:46 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.17 2019/01/09 10:38:21 pgoyette Exp $"); #include static struct sc_autoload netbsd32_syscalls_autoload[] = { Index:
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Jan 9 10:38:22 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen - otherwise compat_40_mount() is wrongly included in sysent.c Missed this during earlier conflict resolution. To generate a diff of this commit: cvs rdiff -u -r1.134.2.17 -r1.134.2.18 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.16 -r1.134.2.17 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.17 -r1.132.2.18 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.16 -r1.13.2.17 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.16 -r1.132.2.17 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.15 -r1.24.2.16 \ 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.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Jan 5 02:49:16 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_conv.h Log Message: Fix typo in previous To generate a diff of this commit: cvs rdiff -u -r1.33.2.4 -r1.33.2.5 src/sys/compat/netbsd32/netbsd32_conv.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Jan 5 02:49:16 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_conv.h Log Message: Fix typo in previous To generate a diff of this commit: cvs rdiff -u -r1.33.2.4 -r1.33.2.5 src/sys/compat/netbsd32/netbsd32_conv.h 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_conv.h diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.4 src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.5 --- src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.4 Thu Jan 3 10:57:32 2019 +++ src/sys/compat/netbsd32/netbsd32_conv.h Sat Jan 5 02:49:15 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_conv.h,v 1.33.2.4 2019/01/03 10:57:32 pgoyette Exp $ */ +/* $NetBSD: netbsd32_conv.h,v 1.33.2.5 2019/01/05 02:49:15 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -555,7 +555,7 @@ netbsd32_from_msqid_ds50(const struct ms struct netbsd32_msqid_ds50 *ds32p) { - nemset(ds32p, 0, sizeof(*ds32p)); + memset(ds32p, 0, sizeof(*ds32p)); netbsd32_from_ipc_perm(>msg_perm, >msg_perm); ds32p->_msg_cbytes = (netbsd32_u_long)dsp->_msg_cbytes; ds32p->msg_qnum = (netbsd32_u_long)dsp->msg_qnum;
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Oct 3 11:59:21 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_09.c netbsd32_compat_12.c netbsd32_compat_13.c netbsd32_compat_16.c netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_40.c netbsd32_compat_50.c netbsd32_compat_60.c Log Message: Normalize the required lists. Each compat_netbsd32_xx needs the non-32bit module of the same version _and_ the 32-bit module for the next higher version. To generate a diff of this commit: cvs rdiff -u -r1.18.86.5 -r1.18.86.6 \ src/sys/compat/netbsd32/netbsd32_compat_09.c cvs rdiff -u -r1.33.36.8 -r1.33.36.9 \ src/sys/compat/netbsd32/netbsd32_compat_12.c cvs rdiff -u -r1.26.28.8 -r1.26.28.9 \ src/sys/compat/netbsd32/netbsd32_compat_13.c cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/compat/netbsd32/netbsd32_compat_16.c cvs rdiff -u -r1.36.10.9 -r1.36.10.10 \ src/sys/compat/netbsd32/netbsd32_compat_20.c cvs rdiff -u -r1.31.16.12 -r1.31.16.13 \ src/sys/compat/netbsd32/netbsd32_compat_30.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/netbsd32/netbsd32_compat_40.c cvs rdiff -u -r1.32.16.11 -r1.32.16.12 \ src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.3.2.8 -r1.3.2.9 src/sys/compat/netbsd32/netbsd32_compat_60.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_compat_09.c diff -u src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.5 src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.6 --- src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.5 Tue Sep 11 21:18:32 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_09.c Wed Oct 3 11:59:21 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.5 2018/09/11 21:18:32 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.6 2018/10/03 11:59:21 pgoyette Exp $ */ /* * Copyright (c) 1998 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.5 2018/09/11 21:18:32 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.6 2018/10/03 11:59:21 pgoyette Exp $"); #include #include @@ -100,7 +100,7 @@ static struct syscall_package compat_net { 0, 0, NULL } }; -MODULE(MODULE_CLASS_EXEC, compat_netbsd32_09, "compat_netbsd32,compat_09"); +MODULE(MODULE_CLASS_EXEC, compat_netbsd32_09, "compat_netbsd32_12,compat_09"); static int compat_netbsd32_09_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/netbsd32/netbsd32_compat_12.c diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.8 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.9 --- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.8 Wed Oct 3 07:03:17 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_12.c Wed Oct 3 11:59:21 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.8 2018/10/03 07:03:17 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.9 2018/10/03 11:59:21 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.8 2018/10/03 07:03:17 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.9 2018/10/03 11:59:21 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -229,8 +229,7 @@ static struct syscall_package compat_net { 0, 0, NULL } }; -MODULE(MODULE_CLASS_EXEC, compat_netbsd32_12, -"compat_netbsd32,compat_netbsd32_13,compat_12"); +MODULE(MODULE_CLASS_EXEC, compat_netbsd32_12, "compat_netbsd32_13,compat_12"); static int compat_netbsd32_12_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/netbsd32/netbsd32_compat_13.c diff -u src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.8 src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.9 --- src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.8 Sat Sep 29 07:52:39 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_13.c Wed Oct 3 11:59:21 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.8 2018/09/29 07:52:39 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.9 2018/10/03 11:59:21 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.8 2018/09/29 07:52:39 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.9 2018/10/03 11:59:21 pgoyette Exp $"); #include #include @@ -104,8 +104,7 @@ static struct syscall_package compat_net { 0, 0, NULL } }; -MODULE(MODULE_CLASS_EXEC, compat_netbsd32_13, -"compat_netbsd32,compat_13,compat_netbsd32_16"); +MODULE(MODULE_CLASS_EXEC, compat_netbsd32_13, "compat_13,compat_netbsd32_16"); static int compat_netbsd32_13_modcmd(modcmd_t cmd, void *arg) Index:
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Oct 3 11:59:21 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_09.c netbsd32_compat_12.c netbsd32_compat_13.c netbsd32_compat_16.c netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_40.c netbsd32_compat_50.c netbsd32_compat_60.c Log Message: Normalize the required lists. Each compat_netbsd32_xx needs the non-32bit module of the same version _and_ the 32-bit module for the next higher version. To generate a diff of this commit: cvs rdiff -u -r1.18.86.5 -r1.18.86.6 \ src/sys/compat/netbsd32/netbsd32_compat_09.c cvs rdiff -u -r1.33.36.8 -r1.33.36.9 \ src/sys/compat/netbsd32/netbsd32_compat_12.c cvs rdiff -u -r1.26.28.8 -r1.26.28.9 \ src/sys/compat/netbsd32/netbsd32_compat_13.c cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/compat/netbsd32/netbsd32_compat_16.c cvs rdiff -u -r1.36.10.9 -r1.36.10.10 \ src/sys/compat/netbsd32/netbsd32_compat_20.c cvs rdiff -u -r1.31.16.12 -r1.31.16.13 \ src/sys/compat/netbsd32/netbsd32_compat_30.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/netbsd32/netbsd32_compat_40.c cvs rdiff -u -r1.32.16.11 -r1.32.16.12 \ src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.3.2.8 -r1.3.2.9 src/sys/compat/netbsd32/netbsd32_compat_60.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Oct 3 07:03:17 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_12.c netbsd32_compat_16.c netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_40.c netbsd32_compat_50.c netbsd32_compat_60.c Log Message: Make sure that each version-specific compat_netbsd32_xx module depends on all higher-version-specific modules, similar to the non-32bit compat_xx modules. To generate a diff of this commit: cvs rdiff -u -r1.33.36.7 -r1.33.36.8 \ src/sys/compat/netbsd32/netbsd32_compat_12.c cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/netbsd32/netbsd32_compat_16.c cvs rdiff -u -r1.36.10.8 -r1.36.10.9 \ src/sys/compat/netbsd32/netbsd32_compat_20.c cvs rdiff -u -r1.31.16.11 -r1.31.16.12 \ src/sys/compat/netbsd32/netbsd32_compat_30.c cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/netbsd32/netbsd32_compat_40.c cvs rdiff -u -r1.32.16.10 -r1.32.16.11 \ src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.3.2.7 -r1.3.2.8 src/sys/compat/netbsd32/netbsd32_compat_60.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Oct 3 07:03:17 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_12.c netbsd32_compat_16.c netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_40.c netbsd32_compat_50.c netbsd32_compat_60.c Log Message: Make sure that each version-specific compat_netbsd32_xx module depends on all higher-version-specific modules, similar to the non-32bit compat_xx modules. To generate a diff of this commit: cvs rdiff -u -r1.33.36.7 -r1.33.36.8 \ src/sys/compat/netbsd32/netbsd32_compat_12.c cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/netbsd32/netbsd32_compat_16.c cvs rdiff -u -r1.36.10.8 -r1.36.10.9 \ src/sys/compat/netbsd32/netbsd32_compat_20.c cvs rdiff -u -r1.31.16.11 -r1.31.16.12 \ src/sys/compat/netbsd32/netbsd32_compat_30.c cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/netbsd32/netbsd32_compat_40.c cvs rdiff -u -r1.32.16.10 -r1.32.16.11 \ src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.3.2.7 -r1.3.2.8 src/sys/compat/netbsd32/netbsd32_compat_60.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_compat_12.c diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.7 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.8 --- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.7 Tue Sep 11 21:18:32 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_12.c Wed Oct 3 07:03:17 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.7 2018/09/11 21:18:32 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.8 2018/10/03 07:03:17 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.7 2018/09/11 21:18:32 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.8 2018/10/03 07:03:17 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -229,7 +229,8 @@ static struct syscall_package compat_net { 0, 0, NULL } }; -MODULE(MODULE_CLASS_EXEC, compat_netbsd32_12, "compat_netbsd32,compat_12"); +MODULE(MODULE_CLASS_EXEC, compat_netbsd32_12, +"compat_netbsd32,compat_netbsd32_13,compat_12"); static int compat_netbsd32_12_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/netbsd32/netbsd32_compat_16.c diff -u src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.3 src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.4 --- src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.3 Fri Sep 14 08:38:37 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_16.c Wed Oct 3 07:03:17 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_16.c,v 1.1.2.3 2018/09/14 08:38:37 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_16.c,v 1.1.2.4 2018/10/03 07:03:17 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_16.c,v 1.1.2.3 2018/09/14 08:38:37 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_16.c,v 1.1.2.4 2018/10/03 07:03:17 pgoyette Exp $"); #include #include @@ -53,7 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com struct uvm_object *emul_netbsd32_object; -MODULE(MODULE_CLASS_EXEC, compat_netbsd32_16, "compat_netbsd32,compat_16"); +MODULE(MODULE_CLASS_EXEC, compat_netbsd32_16, +"compat_netbsd32,compat_netbsd32_20,compat_16"); static int compat_netbsd32_16_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/netbsd32/netbsd32_compat_20.c diff -u src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.8 src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.9 --- src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.8 Tue Sep 11 21:18:32 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_20.c Wed Oct 3 07:03:17 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.8 2018/09/11 21:18:32 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.9 2018/10/03 07:03:17 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.8 2018/09/11 21:18:32 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.9 2018/10/03 07:03:17 pgoyette Exp $"); #include #include @@ -232,7 +232,8 @@ static struct syscall_package compat_net { 0, 0, NULL } }; -MODULE(MODULE_CLASS_EXEC, compat_netbsd32_20, "compat_netbsd32,compat_20"); +MODULE(MODULE_CLASS_EXEC, compat_netbsd32_20, +"compat_netbsd32,compat_netbsd32_30,compat_20"); static int compat_netbsd32_20_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/netbsd32/netbsd32_compat_30.c diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.11 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.12 ---
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Sep 29 07:52:39 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_13.c Log Message: Make sure that the netbsd32_compat_16 code is available to compat_netbsd_13 To generate a diff of this commit: cvs rdiff -u -r1.26.28.7 -r1.26.28.8 \ src/sys/compat/netbsd32/netbsd32_compat_13.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Sep 29 07:52:39 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_13.c Log Message: Make sure that the netbsd32_compat_16 code is available to compat_netbsd_13 To generate a diff of this commit: cvs rdiff -u -r1.26.28.7 -r1.26.28.8 \ src/sys/compat/netbsd32/netbsd32_compat_13.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_compat_13.c diff -u src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.7 src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.8 --- src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.7 Thu Sep 27 03:53:30 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_13.c Sat Sep 29 07:52:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.7 2018/09/27 03:53:30 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.8 2018/09/29 07:52:39 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.7 2018/09/27 03:53:30 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.8 2018/09/29 07:52:39 pgoyette Exp $"); #include #include @@ -104,7 +104,8 @@ static struct syscall_package compat_net { 0, 0, NULL } }; -MODULE(MODULE_CLASS_EXEC, compat_netbsd32_13, "compat_netbsd32,compat_13"); +MODULE(MODULE_CLASS_EXEC, compat_netbsd32_13, +"compat_netbsd32,compat_13,compat_netbsd32_16"); static int compat_netbsd32_13_modcmd(modcmd_t cmd, void *arg)
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Sep 29 04:24:02 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.15 -r1.134.2.16 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.14 -r1.134.2.15 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.15 -r1.132.2.16 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.14 -r1.13.2.15 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.14 -r1.132.2.15 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.14 -r1.24.2.15 \ 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.134.2.15 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.16 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.15 Sat Sep 29 04:11:45 2018 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Sep 29 04:24:02 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.134.2.15 2018/09/29 04:11:45 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.134.2.16 2018/09/29 04:24:02 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -482,9 +482,13 @@ /* syscall: "compat_30_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */ #define NETBSD32_SYS_compat_30_netbsd32_ntp_gettime 175 +#if defined(NTP) || !defined(_KERNEL_OPT) /* syscall: "netbsd32_ntp_adjtime" ret: "int" args: "netbsd32_timexp_t" */ #define NETBSD32_SYS_netbsd32_ntp_adjtime 176 +#else +/* 176 is excluded ntp_adjtime */ +#endif /* syscall: "netbsd32_setgid" ret: "int" args: "gid_t" */ #define NETBSD32_SYS_netbsd32_setgid 181 Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.15 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14 Sat Sep 29 04:11:45 2018 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Sep 29 04:24:02 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.14 2018/09/29 04:11:45 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.15 2018/09/29 04:24:02 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -913,11 +913,14 @@ struct compat_30_netbsd32_ntp_gettime_ar syscallarg(netbsd32_ntptimeval50p_t) ntvp; }; check_syscall_args(compat_30_netbsd32_ntp_gettime) +#if defined(NTP) || !defined(_KERNEL_OPT) struct netbsd32_ntp_adjtime_args { syscallarg(netbsd32_timexp_t) tp; }; check_syscall_args(netbsd32_ntp_adjtime) +#else +#endif struct netbsd32_setgid_args { syscallarg(gid_t) gid; @@ -2923,8 +2926,11 @@ int netbsd32_pwrite(struct lwp *, const int compat_30_netbsd32_ntp_gettime(struct lwp *, const struct compat_30_netbsd32_ntp_gettime_args *, register_t *); +#if defined(NTP) || !defined(_KERNEL_OPT) int netbsd32_ntp_adjtime(struct lwp *, const struct netbsd32_ntp_adjtime_args *, register_t *); +#else +#endif int netbsd32_setgid(struct lwp *, const struct netbsd32_setgid_args *, register_t *); int netbsd32_setegid(struct lwp *, const struct netbsd32_setegid_args *, register_t *); Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.15 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.16 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.15 Sat Sep 29 04:11:45 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sat Sep 29 04:24:02 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.15 2018/09/29 04:11:45 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.16 2018/09/29 04:24:02 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.15
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Sep 29 04:24:02 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.15 -r1.134.2.16 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.14 -r1.134.2.15 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.15 -r1.132.2.16 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.14 -r1.13.2.15 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.14 -r1.132.2.15 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.14 -r1.24.2.15 \ 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.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Sep 29 04:22:31 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Only keep the compat syscall entry; the main entry needs to remain conditional. To generate a diff of this commit: cvs rdiff -u -r1.120.2.18 -r1.120.2.19 \ src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Sep 29 04:22:31 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Only keep the compat syscall entry; the main entry needs to remain conditional. To generate a diff of this commit: cvs rdiff -u -r1.120.2.18 -r1.120.2.19 \ src/sys/compat/netbsd32/syscalls.master 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/syscalls.master diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.18 src/sys/compat/netbsd32/syscalls.master:1.120.2.19 --- src/sys/compat/netbsd32/syscalls.master:1.120.2.18 Sat Sep 29 04:11:06 2018 +++ src/sys/compat/netbsd32/syscalls.master Sat Sep 29 04:22:31 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp $ + $NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp $ ; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -419,7 +419,11 @@ 175 COMPAT_30 MODULAR compat_netbsd32_30 \ { int|netbsd32||ntp_gettime( \ netbsd32_ntptimeval50p_t ntvp); } +#if defined(NTP) || !defined(_KERNEL_OPT) 176 STD { int|netbsd32||ntp_adjtime(netbsd32_timexp_t tp); } +#else +176 EXCL ntp_adjtime +#endif 177 UNIMPL 178 UNIMPL 179 UNIMPL
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Sep 29 04:11:45 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.14 -r1.134.2.15 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.13 -r1.134.2.14 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.14 -r1.132.2.15 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.13 -r1.13.2.14 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.13 -r1.132.2.14 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.13 -r1.24.2.14 \ 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.134.2.14 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.15 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.14 Fri Sep 14 10:41:47 2018 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Sep 29 04:11:45 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.134.2.14 2018/09/14 10:41:47 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.134.2.15 2018/09/29 04:11:45 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -479,17 +479,12 @@ /* syscall: "netbsd32_pwrite" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "int" "netbsd32_off_t" */ #define NETBSD32_SYS_netbsd32_pwrite 174 -#if defined(NTP) || !defined(_KERNEL_OPT) /* syscall: "compat_30_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */ #define NETBSD32_SYS_compat_30_netbsd32_ntp_gettime 175 /* syscall: "netbsd32_ntp_adjtime" ret: "int" args: "netbsd32_timexp_t" */ #define NETBSD32_SYS_netbsd32_ntp_adjtime 176 -#else -/* 175 is excluded ntp_gettime */ -/* 176 is excluded ntp_adjtime */ -#endif /* syscall: "netbsd32_setgid" ret: "int" args: "gid_t" */ #define NETBSD32_SYS_netbsd32_setgid 181 @@ -1032,13 +1027,9 @@ /* syscall: "compat_30_netbsd32___fhstat30" ret: "int" args: "netbsd32_fhandlep_t" "netbsd32_stat50p_t" */ #define NETBSD32_SYS_compat_30_netbsd32___fhstat30 392 -#if defined(NTP) || !defined(_KERNEL_OPT) /* syscall: "compat_50_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */ #define NETBSD32_SYS_compat_50_netbsd32_ntp_gettime 393 -#else -/* 393 is excluded __ntp_gettime30 */ -#endif /* syscall: "netbsd32___socket30" ret: "int" args: "int" "int" "int" */ #define NETBSD32_SYS_netbsd32___socket30 394 Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.13 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.13 Fri Sep 14 10:41:47 2018 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Sep 29 04:11:45 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.13 2018/09/14 10:41:47 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.14 2018/09/29 04:11:45 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -908,7 +908,6 @@ struct netbsd32_pwrite_args { syscallarg(netbsd32_off_t) offset; }; check_syscall_args(netbsd32_pwrite) -#if defined(NTP) || !defined(_KERNEL_OPT) struct compat_30_netbsd32_ntp_gettime_args { syscallarg(netbsd32_ntptimeval50p_t) ntvp; @@ -919,8 +918,6 @@ struct netbsd32_ntp_adjtime_args { syscallarg(netbsd32_timexp_t) tp; }; check_syscall_args(netbsd32_ntp_adjtime) -#else -#endif struct netbsd32_setgid_args { syscallarg(gid_t) gid; @@ -2053,14 +2050,11 @@ struct compat_30_netbsd32___fhstat30_arg syscallarg(netbsd32_stat50p_t) sb; }; check_syscall_args(compat_30_netbsd32___fhstat30) -#if defined(NTP) || !defined(_KERNEL_OPT) struct compat_50_netbsd32_ntp_gettime_args { syscallarg(netbsd32_ntptimeval50p_t) ntvp; }; check_syscall_args(compat_50_netbsd32_ntp_gettime) -#else -#endif struct netbsd32___socket30_args { syscallarg(int) domain; @@ -2927,13 +2921,10 @@ int netbsd32_pread(struct lwp *, const s int netbsd32_pwrite(struct lwp *,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Sep 29 04:11:45 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.14 -r1.134.2.15 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.13 -r1.134.2.14 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.14 -r1.132.2.15 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.13 -r1.13.2.14 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.13 -r1.132.2.14 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.13 -r1.24.2.14 \ 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.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Sep 29 04:11:07 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Don't #ifdef out the NTP compat calls. The syscall number needs to be defined (for the autoload table) whether or not the compat code is built in. The compat code will be included in the module in all cases, but it makes explicit checks to ensure that NTP code exists before executing. To generate a diff of this commit: cvs rdiff -u -r1.120.2.17 -r1.120.2.18 \ src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Sep 29 04:11:07 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Don't #ifdef out the NTP compat calls. The syscall number needs to be defined (for the autoload table) whether or not the compat code is built in. The compat code will be included in the module in all cases, but it makes explicit checks to ensure that NTP code exists before executing. To generate a diff of this commit: cvs rdiff -u -r1.120.2.17 -r1.120.2.18 \ src/sys/compat/netbsd32/syscalls.master 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/syscalls.master diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.17 src/sys/compat/netbsd32/syscalls.master:1.120.2.18 --- src/sys/compat/netbsd32/syscalls.master:1.120.2.17 Fri Sep 14 10:41:13 2018 +++ src/sys/compat/netbsd32/syscalls.master Sat Sep 29 04:11:06 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp $ + $NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp $ ; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -416,15 +416,10 @@ 174 STD { netbsd32_ssize_t|netbsd32||pwrite(int fd, \ netbsd32_voidp buf, netbsd32_size_t nbyte, \ int PAD, netbsd32_off_t offset); } -#if defined(NTP) || !defined(_KERNEL_OPT) 175 COMPAT_30 MODULAR compat_netbsd32_30 \ { int|netbsd32||ntp_gettime( \ netbsd32_ntptimeval50p_t ntvp); } 176 STD { int|netbsd32||ntp_adjtime(netbsd32_timexp_t tp); } -#else -175 EXCL ntp_gettime -176 EXCL ntp_adjtime -#endif 177 UNIMPL 178 UNIMPL 179 UNIMPL @@ -899,13 +894,9 @@ { int|netbsd32|30|fhstat( \ netbsd32_fhandlep_t fhp, \ netbsd32_stat50p_t sb); } -#if defined(NTP) || !defined(_KERNEL_OPT) 393 COMPAT_50 MODULAR compat_netbsd32_50 \ { int|netbsd32||ntp_gettime( \ netbsd32_ntptimeval50p_t ntvp); } -#else -393 EXCL __ntp_gettime30 -#endif 394 STD { int|netbsd32|30|socket(int domain, int type, \ int protocol); } 395 STD { int|netbsd32|30|getfh(netbsd32_charp fname, \
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 27 01:33:31 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_time.c Log Message: typo: insert missing ')' To generate a diff of this commit: cvs rdiff -u -r1.49.12.2 -r1.49.12.3 src/sys/compat/netbsd32/netbsd32_time.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 27 01:33:31 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_time.c Log Message: typo: insert missing ')' To generate a diff of this commit: cvs rdiff -u -r1.49.12.2 -r1.49.12.3 src/sys/compat/netbsd32/netbsd32_time.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_time.c diff -u src/sys/compat/netbsd32/netbsd32_time.c:1.49.12.2 src/sys/compat/netbsd32/netbsd32_time.c:1.49.12.3 --- src/sys/compat/netbsd32/netbsd32_time.c:1.49.12.2 Tue Sep 25 21:41:30 2018 +++ src/sys/compat/netbsd32/netbsd32_time.c Thu Sep 27 01:33:31 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_time.c,v 1.49.12.2 2018/09/25 21:41:30 pgoyette Exp $ */ +/* $NetBSD: netbsd32_time.c,v 1.49.12.3 2018/09/27 01:33:31 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.49.12.2 2018/09/25 21:41:30 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.49.12.3 2018/09/27 01:33:31 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_ntp.h" @@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_tim #include #include #include +#include #include #include @@ -114,7 +115,7 @@ netbsd32_ntp_adjtime(struct lwp *l, cons NULL))) return (error); - (*vec_ntp_adjtime1(); + (*vec_ntp_adjtime1)(); netbsd32_from_timex(, ); error = copyout(, SCARG_P32(uap, tp), sizeof(ntv32));
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Mon Sep 24 23:06:02 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: syntax: add missing ) To generate a diff of this commit: cvs rdiff -u -r1.116.2.13 -r1.116.2.14 src/sys/compat/netbsd32/netbsd32.h 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.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.13 src/sys/compat/netbsd32/netbsd32.h:1.116.2.14 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.13 Mon Sep 24 22:56:45 2018 +++ src/sys/compat/netbsd32/netbsd32.h Mon Sep 24 23:06:02 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.13 2018/09/24 22:56:45 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.14 2018/09/24 23:06:02 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -1167,7 +1167,7 @@ struct iovec *netbsd32_get_iov(struct ne SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_setup); #endif /* SYSCTL_SETUP_PROTO */ -MODULE_HOOK(netbsd32_sendsig_hook, (const ksiginfo_t *, const sigset_t *); +MODULE_HOOK(netbsd32_sendsig_hook, (const ksiginfo_t *, const sigset_t *)); extern struct sysent netbsd32_sysent[]; extern const uint32_t netbsd32_sysent_nomodbits[];
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Mon Sep 24 23:06:02 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: syntax: add missing ) To generate a diff of this commit: cvs rdiff -u -r1.116.2.13 -r1.116.2.14 src/sys/compat/netbsd32/netbsd32.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 21:43:46 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_kern_proc.c netbsd32_mod.c Log Message: Use a .h file to define the xxx_{init,fini} routines, and include the compat_stub.h header to get the definition of the kern_proc_32 hook. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/netbsd32/netbsd32_kern_proc.c cvs rdiff -u -r1.13.16.15 -r1.13.16.16 src/sys/compat/netbsd32/netbsd32_mod.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_kern_proc.c diff -u src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.3 src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.4 --- src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.3 Sun Sep 23 11:50:03 2018 +++ src/sys/compat/netbsd32/netbsd32_kern_proc.c Sun Sep 23 21:43:45 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $ */ +/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.4 2018/09/23 21:43:45 pgoyette Exp $ */ /*- * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.4 2018/09/23 21:43:45 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_kstack.h" @@ -100,11 +100,13 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ker #include #include #include +#include #include #include #include +#include static int copyin_psstrings_32(struct proc *p, struct ps_strings *arginfo) @@ -141,7 +143,7 @@ MODULE_UNSET_HOOK2(kern_proc_32_hook); #endif void -kern_proc_32_init(void) +netbsd32_kern_proc_32_init(void) { #if !defined(_RUMPSERVER) @@ -150,7 +152,7 @@ kern_proc_32_init(void) } void -kern_proc_32_fini(void) +netbsd32_kern_proc_32_fini(void) { #if !defined(_RUMPSERVER) Index: src/sys/compat/netbsd32/netbsd32_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.15 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.16 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.15 Sun Sep 23 11:29:53 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Sun Sep 23 21:43:45 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.16 2018/09/23 21:43:45 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.16 2018/09/23 21:43:45 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -112,19 +112,19 @@ compat_netbsd32_modcmd(modcmd_t cmd, voi if (error == 0) { netbsd32_sysctl_init(); netbsd32_machdep_md_init(); - kern_proc_32_init(); + netbsd32_kern_proc_32_init(); } return error; case MODULE_CMD_FINI: netbsd32_machdep_md_fini(); netbsd32_sysctl_fini(); - kern_proc_32_fini(); + netbsd32_kern_proc_32_fini(); error = exec_remove(netbsd32_execsw, __arraycount(netbsd32_execsw)); if (error) { - kern_proc_32_init(); + netbsd32_kern_proc_32_init(); netbsd32_sysctl_init(); netbsd32_machdep_md_init(); }
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 21:43:46 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_kern_proc.c netbsd32_mod.c Log Message: Use a .h file to define the xxx_{init,fini} routines, and include the compat_stub.h header to get the definition of the kern_proc_32 hook. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/netbsd32/netbsd32_kern_proc.c cvs rdiff -u -r1.13.16.15 -r1.13.16.16 src/sys/compat/netbsd32/netbsd32_mod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 11:57:10 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: The kern_proc_32 hook is defined in non-compat code. Don't redefine. To generate a diff of this commit: cvs rdiff -u -r1.116.2.11 -r1.116.2.12 src/sys/compat/netbsd32/netbsd32.h 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.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.11 src/sys/compat/netbsd32/netbsd32.h:1.116.2.12 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.11 Sun Sep 23 11:23:47 2018 +++ src/sys/compat/netbsd32/netbsd32.h Sun Sep 23 11:57:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.11 2018/09/23 11:23:47 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.12 2018/09/23 11:57:09 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -1181,13 +1181,6 @@ struct netbsd32_modctl_args; MODULE_HOOK(compat32_80_modctl_hook, (struct lwp *, const struct netbsd32_modctl_args *, register_t *)); -/* - * kern_proc compatability for netbsd32 - */ -struct ps_strings; -MODULE_HOOK2(kern_proc_32_hook, (struct proc *, struct ps_strings *), -(char **, size_t, vaddr_t *)); - /* * Finally, declare emul_netbsd32 as this is needed in lots of * places when calling syscall_{,dis}establish()
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 11:57:10 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: The kern_proc_32 hook is defined in non-compat code. Don't redefine. To generate a diff of this commit: cvs rdiff -u -r1.116.2.11 -r1.116.2.12 src/sys/compat/netbsd32/netbsd32.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 11:29:53 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c Log Message: The kern_proc_32 hook is in the main kernel, so don't make another one here. To generate a diff of this commit: cvs rdiff -u -r1.13.16.14 -r1.13.16.15 src/sys/compat/netbsd32/netbsd32_mod.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_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.14 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.15 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.14 Sun Sep 23 11:23:47 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Sun Sep 23 11:29:53 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.14 2018/09/23 11:23:47 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.14 2018/09/23 11:23:47 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1)) struct compat32_80_modctl_hook_t compat32_80_modctl_hook; -struct kern_proc_32_hook_t kern_proc_32_hook; # define DEPS1 "ksem,coredump,compat_util"
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 11:29:53 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c Log Message: The kern_proc_32 hook is in the main kernel, so don't make another one here. To generate a diff of this commit: cvs rdiff -u -r1.13.16.14 -r1.13.16.15 src/sys/compat/netbsd32/netbsd32_mod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 09:16:25 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_50.c Log Message: Be selective about including the NTP syscall ntp_gettime To generate a diff of this commit: cvs rdiff -u -r1.32.16.8 -r1.32.16.9 \ src/sys/compat/netbsd32/netbsd32_compat_50.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_compat_50.c diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.8 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.9 --- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.8 Tue Sep 11 23:58:46 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_50.c Sun Sep 23 09:16:25 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.8 2018/09/11 23:58:46 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.9 2018/09/23 09:16:25 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.8 2018/09/11 23:58:46 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.9 2018/09/23 09:16:25 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -931,6 +931,7 @@ compat_50_netbsd32_quotactl(struct lwp * return (compat_50_sys_quotactl(l, , retval)); } +#ifdef NTP int compat_50_netbsd32_ntp_gettime(struct lwp *l, const struct compat_50_netbsd32_ntp_gettime_args *uap, register_t *retval) @@ -959,7 +960,7 @@ compat_50_netbsd32_ntp_gettime(struct lw return (error); } - +#endif static struct syscall_package compat_netbsd32_50_syscalls[] = { { NETBSD32_SYS_compat_50_netbsd32_mknod, 0, @@ -1018,8 +1019,10 @@ static struct syscall_package compat_net (sy_call_t *)compat_50_netbsd32_getitimer }, { NETBSD32_SYS_compat_50_netbsd32_quotactl, 0, (sy_call_t *)compat_50_netbsd32_quotactl }, +#ifdef NTP { NETBSD32_SYS_compat_50_netbsd32_ntp_gettime, 0, (sy_call_t *)compat_50_netbsd32_ntp_gettime }, +#endif { 0, 0, NULL } };
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 09:16:25 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_50.c Log Message: Be selective about including the NTP syscall ntp_gettime To generate a diff of this commit: cvs rdiff -u -r1.32.16.8 -r1.32.16.9 \ src/sys/compat/netbsd32/netbsd32_compat_50.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 09:16:49 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: White space for readability To generate a diff of this commit: cvs rdiff -u -r1.116.2.9 -r1.116.2.10 src/sys/compat/netbsd32/netbsd32.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 09:16:49 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: White space for readability To generate a diff of this commit: cvs rdiff -u -r1.116.2.9 -r1.116.2.10 src/sys/compat/netbsd32/netbsd32.h 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.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.9 src/sys/compat/netbsd32/netbsd32.h:1.116.2.10 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.9 Tue Sep 18 23:03:54 2018 +++ src/sys/compat/netbsd32/netbsd32.h Sun Sep 23 09:16:49 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.9 2018/09/18 23:03:54 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.10 2018/09/23 09:16:49 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -47,6 +47,7 @@ #include #include #include + #include #include #include
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 08:02:50 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_30.c Log Message: Revert previous. Instead, don't put an entry for ntp_gettime in the syscall package if we don't have NTP. To generate a diff of this commit: cvs rdiff -u -r1.31.16.9 -r1.31.16.10 \ src/sys/compat/netbsd32/netbsd32_compat_30.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 08:02:50 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_30.c Log Message: Revert previous. Instead, don't put an entry for ntp_gettime in the syscall package if we don't have NTP. To generate a diff of this commit: cvs rdiff -u -r1.31.16.9 -r1.31.16.10 \ src/sys/compat/netbsd32/netbsd32_compat_30.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_compat_30.c diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.9 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.10 --- src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.9 Sun Sep 23 08:01:13 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_30.c Sun Sep 23 08:02:50 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.10 2018/09/23 08:02:50 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.10 2018/09/23 08:02:50 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include @@ -301,10 +301,10 @@ compat_30_netbsd32_fhopen(struct lwp *l, return (compat_30_sys_fhopen(l, , retval)); } +#ifdef NTP int compat_30_netbsd32_ntp_gettime(struct lwp *l, const struct compat_30_netbsd32_ntp_gettime_args *uap, register_t *retval) { -#ifdef NTP /* { syscallarg(netbsd32_ntptimevalp_t) ntvp; } */ @@ -326,11 +326,8 @@ compat_30_netbsd32_ntp_gettime(struct lw } return (error); -#else - - return ENOSYS; -#endif } +#endif static struct syscall_package compat_netbsd32_30_syscalls[] = { { NETBSD32_SYS_compat_30_netbsd32_getdents, 0, @@ -353,8 +350,10 @@ static struct syscall_package compat_net (sy_call_t *)compat_30_netbsd32___fhstat30 }, { NETBSD32_SYS_compat_30_netbsd32_fhopen, 0, (sy_call_t *)compat_30_netbsd32_fhopen }, +#ifdef NTP { NETBSD32_SYS_compat_30_netbsd32_ntp_gettime, 0, (sy_call_t *)compat_30_netbsd32_ntp_gettime }, +#endif { 0, 0, NULL } };
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 08:01:13 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_30.c Log Message: Provide a dummy version of netbsd32_ntp_gettime for systems where NTP isn't defined. To generate a diff of this commit: cvs rdiff -u -r1.31.16.8 -r1.31.16.9 \ src/sys/compat/netbsd32/netbsd32_compat_30.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_compat_30.c diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.8 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.9 --- src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.8 Tue Sep 11 23:58:46 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_30.c Sun Sep 23 08:01:13 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.8 2018/09/11 23:58:46 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.8 2018/09/11 23:58:46 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include @@ -301,10 +301,10 @@ compat_30_netbsd32_fhopen(struct lwp *l, return (compat_30_sys_fhopen(l, , retval)); } -#ifdef NTP int compat_30_netbsd32_ntp_gettime(struct lwp *l, const struct compat_30_netbsd32_ntp_gettime_args *uap, register_t *retval) { +#ifdef NTP /* { syscallarg(netbsd32_ntptimevalp_t) ntvp; } */ @@ -326,8 +326,11 @@ compat_30_netbsd32_ntp_gettime(struct lw } return (error); -} +#else + + return ENOSYS; #endif +} static struct syscall_package compat_netbsd32_30_syscalls[] = { { NETBSD32_SYS_compat_30_netbsd32_getdents, 0,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 08:01:13 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_30.c Log Message: Provide a dummy version of netbsd32_ntp_gettime for systems where NTP isn't defined. To generate a diff of this commit: cvs rdiff -u -r1.31.16.8 -r1.31.16.9 \ src/sys/compat/netbsd32/netbsd32_compat_30.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Tue Sep 18 10:35:04 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_compat_80.c netbsd32_mod.c netbsd32_module.c Log Message: Use the MP-safe compat hooks for netbsd32_compat_80.c's modctl To generate a diff of this commit: cvs rdiff -u -r1.116.2.7 -r1.116.2.8 src/sys/compat/netbsd32/netbsd32.h cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/netbsd32/netbsd32_compat_80.c cvs rdiff -u -r1.13.16.11 -r1.13.16.12 src/sys/compat/netbsd32/netbsd32_mod.c cvs rdiff -u -r1.6.2.6 -r1.6.2.7 src/sys/compat/netbsd32/netbsd32_module.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.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.7 src/sys/compat/netbsd32/netbsd32.h:1.116.2.8 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.7 Fri Sep 14 09:21:33 2018 +++ src/sys/compat/netbsd32/netbsd32.h Tue Sep 18 10:35:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.7 2018/09/14 09:21:33 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.8 2018/09/18 10:35:04 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -1176,8 +1177,8 @@ extern const char * const netbsd32_sysca extern struct sysctlnode netbsd32_sysctl_root; struct netbsd32_modctl_args; -extern int (*vec_compat32_80_modctl)(struct lwp *, -const struct netbsd32_modctl_args *, register_t *); +COMPAT_HOOK(compat32_80_modctl_hook, +(struct lwp *, const struct netbsd32_modctl_args *, register_t *)); /* * Finally, declare emul_netbsd32 as this is needed in lots of Index: src/sys/compat/netbsd32/netbsd32_compat_80.c diff -u src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.3 src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.4 --- src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.3 Tue Sep 11 09:22:51 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_80.c Tue Sep 18 10:35:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.3 2018/09/11 09:22:51 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.4 2018/09/18 10:35:04 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.3 2018/09/11 09:22:51 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.4 2018/09/18 10:35:04 pgoyette Exp $"); #include #include @@ -175,22 +175,22 @@ netbsd32_80_modctl(struct lwp *lwp, cons return error; } +COMPAT_SET_HOOK(compat32_80_modctl_hook, "nb32_modctl_80", netbsd32_80_modctl); +COMPAT_UNSET_HOOK(compat32_80_modctl_hook); + MODULE(MODULE_CLASS_EXEC, compat_netbsd32_80, "compat_netbsd32,compat_80"); static int compat_netbsd32_80_modcmd(modcmd_t cmd, void *arg) { -static int (*orig_netbsd32_80_modctl)(struct lwp *, -const struct netbsd32_modctl_args *, register_t *); switch (cmd) { case MODULE_CMD_INIT: - orig_netbsd32_80_modctl = vec_compat32_80_modctl; - vec_compat32_80_modctl = netbsd32_80_modctl; + compat32_80_modctl_hook_set(); return 0; case MODULE_CMD_FINI: - vec_compat32_80_modctl = orig_netbsd32_80_modctl; + compat32_80_modctl_hook_unset(); return 0; default: Index: src/sys/compat/netbsd32/netbsd32_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.11 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.12 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.11 Fri Sep 14 08:38:37 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Tue Sep 18 10:35:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.11 2018/09/14 08:38:37 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.12 2018/09/18 10:35:04 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.11 2018/09/14 08:38:37 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.12 2018/09/18 10:35:04 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -44,6 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod #include #include #include +#include #include #include @@ -51,11 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod #define ELF32_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), \ sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1)) -int compat32_80_modctl_compat_stub(struct lwp *, -const struct netbsd32_modctl_args *, register_t *); - -int (*vec_compat32_80_modctl)(struct lwp *, -const struct netbsd32_modctl_args *, register_t *); +struct compat32_80_modctl_hook_t compat32_80_modctl_hook; # define DEPS1 "ksem,coredump,compat_util" @@ -113,21 +110,18 @@ compat_netbsd32_modcmd(modcmd_t cmd, voi __arraycount(netbsd32_execsw)); if (error == 0) {
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Tue Sep 18 10:35:04 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_compat_80.c netbsd32_mod.c netbsd32_module.c Log Message: Use the MP-safe compat hooks for netbsd32_compat_80.c's modctl To generate a diff of this commit: cvs rdiff -u -r1.116.2.7 -r1.116.2.8 src/sys/compat/netbsd32/netbsd32.h cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/netbsd32/netbsd32_compat_80.c cvs rdiff -u -r1.13.16.11 -r1.13.16.12 src/sys/compat/netbsd32/netbsd32_mod.c cvs rdiff -u -r1.6.2.6 -r1.6.2.7 src/sys/compat/netbsd32/netbsd32_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 10:41:48 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.13 -r1.134.2.14 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.12 -r1.134.2.13 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.13 -r1.132.2.14 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.12 -r1.13.2.13 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.12 -r1.132.2.13 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.12 -r1.24.2.13 \ 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.134.2.13 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.14 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.13 Fri Sep 14 01:21:34 2018 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Fri Sep 14 10:41:47 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.134.2.13 2018/09/14 01:21:34 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.134.2.14 2018/09/14 10:41:47 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.12 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.13 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.12 Fri Sep 14 01:21:34 2018 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Fri Sep 14 10:41:47 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.12 2018/09/14 01:21:34 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.13 2018/09/14 10:41:47 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.13 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.14 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.13 Fri Sep 14 01:21:34 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Fri Sep 14 10:41:47 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.13 2018/09/14 01:21:34 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.14 2018/09/14 10:41:47 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.13 2018/09/14 01:21:34 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.14 2018/09/14 10:41:47 pgoyette Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.12 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.13 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.12 Fri Sep 14 01:21:34 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Fri Sep 14 10:41:47 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.12 2018/09/14 01:21:34 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.13 2018/09/14 10:41:47 pgoyette Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.12 2018/09/14 01:21:34 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.13 2018/09/14 10:41:47 pgoyette Exp $"); #include static struct sc_autoload netbsd32_syscalls_autoload[] = { @@ -42,6 +42,7 @@ static struct sc_autoload netbsd32_sysca {
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 10:41:48 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.13 -r1.134.2.14 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.12 -r1.134.2.13 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.13 -r1.132.2.14 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.12 -r1.13.2.13 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.12 -r1.132.2.13 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.12 -r1.24.2.13 \ 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.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 10:41:13 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Add MODULAR attribute to sigreturn. I think this is the last one. To generate a diff of this commit: cvs rdiff -u -r1.120.2.16 -r1.120.2.17 \ src/sys/compat/netbsd32/syscalls.master 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/syscalls.master diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.16 src/sys/compat/netbsd32/syscalls.master:1.120.2.17 --- src/sys/compat/netbsd32/syscalls.master:1.120.2.16 Fri Sep 14 01:20:52 2018 +++ src/sys/compat/netbsd32/syscalls.master Fri Sep 14 10:41:13 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp $ + $NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp $ ; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -259,7 +259,8 @@ 102 COMPAT_43 MODULAR compat_netbsd32_43 \ { int|netbsd32||orecv(int s, netbsd32_voidp buf, \ int len, int flags); } -103 COMPAT_13 { int|netbsd32||sigreturn( \ +103 COMPAT_13 MODULAR compat_netbsd32_13 \ + { int|netbsd32||sigreturn( \ netbsd32_sigcontextp_t sigcntxp); } sigreturn13 104 STD { int|netbsd32||bind(int s, netbsd32_sockaddrp_t name, \ int namelen); }
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 10:41:13 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Add MODULAR attribute to sigreturn. I think this is the last one. To generate a diff of this commit: cvs rdiff -u -r1.120.2.16 -r1.120.2.17 \ src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 09:21:33 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: Forward declaration of struct netbsd32_modctl_args To generate a diff of this commit: cvs rdiff -u -r1.116.2.6 -r1.116.2.7 src/sys/compat/netbsd32/netbsd32.h 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.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.6 src/sys/compat/netbsd32/netbsd32.h:1.116.2.7 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.6 Fri Sep 14 08:53:22 2018 +++ src/sys/compat/netbsd32/netbsd32.h Fri Sep 14 09:21:33 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.6 2018/09/14 08:53:22 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.7 2018/09/14 09:21:33 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -1175,6 +1175,7 @@ extern const char * const netbsd32_sysca extern struct sysctlnode netbsd32_sysctl_root; +struct netbsd32_modctl_args; extern int (*vec_compat32_80_modctl)(struct lwp *, const struct netbsd32_modctl_args *, register_t *);
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 09:21:33 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: Forward declaration of struct netbsd32_modctl_args To generate a diff of this commit: cvs rdiff -u -r1.116.2.6 -r1.116.2.7 src/sys/compat/netbsd32/netbsd32.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 08:53:22 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_module.c netbsd32_netbsd.c Log Message: Move some extern definitions into netbsd32_netbsd.h rather than having them in the .c files. To generate a diff of this commit: cvs rdiff -u -r1.116.2.5 -r1.116.2.6 src/sys/compat/netbsd32/netbsd32.h cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/sys/compat/netbsd32/netbsd32_module.c cvs rdiff -u -r1.214.2.5 -r1.214.2.6 \ src/sys/compat/netbsd32/netbsd32_netbsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 08:53:22 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_module.c netbsd32_netbsd.c Log Message: Move some extern definitions into netbsd32_netbsd.h rather than having them in the .c files. To generate a diff of this commit: cvs rdiff -u -r1.116.2.5 -r1.116.2.6 src/sys/compat/netbsd32/netbsd32.h cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/sys/compat/netbsd32/netbsd32_module.c cvs rdiff -u -r1.214.2.5 -r1.214.2.6 \ src/sys/compat/netbsd32/netbsd32_netbsd.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.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.5 src/sys/compat/netbsd32/netbsd32.h:1.116.2.6 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.5 Fri Sep 14 08:38:37 2018 +++ src/sys/compat/netbsd32/netbsd32.h Fri Sep 14 08:53:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.5 2018/09/14 08:38:37 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.6 2018/09/14 08:53:22 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -1167,6 +1167,17 @@ SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_ extern void (*vec_netbsd32_sendsig)(const ksiginfo_t *, const sigset_t *); +extern struct sysent netbsd32_sysent[]; +extern const uint32_t netbsd32_sysent_nomodbits[]; +#ifdef SYSCALL_DEBUG +extern const char * const netbsd32_syscallnames[]; +#endif + +extern struct sysctlnode netbsd32_sysctl_root; + +extern int (*vec_compat32_80_modctl)(struct lwp *, +const struct netbsd32_modctl_args *, register_t *); + /* * Finally, declare emul_netbsd32 as this is needed in lots of * places when calling syscall_{,dis}establish() Index: src/sys/compat/netbsd32/netbsd32_module.c diff -u src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.5 src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.6 --- src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.5 Tue Sep 11 04:53:42 2018 +++ src/sys/compat/netbsd32/netbsd32_module.c Fri Sep 14 08:53:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_module.c,v 1.6.2.5 2018/09/11 04:53:42 pgoyette Exp $ */ +/* $NetBSD: netbsd32_module.c,v 1.6.2.6 2018/09/14 08:53:22 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.5 2018/09/11 04:53:42 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.6 2018/09/14 08:53:22 pgoyette Exp $"); #include #include @@ -42,9 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod #include #include -extern int (*vec_compat32_80_modctl)(struct lwp *, -const struct netbsd32_modctl_args *, register_t *); - static int modctl32_handle_stat(struct netbsd32_iovec *iov, void *arg) { Index: src/sys/compat/netbsd32/netbsd32_netbsd.c diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.5 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.6 --- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.5 Wed Sep 12 01:26:40 2018 +++ src/sys/compat/netbsd32/netbsd32_netbsd.c Fri Sep 14 08:53:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_netbsd.c,v 1.214.2.5 2018/09/12 01:26:40 pgoyette Exp $ */ +/* $NetBSD: netbsd32_netbsd.c,v 1.214.2.6 2018/09/14 08:53:22 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214.2.5 2018/09/12 01:26:40 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214.2.6 2018/09/14 08:53:22 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -89,11 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_net #include #endif -extern struct sysent netbsd32_sysent[]; -extern const uint32_t netbsd32_sysent_nomodbits[]; -#ifdef SYSCALL_DEBUG -extern const char * const netbsd32_syscallnames[]; -#endif #ifdef __HAVE_SYSCALL_INTERN void netbsd32_syscall_intern(struct proc *); #else @@ -102,8 +97,6 @@ void syscall(void); #define LIMITCHECK(a, b) ((a) != RLIM_INFINITY && (a) > (b)) -extern struct sysctlnode netbsd32_sysctl_root; - #ifdef MODULAR #include #endif
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 01:21:34 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.12 -r1.134.2.13 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.11 -r1.134.2.12 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.12 -r1.132.2.13 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.11 -r1.13.2.12 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.11 -r1.132.2.12 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.11 -r1.24.2.12 \ 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.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 01:21:34 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.12 -r1.134.2.13 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.11 -r1.134.2.12 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.12 -r1.132.2.13 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.11 -r1.13.2.12 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.11 -r1.132.2.12 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.11 -r1.24.2.12 \ 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.134.2.12 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.13 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.12 Thu Sep 13 03:50:24 2018 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Fri Sep 14 01:21:34 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.134.2.12 2018/09/13 03:50:24 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.134.2.13 2018/09/14 01:21:34 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.11 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.12 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.11 Thu Sep 13 03:50:24 2018 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Fri Sep 14 01:21:34 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.11 2018/09/13 03:50:24 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.12 2018/09/14 01:21:34 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.12 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.13 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.12 Thu Sep 13 03:50:24 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Fri Sep 14 01:21:34 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.12 2018/09/13 03:50:24 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.13 2018/09/14 01:21:34 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.12 2018/09/13 03:50:24 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.13 2018/09/14 01:21:34 pgoyette Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.11 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.12 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.11 Thu Sep 13 03:50:24 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Fri Sep 14 01:21:34 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.11 2018/09/13 03:50:24 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.12 2018/09/14 01:21:34 pgoyette Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.11 2018/09/13 03:50:24 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.12 2018/09/14 01:21:34 pgoyette Exp $"); #include static struct sc_autoload netbsd32_syscalls_autoload[] = { @@ -117,6 +117,7 @@ static struct sc_autoload netbsd32_sysca {
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 01:20:52 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Make sigreturn14 MODULAR To generate a diff of this commit: cvs rdiff -u -r1.120.2.15 -r1.120.2.16 \ src/sys/compat/netbsd32/syscalls.master 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/syscalls.master diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.15 src/sys/compat/netbsd32/syscalls.master:1.120.2.16 --- src/sys/compat/netbsd32/syscalls.master:1.120.2.15 Thu Sep 13 03:49:46 2018 +++ src/sys/compat/netbsd32/syscalls.master Fri Sep 14 01:20:52 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp $ + $NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp $ ; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -687,7 +687,8 @@ netbsd32_sigsetp_t set, \ netbsd32_sigsetp_t oset); } 294 STD { int|netbsd32|14|sigsuspend(netbsd32_sigsetp_t set); } -295 COMPAT_16 { int|netbsd32|14|sigreturn( \ +295 COMPAT_16 MODULAR compat_netbsd32_16 \ + { int|netbsd32|14|sigreturn( \ netbsd32_sigcontextp_t sigcntxp); } 296 STD { int|netbsd32||__getcwd(netbsd32_charp bufp, \ netbsd32_size_t length); }
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 01:20:52 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Make sigreturn14 MODULAR To generate a diff of this commit: cvs rdiff -u -r1.120.2.15 -r1.120.2.16 \ src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 00:47:48 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c Log Message: Require coredump since netbsd32 module will be built with COREDUMP enabled. To generate a diff of this commit: cvs rdiff -u -r1.13.16.8 -r1.13.16.9 src/sys/compat/netbsd32/netbsd32_mod.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_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.8 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.9 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.8 Thu Sep 13 03:51:32 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Fri Sep 14 00:47:48 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.8 2018/09/13 03:51:32 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.9 2018/09/14 00:47:48 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.8 2018/09/13 03:51:32 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.9 2018/09/14 00:47:48 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -57,7 +57,7 @@ int compat32_80_modctl_compat_stub(struc int (*vec_compat32_80_modctl)(struct lwp *, const struct netbsd32_modctl_args *, register_t *); -# define DEPS1 "ksem,compat_util" +# define DEPS1 "ksem,coredump,compat_util" #if defined(EXEC_ELF32) # define DEPS2 ",exec_elf32"
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 00:47:48 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c Log Message: Require coredump since netbsd32 module will be built with COREDUMP enabled. To generate a diff of this commit: cvs rdiff -u -r1.13.16.8 -r1.13.16.9 src/sys/compat/netbsd32/netbsd32_mod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 03:51:32 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_ipc.c netbsd32_mod.c Log Message: More clean-up of module dependencies To generate a diff of this commit: cvs rdiff -u -r1.18.16.5 -r1.18.16.6 src/sys/compat/netbsd32/netbsd32_ipc.c cvs rdiff -u -r1.13.16.7 -r1.13.16.8 src/sys/compat/netbsd32/netbsd32_mod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 03:51:32 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_ipc.c netbsd32_mod.c Log Message: More clean-up of module dependencies To generate a diff of this commit: cvs rdiff -u -r1.18.16.5 -r1.18.16.6 src/sys/compat/netbsd32/netbsd32_ipc.c cvs rdiff -u -r1.13.16.7 -r1.13.16.8 src/sys/compat/netbsd32/netbsd32_mod.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_ipc.c diff -u src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.5 src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.6 --- src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.5 Wed Sep 12 23:28:16 2018 +++ src/sys/compat/netbsd32/netbsd32_ipc.c Thu Sep 13 03:51:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $ */ +/* $NetBSD: netbsd32_ipc.c,v 1.18.16.6 2018/09/13 03:51:32 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.6 2018/09/13 03:51:32 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -83,7 +83,7 @@ static const struct syscall_package comp }; MODULE(MODULE_CLASS_EXEC, compat_netbsd32_sysvipc, -"sysv_ipc,compat_netbsd32,sysv_ipc"); +"compat_netbsd32,sysv_ipc"); static int compat_netbsd32_sysvipc_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/netbsd32/netbsd32_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.7 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.8 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.7 Thu Sep 13 02:03:49 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Thu Sep 13 03:51:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.8 2018/09/13 03:51:32 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.8 2018/09/13 03:51:32 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -57,7 +57,7 @@ int compat32_80_modctl_compat_stub(struc int (*vec_compat32_80_modctl)(struct lwp *, const struct netbsd32_modctl_args *, register_t *); -# define DEPS1 "ksem" +# define DEPS1 "ksem,compat_util" #if defined(EXEC_ELF32) # define DEPS2 ",exec_elf32"
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 03:50:24 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.11 -r1.134.2.12 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.10 -r1.134.2.11 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.11 -r1.132.2.12 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.10 -r1.13.2.11 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.10 -r1.132.2.11 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.10 -r1.24.2.11 \ 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.134.2.11 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.12 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.11 Wed Sep 12 23:27:24 2018 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Thu Sep 13 03:50:24 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.134.2.11 2018/09/12 23:27:24 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.134.2.12 2018/09/13 03:50:24 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.10 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.11 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.10 Wed Sep 12 23:27:24 2018 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Thu Sep 13 03:50:24 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.10 2018/09/12 23:27:24 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.11 2018/09/13 03:50:24 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.11 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.12 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.11 Wed Sep 12 23:27:24 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Thu Sep 13 03:50:24 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.12 2018/09/13 03:50:24 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.12 2018/09/13 03:50:24 pgoyette Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.10 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.11 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.10 Wed Sep 12 23:27:24 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Thu Sep 13 03:50:24 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.11 2018/09/13 03:50:24 pgoyette Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.11 2018/09/13 03:50:24 pgoyette Exp $"); #include static struct sc_autoload netbsd32_syscalls_autoload[] = { @@ -22,17 +22,21 @@ static struct sc_autoload netbsd32_sysca {
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 03:49:47 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: More MODULAR tags To generate a diff of this commit: cvs rdiff -u -r1.120.2.14 -r1.120.2.15 \ src/sys/compat/netbsd32/syscalls.master 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/syscalls.master diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.14 src/sys/compat/netbsd32/syscalls.master:1.120.2.15 --- src/sys/compat/netbsd32/syscalls.master:1.120.2.14 Wed Sep 12 23:26:38 2018 +++ src/sys/compat/netbsd32/syscalls.master Thu Sep 13 03:49:46 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp $ + $NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp $ ; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -156,7 +156,8 @@ u_int namelen); } 50 STD { int|netbsd32||setlogin(netbsd32_charp namebuf); } 51 STD { int|netbsd32||acct(netbsd32_charp path); } -52 COMPAT_13 { int|sys||sigpending(void); } sigpending13 +52 COMPAT_13 MODULAR compat_netbsd32_13 \ + { int|sys||sigpending(void); } sigpending13 53 COMPAT_13 MODULAR compat_netbsd32_13 \ { int|netbsd32||sigaltstack13( \ netbsd32_sigaltstack13p_t nss, \ @@ -180,7 +181,8 @@ { int|netbsd32||ogetkerninfo(int op, \ netbsd32_charp where, netbsd32_intp size, \ int arg); } -64 COMPAT_43 { int|sys||getpagesize(void); } ogetpagesize +64 COMPAT_43 MODULAR compat_netbsd32_43 \ + { int|sys||getpagesize(void); } ogetpagesize 65 COMPAT_12 MODULAR compat_netbsd32_12 \ { int|netbsd32||msync(netbsd32_voidp addr, \ netbsd32_size_t len); } @@ -215,7 +217,8 @@ { int|netbsd32||setitimer(int which, \ netbsd32_itimerval50p_t itv, \ netbsd32_itimerval50p_t oitv); } -84 COMPAT_43 { int|sys||wait(void); } owait +84 COMPAT_43 MODULAR compat_netbsd32_43 \ + { int|sys||wait(void); } owait 85 COMPAT_12 MODULAR compat_netbsd32_12 \ { int|netbsd32||oswapon(netbsd32_charp name); } 86 COMPAT_50 MODULAR compat_netbsd32_50 \ @@ -227,7 +230,8 @@ 88 COMPAT_43 MODULAR compat_netbsd32_43 \ { int|netbsd32||osethostname(netbsd32_charp hostname, \ u_int len); } -89 COMPAT_43 { int|sys||getdtablesize(void); } ogetdtablesize +89 COMPAT_43 MODULAR compat_netbsd32_43 \ + { int|sys||getdtablesize(void); } ogetdtablesize 90 STD { int|netbsd32||dup2(int from, int to); } 91 UNIMPL getdopt 92 STD { int|netbsd32||fcntl(int fd, int cmd, \ @@ -336,7 +340,8 @@ 141 COMPAT_43 MODULAR compat_netbsd32_43 \ { int|netbsd32||ogetpeername(int fdes, \ netbsd32_voidp asa, netbsd32_intp alen); } -142 COMPAT_43 { int32_t|sys||gethostid(void); } ogethostid +142 COMPAT_43 MODULAR compat_netbsd32_43 \ + { int32_t|sys||gethostid(void); } ogethostid 143 COMPAT_43 MODULAR compat_netbsd32_43 \ { int|netbsd32||sethostid(int32_t hostid); } 144 COMPAT_43 MODULAR compat_netbsd32_43 \ @@ -351,7 +356,8 @@ 148 COMPAT_50 MODULAR compat_netbsd32_50 \ { int|netbsd32||quotactl(netbsd32_charp path, int cmd, \ int uid, netbsd32_voidp arg); } -149 COMPAT_43 { int|sys||quota(void); } oquota +149 COMPAT_43 MODULAR compat_netbsd32_43 \ + { int|sys||quota(void); } oquota 150 COMPAT_43 MODULAR compat_netbsd32_43 \ { int|netbsd32||ogetsockname(int fdec, \ netbsd32_voidp asa, netbsd32_intp alen); }
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 03:50:24 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.11 -r1.134.2.12 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.10 -r1.134.2.11 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.11 -r1.132.2.12 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.10 -r1.13.2.11 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.10 -r1.132.2.11 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.10 -r1.24.2.11 \ 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.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 03:49:47 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: More MODULAR tags To generate a diff of this commit: cvs rdiff -u -r1.120.2.14 -r1.120.2.15 \ src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 02:03:49 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c Log Message: Now that compat_netbsd32 is no longer monolithic, it no longer requires compat_09 (and all higher) compat code. Adjust the requirements list accordingly. To generate a diff of this commit: cvs rdiff -u -r1.13.16.6 -r1.13.16.7 src/sys/compat/netbsd32/netbsd32_mod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 02:03:49 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c Log Message: Now that compat_netbsd32 is no longer monolithic, it no longer requires compat_09 (and all higher) compat code. Adjust the requirements list accordingly. To generate a diff of this commit: cvs rdiff -u -r1.13.16.6 -r1.13.16.7 src/sys/compat/netbsd32/netbsd32_mod.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_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.6 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.7 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.6 Tue Sep 11 23:26:21 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Thu Sep 13 02:03:49 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.6 2018/09/11 23:26:21 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.6 2018/09/11 23:26:21 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -48,14 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod #include #include -# define DEPS1 "compat_09,ksem" - -#if defined(EXEC_ELF32) -# define DEPS2 ",exec_elf32" -#else -# define DEPS2 "" -#endif - #define ELF32_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), \ sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1)) @@ -65,6 +57,14 @@ int compat32_80_modctl_compat_stub(struc int (*vec_compat32_80_modctl)(struct lwp *, const struct netbsd32_modctl_args *, register_t *); +# define DEPS1 "ksem" + +#if defined(EXEC_ELF32) +# define DEPS2 ",exec_elf32" +#else +# define DEPS2 "" +#endif + MODULE(MODULE_CLASS_EXEC, compat_netbsd32, DEPS1 DEPS2); static struct execsw netbsd32_execsw[] = {
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 01:15:59 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_60.c Log Message: Another dependency typo To generate a diff of this commit: cvs rdiff -u -r1.3.2.6 -r1.3.2.7 src/sys/compat/netbsd32/netbsd32_compat_60.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 01:15:59 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_60.c Log Message: Another dependency typo To generate a diff of this commit: cvs rdiff -u -r1.3.2.6 -r1.3.2.7 src/sys/compat/netbsd32/netbsd32_compat_60.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_compat_60.c diff -u src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.6 src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.7 --- src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.6 Tue Sep 11 21:18:32 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_60.c Thu Sep 13 01:15:59 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.6 2018/09/11 21:18:32 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.7 2018/09/13 01:15:59 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.6 2018/09/11 21:18:32 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.7 2018/09/13 01:15:59 pgoyette Exp $"); #include #include @@ -94,7 +94,7 @@ static struct syscall_package compat_net }; -MODULE(MODULE_CLASS_EXEC, compat_netbsd32_60, "compat_netbsd,compat_60"); +MODULE(MODULE_CLASS_EXEC, compat_netbsd32_60, "compat_netbsd32,compat_60"); static int compat_netbsd32_60_modcmd(modcmd_t cmd, void *arg)
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 23:28:16 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_ipc.c Log Message: Use correct module name for dependency To generate a diff of this commit: cvs rdiff -u -r1.18.16.4 -r1.18.16.5 src/sys/compat/netbsd32/netbsd32_ipc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 23:28:16 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_ipc.c Log Message: Use correct module name for dependency To generate a diff of this commit: cvs rdiff -u -r1.18.16.4 -r1.18.16.5 src/sys/compat/netbsd32/netbsd32_ipc.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_ipc.c diff -u src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.4 src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.5 --- src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.4 Wed Sep 12 04:35:22 2018 +++ src/sys/compat/netbsd32/netbsd32_ipc.c Wed Sep 12 23:28:16 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ipc.c,v 1.18.16.4 2018/09/12 04:35:22 pgoyette Exp $ */ +/* $NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.4 2018/09/12 04:35:22 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -83,7 +83,7 @@ static const struct syscall_package comp }; MODULE(MODULE_CLASS_EXEC, compat_netbsd32_sysvipc, -"sysv_ipc,compat_netbsd32,compat_sysv"); +"sysv_ipc,compat_netbsd32,sysv_ipc"); static int compat_netbsd32_sysvipc_modcmd(modcmd_t cmd, void *arg)
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 23:27:25 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.10 -r1.134.2.11 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.9 -r1.134.2.10 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.10 -r1.132.2.11 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.9 -r1.13.2.10 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.9 -r1.132.2.10 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.9 -r1.24.2.10 \ 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.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 23:27:25 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.10 -r1.134.2.11 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.9 -r1.134.2.10 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.10 -r1.132.2.11 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.9 -r1.13.2.10 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.9 -r1.132.2.10 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.9 -r1.24.2.10 \ 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.134.2.10 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.11 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.10 Wed Sep 12 03:22:07 2018 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Sep 12 23:27:24 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.134.2.10 2018/09/12 03:22:07 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.134.2.11 2018/09/12 23:27:24 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.9 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.10 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.9 Wed Sep 12 03:22:07 2018 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Sep 12 23:27:24 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.9 2018/09/12 03:22:07 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.10 2018/09/12 23:27:24 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.10 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.11 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.10 Wed Sep 12 03:22:07 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Sep 12 23:27:24 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.10 2018/09/12 03:22:07 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.10 2018/09/12 03:22:07 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.9 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.10 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.9 Wed Sep 12 03:22:07 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed Sep 12 23:27:24 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.9 2018/09/12 03:22:07 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.9 2018/09/12 03:22:07 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $"); #include static struct sc_autoload netbsd32_syscalls_autoload[] = { @@ -38,6 +38,7 @@ static struct sc_autoload netbsd32_sysca {
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 23:26:38 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Missed a couple of MODULAR tags To generate a diff of this commit: cvs rdiff -u -r1.120.2.13 -r1.120.2.14 \ src/sys/compat/netbsd32/syscalls.master 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/syscalls.master diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.13 src/sys/compat/netbsd32/syscalls.master:1.120.2.14 --- src/sys/compat/netbsd32/syscalls.master:1.120.2.13 Wed Sep 12 03:21:14 2018 +++ src/sys/compat/netbsd32/syscalls.master Wed Sep 12 23:26:38 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp $ + $NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp $ ; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -263,7 +263,8 @@ netbsd32_voidp val, int valsize); } 106 STD { int|netbsd32||listen(int s, int backlog); } 107 OBSOL vtimes -108 COMPAT_43 { int|netbsd32||osigvec(int signum, \ +108 COMPAT_43 MODULAR compat_netbsd32_43 \ + { int|netbsd32||osigvec(int signum, \ netbsd32_sigvecp_t nsv, netbsd32_sigvecp_t osv); } 109 COMPAT_43 MODULAR compat_netbsd32_43 \ { int|netbsd32||sigblock(int mask); } @@ -447,7 +448,8 @@ netbsd32_rlimitp_t rlp); } 195 STD { int|netbsd32||setrlimit(int which, \ netbsd32_rlimitp_t rlp); } -196 COMPAT_12 { int|netbsd32||getdirentries(int fd, \ +196 COMPAT_12 MODULAR compat_netbsd32_12 \ + { int|netbsd32||getdirentries(int fd, \ netbsd32_charp buf, u_int count, \ netbsd32_longp basep); } 197 STD { netbsd32_voidp|netbsd32||mmap(netbsd32_voidp addr, \
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 23:26:38 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Missed a couple of MODULAR tags To generate a diff of this commit: cvs rdiff -u -r1.120.2.13 -r1.120.2.14 \ src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 21:52:17 UTC 2018 Added Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_16.c netbsd32_compat_40.c Log Message: Add some more module glue To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/netbsd32/netbsd32_compat_16.c \ src/sys/compat/netbsd32/netbsd32_compat_40.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/compat/netbsd32/netbsd32_compat_16.c diff -u /dev/null src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.1 --- /dev/null Wed Sep 12 21:52:17 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_16.c Wed Sep 12 21:52:17 2018 @@ -0,0 +1,79 @@ +/* $NetBSD: netbsd32_compat_16.c,v 1.1.2.1 2018/09/12 21:52:17 pgoyette Exp $ */ + +/*- + * Copyright (c) 2008 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + *must display the following acknowledgement: + *This product includes software developed by the NetBSD + *Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + *contributors may be used to endorse or promote products derived + *from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#include +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_16.c,v 1.1.2.1 2018/09/12 21:52:17 pgoyette Exp $"); + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +extern char netbsd32_sigcode[], netbsd32_esigcode[]; +struct uvm_object *emul_netbsd32_object; + +MODULE(MODULE_CLASS_EXEC, compat_netbsd32_16, "compat_netbsd32,compat_16"); + +static int +compat_netbsd32_16_modcmd(modcmd_t cmd, void *arg) +{ + + switch (cmd) { + case MODULE_CMD_INIT: + emul_netbsd32.e_sigcode = netbsd32_sigcode; + emul_netbsd32.e_esigcode = netbsd32_esigcode; + emul_netbsd32.e_sigobject = _netbsd32_object; + return 0; + + case MODULE_CMD_FINI: + emul_netbsd32.e_sigcode = NULL; + emul_netbsd32.e_esigcode = NULL; + emul_netbsd32.e_sigobject = NULL; + return 0; + + default: + return ENOTTY; + } +} Index: src/sys/compat/netbsd32/netbsd32_compat_40.c diff -u /dev/null src/sys/compat/netbsd32/netbsd32_compat_40.c:1.1.2.1 --- /dev/null Wed Sep 12 21:52:17 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_40.c Wed Sep 12 21:52:17 2018 @@ -0,0 +1,97 @@ +/* $NetBSD: netbsd32_compat_40.c,v 1.1.2.1 2018/09/12 21:52:17 pgoyette Exp $ */ + +/*- + * Copyright (c) 2008 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + *must display the following acknowledgement: + *This product includes software developed by the NetBSD + *
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 21:52:17 UTC 2018 Added Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_16.c netbsd32_compat_40.c Log Message: Add some more module glue To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/netbsd32/netbsd32_compat_16.c \ src/sys/compat/netbsd32/netbsd32_compat_40.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 03:22:08 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.9 -r1.134.2.10 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.8 -r1.134.2.9 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.9 -r1.132.2.10 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.8 -r1.13.2.9 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.8 -r1.132.2.9 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.8 -r1.24.2.9 \ 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.134.2.9 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.10 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.9 Wed Sep 12 00:22:26 2018 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Sep 12 03:22:07 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.134.2.9 2018/09/12 00:22:26 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.134.2.10 2018/09/12 03:22:07 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.8 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.9 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.8 Wed Sep 12 00:22:26 2018 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Sep 12 03:22:07 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.8 2018/09/12 00:22:26 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.9 2018/09/12 03:22:07 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.9 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.10 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.9 Wed Sep 12 00:22:26 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Sep 12 03:22:07 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.9 2018/09/12 00:22:26 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.10 2018/09/12 03:22:07 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.9 2018/09/12 00:22:26 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.10 2018/09/12 03:22:07 pgoyette Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.8 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.9 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.8 Wed Sep 12 00:22:26 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed Sep 12 03:22:07 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.8 2018/09/12 00:22:26 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.9 2018/09/12 03:22:07 pgoyette Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.8 2018/09/12 00:22:26 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.9 2018/09/12 03:22:07 pgoyette Exp $"); #include static struct sc_autoload netbsd32_syscalls_autoload[] = { @@ -67,24 +67,24 @@ static struct sc_autoload netbsd32_sysca {
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 03:22:08 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.9 -r1.134.2.10 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.8 -r1.134.2.9 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.9 -r1.132.2.10 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.8 -r1.13.2.9 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.8 -r1.132.2.9 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.8 -r1.24.2.9 \ 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.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 03:21:14 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Prepare for splitting compat_netbsd32_sysvipc into version-specific modules To generate a diff of this commit: cvs rdiff -u -r1.120.2.12 -r1.120.2.13 \ src/sys/compat/netbsd32/syscalls.master 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/syscalls.master diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.12 src/sys/compat/netbsd32/syscalls.master:1.120.2.13 --- src/sys/compat/netbsd32/syscalls.master:1.120.2.12 Wed Sep 12 00:20:53 2018 +++ src/sys/compat/netbsd32/syscalls.master Wed Sep 12 03:21:14 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp $ + $NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp $ ; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -392,13 +392,13 @@ 166 UNIMPL 167 UNIMPL 168 UNIMPL -169 COMPAT_10 MODULAR compat_netbsd32_sysvipc \ +169 COMPAT_10 MODULAR compat_netbsd32_sysvipc_10 \ { int|netbsd32||semsys(int which, int a2, int a3, \ int a4, int a5); } osemsys -170 COMPAT_10 MODULAR compat_netbsd32_sysvipc \ +170 COMPAT_10 MODULAR compat_netbsd32_sysvipc_10 \ { int|netbsd32||msgsys(int which, int a2, int a3, \ int a4, int a5, int a6); } omsgsys -171 COMPAT_10 MODULAR compat_netbsd32_sysvipc \ +171 COMPAT_10 MODULAR compat_netbsd32_sysvipc_10 \ { int|netbsd32||shmsys(int which, int a2, int a3, \ int a4); } oshmsys 172 UNIMPL @@ -490,7 +490,7 @@ 218 UNIMPL 219 UNIMPL ; System calls 220-300 are reserved for use by NetBSD -220 COMPAT_14 MODULAR compat_netbsd32_sysvipc \ +220 COMPAT_14 MODULAR compat_netbsd32_sysvipc_14 \ { int|netbsd32||__semctl(int semid, int semnum, \ int cmd, netbsd32_semunu_t arg); } 221 STD MODULAR compat_netbsd32_sysvipc \ @@ -501,7 +501,7 @@ netbsd32_sembufp_t sops, netbsd32_size_t nsops); } 223 STD MODULAR compat_netbsd32_sysvipc \ { int|netbsd32||semconfig(int flag); } -224 COMPAT_14 MODULAR compat_netbsd32_sysvipc \ +224 COMPAT_14 MODULAR compat_netbsd32_sysvipc_14 \ { int|netbsd32||msgctl(int msqid, int cmd, \ netbsd32_msqid_ds14p_t buf); } 225 STD MODULAR compat_netbsd32_sysvipc \ @@ -516,7 +516,7 @@ 228 STD MODULAR compat_netbsd32_sysvipc \ { netbsd32_voidp|netbsd32||shmat(int shmid, \ netbsd32_voidp shmaddr, int shmflg); } -229 COMPAT_14 MODULAR compat_netbsd32_sysvipc \ +229 COMPAT_14 MODULAR compat_netbsd32_sysvipc_14 \ { int|netbsd32||shmctl(int shmid, int cmd, \ netbsd32_shmid_dsp_t buf); } 230 STD MODULAR compat_netbsd32_sysvipc \ @@ -693,13 +693,13 @@ 300 COMPAT_20 MODULAR compat_netbsd32_20 \ { int|netbsd32||fhstatfs(netbsd32_fhandlep_t fhp, \ netbsd32_stat50p_t buf); } -301 COMPAT_50 MODULAR compat_netbsd32_sysvipc \ +301 COMPAT_50 MODULAR compat_netbsd32_sysvipc_50 \ { int|netbsd32|14|semctl(int semid, int semnum, \ int cmd, ... netbsd32_semun50p_t arg); } -302 COMPAT_50 MODULAR compat_netbsd32_sysvipc \ +302 COMPAT_50 MODULAR compat_netbsd32_sysvipc_50 \ { int|netbsd32|13|msgctl(int msqid, int cmd, \ netbsd32_msqid_ds50p_t buf); } -303 COMPAT_50 MODULAR compat_netbsd32_sysvipc \ +303 COMPAT_50 MODULAR compat_netbsd32_sysvipc_50 \ { int|netbsd32|13|shmctl(int shmid, int cmd, \ netbsd32_shmid_ds50p_t buf); } 304 STD { int|netbsd32||lchflags(netbsd32_charp path, \
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 03:21:14 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Prepare for splitting compat_netbsd32_sysvipc into version-specific modules To generate a diff of this commit: cvs rdiff -u -r1.120.2.12 -r1.120.2.13 \ src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 00:22:26 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.8 -r1.134.2.9 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.7 -r1.134.2.8 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.8 -r1.132.2.9 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.7 -r1.13.2.8 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.7 -r1.132.2.8 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.7 -r1.24.2.8 \ 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.134.2.8 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.9 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.8 Wed Sep 12 00:00:31 2018 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Sep 12 00:22:26 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.134.2.8 2018/09/12 00:00:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.134.2.9 2018/09/12 00:22:26 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -73,8 +73,8 @@ /* syscall: "getpid" ret: "pid_t" args: */ #define NETBSD32_SYS_getpid 20 -/* syscall: "netbsd32_mount" ret: "int" args: "netbsd32_charp" "netbsd32_charp" "int" "netbsd32_voidp" */ -#define NETBSD32_SYS_netbsd32_mount 21 +/* syscall: "compat_40_netbsd32_mount" ret: "int" args: "netbsd32_charp" "netbsd32_charp" "int" "netbsd32_voidp" */ +#define NETBSD32_SYS_compat_40_netbsd32_mount 21 /* syscall: "netbsd32_unmount" ret: "int" args: "netbsd32_charp" "int" */ #define NETBSD32_SYS_netbsd32_unmount 22 Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.7 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.8 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.7 Wed Sep 12 00:00:31 2018 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Sep 12 00:22:26 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.7 2018/09/12 00:00:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.8 2018/09/12 00:22:26 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -144,13 +144,13 @@ struct compat_43_netbsd32_olseek_args { }; check_syscall_args(compat_43_netbsd32_olseek) -struct netbsd32_mount_args { +struct compat_40_netbsd32_mount_args { syscallarg(netbsd32_charp) type; syscallarg(netbsd32_charp) path; syscallarg(int) flags; syscallarg(netbsd32_voidp) data; }; -check_syscall_args(netbsd32_mount) +check_syscall_args(compat_40_netbsd32_mount) struct netbsd32_unmount_args { syscallarg(netbsd32_charp) path; @@ -2663,7 +2663,7 @@ int compat_43_netbsd32_olseek(struct lwp int sys_getpid(struct lwp *, const void *, register_t *); -int netbsd32_mount(struct lwp *, const struct netbsd32_mount_args *, register_t *); +int compat_40_netbsd32_mount(struct lwp *, const struct compat_40_netbsd32_mount_args *, register_t *); int netbsd32_unmount(struct lwp *, const struct netbsd32_unmount_args *, register_t *); Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.8 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.9 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.8 Wed Sep 12 00:00:31 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Sep 12 00:22:26 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.8 2018/09/12 00:00:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.9 2018/09/12 00:22:26 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.8 2018/09/12 00:00:31 pgoyette Exp $");
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 00:22:26 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.8 -r1.134.2.9 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.7 -r1.134.2.8 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.8 -r1.132.2.9 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.7 -r1.13.2.8 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.7 -r1.132.2.8 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.7 -r1.24.2.8 \ 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.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 00:20:53 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: The netbsd32 40 mount code belongs in a netbsd32 40 module To generate a diff of this commit: cvs rdiff -u -r1.120.2.11 -r1.120.2.12 \ src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 00:20:53 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: The netbsd32 40 mount code belongs in a netbsd32 40 module To generate a diff of this commit: cvs rdiff -u -r1.120.2.11 -r1.120.2.12 \ src/sys/compat/netbsd32/syscalls.master 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/syscalls.master diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.11 src/sys/compat/netbsd32/syscalls.master:1.120.2.12 --- src/sys/compat/netbsd32/syscalls.master:1.120.2.11 Tue Sep 11 23:58:46 2018 +++ src/sys/compat/netbsd32/syscalls.master Wed Sep 12 00:20:53 2018 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp $ + $NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp $ ; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -96,7 +96,8 @@ { netbsd32_long|netbsd32||olseek(int fd, \ netbsd32_long offset, int whence); } 20 NOARGS { pid_t|sys||getpid(void); } -21 STD { int|netbsd32||mount(netbsd32_charp type, \ +21 COMPAT_40 MODULAR compat_netbsd32_40 \ + { int|netbsd32||mount(netbsd32_charp type, \ netbsd32_charp path, int flags, \ netbsd32_voidp data); } 22 STD { int|netbsd32||unmount(netbsd32_charp path, \
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 00:00:32 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen with updated module information for ntp 30 and 50 compat calls To generate a diff of this commit: cvs rdiff -u -r1.134.2.7 -r1.134.2.8 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.6 -r1.134.2.7 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.7 -r1.132.2.8 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.6 -r1.13.2.7 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.6 -r1.132.2.7 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.6 -r1.24.2.7 \ 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.134.2.7 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.8 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.7 Tue Sep 11 08:36:29 2018 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Sep 12 00:00:31 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.134.2.7 2018/09/11 08:36:29 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.134.2.8 2018/09/12 00:00:31 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.6 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.7 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.6 Tue Sep 11 08:36:29 2018 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Sep 12 00:00:31 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.6 2018/09/11 08:36:29 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.7 2018/09/12 00:00:31 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.7 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.8 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.7 Tue Sep 11 08:36:29 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Sep 12 00:00:31 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.7 2018/09/11 08:36:29 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.8 2018/09/12 00:00:31 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.7 2018/09/11 08:36:29 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.8 2018/09/12 00:00:31 pgoyette Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.6 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.7 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.6 Tue Sep 11 08:36:29 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed Sep 12 00:00:31 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.6 2018/09/11 08:36:29 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.7 2018/09/12 00:00:31 pgoyette Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.6 2018/09/11 08:36:29 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.7 2018/09/12 00:00:31 pgoyette Exp $"); #include static struct sc_autoload netbsd32_syscalls_autoload[] = { @@ -69,6 +69,7 @@ static struct sc_autoload
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 00:00:32 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen with updated module information for ntp 30 and 50 compat calls To generate a diff of this commit: cvs rdiff -u -r1.134.2.7 -r1.134.2.8 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.6 -r1.134.2.7 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.7 -r1.132.2.8 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.6 -r1.13.2.7 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.6 -r1.132.2.7 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.6 -r1.24.2.7 \ 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.
re: CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
On Wed, 12 Sep 2018, matthew green wrote: Module Name:src Committed By: pgoyette Date: Tue Sep 11 05:00:42 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: files.netbsd32 netbsd32_compat_09.c netbsd32_compat_12.c netbsd32_compat_13.c netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_50.c netbsd32_compat_60.c Log Message: Also need to declare the emul_netbsd32 ! can you put this in a header so it isn't 'extern'd in every file? Done. Test building now to make sure it gets #included everywhere needed. +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Tue Sep 11 21:18:33 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_compat_09.c netbsd32_compat_12.c netbsd32_compat_13.c netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_43.c netbsd32_compat_50.c netbsd32_compat_60.c netbsd32_exec.h netbsd32_ipc.c netbsd32_mqueue.c netbsd32_nfssvc.c netbsd32_ptrace.c Log Message: Put the ``extern struct emul'' into the netbsd32_netbsd.h header so it doesn't have to be separately declared in each source file. Thanks mrg@ To generate a diff of this commit: cvs rdiff -u -r1.116.2.3 -r1.116.2.4 src/sys/compat/netbsd32/netbsd32.h cvs rdiff -u -r1.18.86.4 -r1.18.86.5 \ src/sys/compat/netbsd32/netbsd32_compat_09.c cvs rdiff -u -r1.33.36.6 -r1.33.36.7 \ src/sys/compat/netbsd32/netbsd32_compat_12.c cvs rdiff -u -r1.26.28.5 -r1.26.28.6 \ src/sys/compat/netbsd32/netbsd32_compat_13.c cvs rdiff -u -r1.36.10.7 -r1.36.10.8 \ src/sys/compat/netbsd32/netbsd32_compat_20.c cvs rdiff -u -r1.31.16.6 -r1.31.16.7 \ src/sys/compat/netbsd32/netbsd32_compat_30.c cvs rdiff -u -r1.54.14.4 -r1.54.14.5 \ src/sys/compat/netbsd32/netbsd32_compat_43.c cvs rdiff -u -r1.32.16.5 -r1.32.16.6 \ src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.3.2.5 -r1.3.2.6 src/sys/compat/netbsd32/netbsd32_compat_60.c cvs rdiff -u -r1.33 -r1.33.12.1 src/sys/compat/netbsd32/netbsd32_exec.h cvs rdiff -u -r1.18.16.2 -r1.18.16.3 src/sys/compat/netbsd32/netbsd32_ipc.c cvs rdiff -u -r1.6.18.2 -r1.6.18.3 src/sys/compat/netbsd32/netbsd32_mqueue.c cvs rdiff -u -r1.5 -r1.5.16.1 src/sys/compat/netbsd32/netbsd32_nfssvc.c cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/compat/netbsd32/netbsd32_ptrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Tue Sep 11 21:18:33 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_compat_09.c netbsd32_compat_12.c netbsd32_compat_13.c netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_43.c netbsd32_compat_50.c netbsd32_compat_60.c netbsd32_exec.h netbsd32_ipc.c netbsd32_mqueue.c netbsd32_nfssvc.c netbsd32_ptrace.c Log Message: Put the ``extern struct emul'' into the netbsd32_netbsd.h header so it doesn't have to be separately declared in each source file. Thanks mrg@ To generate a diff of this commit: cvs rdiff -u -r1.116.2.3 -r1.116.2.4 src/sys/compat/netbsd32/netbsd32.h cvs rdiff -u -r1.18.86.4 -r1.18.86.5 \ src/sys/compat/netbsd32/netbsd32_compat_09.c cvs rdiff -u -r1.33.36.6 -r1.33.36.7 \ src/sys/compat/netbsd32/netbsd32_compat_12.c cvs rdiff -u -r1.26.28.5 -r1.26.28.6 \ src/sys/compat/netbsd32/netbsd32_compat_13.c cvs rdiff -u -r1.36.10.7 -r1.36.10.8 \ src/sys/compat/netbsd32/netbsd32_compat_20.c cvs rdiff -u -r1.31.16.6 -r1.31.16.7 \ src/sys/compat/netbsd32/netbsd32_compat_30.c cvs rdiff -u -r1.54.14.4 -r1.54.14.5 \ src/sys/compat/netbsd32/netbsd32_compat_43.c cvs rdiff -u -r1.32.16.5 -r1.32.16.6 \ src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.3.2.5 -r1.3.2.6 src/sys/compat/netbsd32/netbsd32_compat_60.c cvs rdiff -u -r1.33 -r1.33.12.1 src/sys/compat/netbsd32/netbsd32_exec.h cvs rdiff -u -r1.18.16.2 -r1.18.16.3 src/sys/compat/netbsd32/netbsd32_ipc.c cvs rdiff -u -r1.6.18.2 -r1.6.18.3 src/sys/compat/netbsd32/netbsd32_mqueue.c cvs rdiff -u -r1.5 -r1.5.16.1 src/sys/compat/netbsd32/netbsd32_nfssvc.c cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/compat/netbsd32/netbsd32_ptrace.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.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.3 src/sys/compat/netbsd32/netbsd32.h:1.116.2.4 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.3 Thu Sep 6 06:55:46 2018 +++ src/sys/compat/netbsd32/netbsd32.h Tue Sep 11 21:18:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.3 2018/09/06 06:55:46 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.4 2018/09/11 21:18:32 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -1164,4 +1164,12 @@ struct iovec *netbsd32_get_iov(struct ne #ifdef SYSCTL_SETUP_PROTO SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_setup); #endif /* SYSCTL_SETUP_PROTO */ + +/* + * Finally, declare emul_netbsd32 as this is needed in lots of + * places when calling syscall_{,dis}establish() + */ + +extern struct emul emul_netbsd32; + #endif /* _COMPAT_NETBSD32_NETBSD32_H_ */ Index: src/sys/compat/netbsd32/netbsd32_compat_09.c diff -u src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.4 src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.5 --- src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.4 Tue Sep 11 05:00:42 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_09.c Tue Sep 11 21:18:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.4 2018/09/11 05:00:42 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.5 2018/09/11 21:18:32 pgoyette Exp $ */ /* * Copyright (c) 1998 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.4 2018/09/11 05:00:42 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.5 2018/09/11 21:18:32 pgoyette Exp $"); #include #include @@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com #include #include -extern struct emul emul_netbsd32; - int compat_09_netbsd32_ogetdomainname(struct lwp *l, const struct compat_09_netbsd32_ogetdomainname_args *uap, register_t *retval) { Index: src/sys/compat/netbsd32/netbsd32_compat_12.c diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.6 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.7 --- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.6 Tue Sep 11 05:00:42 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_12.c Tue Sep 11 21:18:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.6 2018/09/11 05:00:42 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.7 2018/09/11 21:18:32 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.6 2018/09/11 05:00:42 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.7 2018/09/11 21:18:32 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com #include #include -extern struct emul emul_netbsd32; - static void netbsd32_stat12_to_netbsd32(struct stat12 *, struct netbsd32_stat12 *); Index:
re: CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
"Paul Goyette" writes: > Module Name: src > Committed By: pgoyette > Date: Tue Sep 11 05:00:42 UTC 2018 > > Modified Files: > src/sys/compat/netbsd32 [pgoyette-compat]: files.netbsd32 > netbsd32_compat_09.c netbsd32_compat_12.c netbsd32_compat_13.c > netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_50.c > netbsd32_compat_60.c > > Log Message: > Also need to declare the emul_netbsd32 ! can you put this in a header so it isn't 'extern'd in every file? .mrg.