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 <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.8 2018/09/12 00:00:31 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.9 2018/09/12 00:22:26 pgoyette Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -49,7 +49,7 @@ const char *const netbsd32_syscallnames[ /* 18 */ "compat_20_netbsd32_getfsstat", /* 19 */ "compat_43_netbsd32_olseek", /* 20 */ "getpid", - /* 21 */ "netbsd32_mount", + /* 21 */ "compat_40_netbsd32_mount", /* 22 */ "netbsd32_unmount", /* 23 */ "netbsd32_setuid", /* 24 */ "getuid", @@ -579,7 +579,7 @@ const char *const altnetbsd32_syscallnam /* 18 */ NULL, /* compat_20_netbsd32_getfsstat */ /* 19 */ NULL, /* compat_43_netbsd32_olseek */ /* 20 */ NULL, /* getpid */ - /* 21 */ "mount", + /* 21 */ NULL, /* compat_40_netbsd32_mount */ /* 22 */ "unmount", /* 23 */ "setuid", /* 24 */ NULL, /* getuid */ Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.7 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.8 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.7 Wed Sep 12 00:00:31 2018 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed Sep 12 00:22:26 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.7 2018/09/12 00:00:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.8 2018/09/12 00:22:26 pgoyette Exp $ */ /* * System call autoload table. * * 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 <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.7 2018/09/12 00:00:31 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.8 2018/09/12 00:22:26 pgoyette Exp $"); #include <sys/proc.h> static struct sc_autoload netbsd32_syscalls_autoload[] = { @@ -17,6 +17,7 @@ static struct sc_autoload netbsd32_sysca { NETBSD32_SYS_compat_50_netbsd32_mknod, "compat_netbsd32_50" }, { NETBSD32_SYS_compat_20_netbsd32_getfsstat, "compat_netbsd32_20" }, { NETBSD32_SYS_compat_43_netbsd32_olseek, "compat_netbsd32_43" }, + { NETBSD32_SYS_compat_40_netbsd32_mount, "compat_netbsd32_40" }, { NETBSD32_SYS_netbsd32_ptrace, "compat_netbsd32_ptrace" }, { NETBSD32_SYS_compat_43_netbsd32_stat43, "compat_netbsd32_43" }, { NETBSD32_SYS_compat_43_netbsd32_lstat43, "compat_netbsd32_43" }, Index: src/sys/compat/netbsd32/netbsd32_sysent.c diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.132.2.7 src/sys/compat/netbsd32/netbsd32_sysent.c:1.132.2.8 --- src/sys/compat/netbsd32/netbsd32_sysent.c:1.132.2.7 Wed Sep 12 00:00:31 2018 +++ src/sys/compat/netbsd32/netbsd32_sysent.c Wed Sep 12 00:22:26 2018 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_sysent.c,v 1.132.2.7 2018/09/12 00:00:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.132.2.8 2018/09/12 00:22:26 pgoyette Exp $ */ /* * System call switch table. * * 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 <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.132.2.7 2018/09/12 00:00:31 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.132.2.8 2018/09/12 00:22:26 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -207,9 +207,9 @@ struct sysent netbsd32_sysent[] = { .sy_call = (sy_call_t *)sys_getpid }, /* 20 = getpid */ { - ns(struct netbsd32_mount_args), - .sy_call = (sy_call_t *)netbsd32_mount - }, /* 21 = netbsd32_mount */ + ns(struct compat_40_netbsd32_mount_args), + .sy_call = (sy_call_t *)sys_nomodule + }, /* 21 = compat_40_netbsd32_mount */ { ns(struct netbsd32_unmount_args), .sy_call = (sy_call_t *)netbsd32_unmount @@ -2080,7 +2080,7 @@ struct sysent netbsd32_sysent[] = { }; const uint32_t netbsd32_sysent_nomodbits[] = { - 0x040c4180, /* syscalls 0- 31 */ + 0x042c4180, /* syscalls 0- 31 */ 0xc0a10140, /* syscalls 32- 63 */ 0x21e80082, /* syscalls 64- 95 */ 0x2437e06a, /* syscalls 96-127 */ Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.7 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.8 --- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.7 Wed Sep 12 00:00:31 2018 +++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Wed Sep 12 00:22:26 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_systrace_args.c,v 1.24.2.7 2018/09/12 00:00:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_systrace_args.c,v 1.24.2.8 2018/09/12 00:22:26 pgoyette Exp $ */ /* * System call argument to DTrace register array converstion. @@ -171,7 +171,7 @@ systrace_args(register_t sysnum, const v } /* netbsd32_mount */ case 21: { - const struct netbsd32_mount_args *p = params; + const struct compat_40_netbsd32_mount_args *p = params; uarg[0] = (intptr_t) SCARG(p, type).i32; /* netbsd32_charp */ uarg[1] = (intptr_t) SCARG(p, path).i32; /* netbsd32_charp */ iarg[2] = SCARG(p, flags); /* int */