CVS commit: src/sys/dev/fdt
Module Name:src Committed By: skrll Date: Tue Jul 11 05:57:44 UTC 2023 Modified Files: src/sys/dev/fdt: fdt_boot.c Log Message: G/C some #if 0 / #endif code To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/fdt/fdt_boot.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/dev/fdt/fdt_boot.c diff -u src/sys/dev/fdt/fdt_boot.c:1.3 src/sys/dev/fdt/fdt_boot.c:1.4 --- src/sys/dev/fdt/fdt_boot.c:1.3 Mon Jul 10 07:01:48 2023 +++ src/sys/dev/fdt/fdt_boot.c Tue Jul 11 05:57:44 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: fdt_boot.c,v 1.3 2023/07/10 07:01:48 rin Exp $ */ +/* $NetBSD: fdt_boot.c,v 1.4 2023/07/11 05:57:44 skrll Exp $ */ /*- * Copyright (c) 2015-2017 Jared McNeill @@ -56,7 +56,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fdt_boot.c,v 1.3 2023/07/10 07:01:48 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdt_boot.c,v 1.4 2023/07/11 05:57:44 skrll Exp $"); #include "opt_efi.h" #include "opt_md.h" @@ -82,9 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_boot.c,v #include #include -#if 0 -#include -#endif #include #ifndef FDT_MAX_BOOT_STRING
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: skrll Date: Tue Jul 11 05:57:44 UTC 2023 Modified Files: src/sys/dev/fdt: fdt_boot.c Log Message: G/C some #if 0 / #endif code To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/fdt/fdt_boot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist
Module Name:src Committed By: mrg Date: Tue Jul 11 00:40:43 UTC 2023 Modified Files: src/external/gpl3/gcc/dist: LAST_UPDATED MD5SUMS NEWS src/external/gpl3/gcc/dist/INSTALL: binaries.html build.html configure.html download.html finalinstall.html gfdl.html index.html old.html prerequisites.html specific.html test.html src/external/gpl3/gcc/dist/gcc: ChangeLog builtins.c config.gcc expr.c gcc.c ira-color.c tree-ssa-ccp.c tree.c tree.h varasm.c src/external/gpl3/gcc/dist/gcc/config/aarch64: aarch64.h driver-aarch64.c src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000-logue.c rs6000.c src/external/gpl3/gcc/dist/gcc/cp: decl.c src/external/gpl3/gcc/dist/gcc/doc: cpp.1 cpp.info cppinternals.info cppopts.texi extend.texi fsf-funding.7 g++.1 gcc.1 gcc.info gccinstall.info gccint.info gcov-tool.1 gcov.1 gfdl.7 gfortran.1 gpl.7 invoke.texi src/external/gpl3/gcc/dist/libgcc: config.host src/external/gpl3/gcc/dist/libgomp: libgomp.info src/external/gpl3/gcc/dist/libsanitizer: ChangeLog configure.tgt Log Message: merge GCC 10.5.0. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/dist/LAST_UPDATED \ src/external/gpl3/gcc/dist/MD5SUMS cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/dist/NEWS cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/dist/INSTALL/binaries.html \ src/external/gpl3/gcc/dist/INSTALL/finalinstall.html \ src/external/gpl3/gcc/dist/INSTALL/gfdl.html \ src/external/gpl3/gcc/dist/INSTALL/index.html \ src/external/gpl3/gcc/dist/INSTALL/old.html \ src/external/gpl3/gcc/dist/INSTALL/test.html cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/dist/INSTALL/build.html \ src/external/gpl3/gcc/dist/INSTALL/configure.html \ src/external/gpl3/gcc/dist/INSTALL/prerequisites.html cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/dist/INSTALL/download.html \ src/external/gpl3/gcc/dist/INSTALL/specific.html cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/gcc/dist/gcc/ChangeLog cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/dist/gcc/builtins.c cvs rdiff -u -r1.71 -r1.72 src/external/gpl3/gcc/dist/gcc/config.gcc cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gcc/dist/gcc/expr.c cvs rdiff -u -r1.24 -r1.25 src/external/gpl3/gcc/dist/gcc/gcc.c cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/ira-color.c cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/tree.c \ src/external/gpl3/gcc/dist/gcc/tree.h cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/dist/gcc/varasm.c cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/gcc/dist/gcc/config/aarch64/driver-aarch64.c cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000-logue.c cvs rdiff -u -r1.31 -r1.32 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/cp/decl.c cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/dist/gcc/doc/cpp.1 \ src/external/gpl3/gcc/dist/gcc/doc/gccint.info \ src/external/gpl3/gcc/dist/gcc/doc/gcov.1 cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/dist/gcc/doc/cpp.info \ src/external/gpl3/gcc/dist/gcc/doc/gcc.info cvs rdiff -u -r1.17 -r1.18 \ src/external/gpl3/gcc/dist/gcc/doc/cppinternals.info \ src/external/gpl3/gcc/dist/gcc/doc/g++.1 \ src/external/gpl3/gcc/dist/gcc/doc/gcc.1 \ src/external/gpl3/gcc/dist/gcc/doc/gccinstall.info cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/doc/cppopts.texi \ src/external/gpl3/gcc/dist/gcc/doc/extend.texi cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/dist/gcc/doc/fsf-funding.7 \ src/external/gpl3/gcc/dist/gcc/doc/gfdl.7 \ src/external/gpl3/gcc/dist/gcc/doc/gpl.7 cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/dist/gcc/doc/gcov-tool.1 cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/dist/gcc/doc/gfortran.1 cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/dist/gcc/doc/invoke.texi cvs rdiff -u -r1.32 -r1.33 src/external/gpl3/gcc/dist/libgcc/config.host cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/dist/libgomp/libgomp.info cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/libsanitizer/ChangeLog cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/dist/libsanitizer/configure.tgt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/external/gpl3/gcc/dist
Module Name:src Committed By: mrg Date: Tue Jul 11 00:40:43 UTC 2023 Modified Files: src/external/gpl3/gcc/dist: LAST_UPDATED MD5SUMS NEWS src/external/gpl3/gcc/dist/INSTALL: binaries.html build.html configure.html download.html finalinstall.html gfdl.html index.html old.html prerequisites.html specific.html test.html src/external/gpl3/gcc/dist/gcc: ChangeLog builtins.c config.gcc expr.c gcc.c ira-color.c tree-ssa-ccp.c tree.c tree.h varasm.c src/external/gpl3/gcc/dist/gcc/config/aarch64: aarch64.h driver-aarch64.c src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000-logue.c rs6000.c src/external/gpl3/gcc/dist/gcc/cp: decl.c src/external/gpl3/gcc/dist/gcc/doc: cpp.1 cpp.info cppinternals.info cppopts.texi extend.texi fsf-funding.7 g++.1 gcc.1 gcc.info gccinstall.info gccint.info gcov-tool.1 gcov.1 gfdl.7 gfortran.1 gpl.7 invoke.texi src/external/gpl3/gcc/dist/libgcc: config.host src/external/gpl3/gcc/dist/libgomp: libgomp.info src/external/gpl3/gcc/dist/libsanitizer: ChangeLog configure.tgt Log Message: merge GCC 10.5.0. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/dist/LAST_UPDATED \ src/external/gpl3/gcc/dist/MD5SUMS cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/dist/NEWS cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/dist/INSTALL/binaries.html \ src/external/gpl3/gcc/dist/INSTALL/finalinstall.html \ src/external/gpl3/gcc/dist/INSTALL/gfdl.html \ src/external/gpl3/gcc/dist/INSTALL/index.html \ src/external/gpl3/gcc/dist/INSTALL/old.html \ src/external/gpl3/gcc/dist/INSTALL/test.html cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/dist/INSTALL/build.html \ src/external/gpl3/gcc/dist/INSTALL/configure.html \ src/external/gpl3/gcc/dist/INSTALL/prerequisites.html cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/dist/INSTALL/download.html \ src/external/gpl3/gcc/dist/INSTALL/specific.html cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/gcc/dist/gcc/ChangeLog cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/dist/gcc/builtins.c cvs rdiff -u -r1.71 -r1.72 src/external/gpl3/gcc/dist/gcc/config.gcc cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gcc/dist/gcc/expr.c cvs rdiff -u -r1.24 -r1.25 src/external/gpl3/gcc/dist/gcc/gcc.c cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/ira-color.c cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/tree.c \ src/external/gpl3/gcc/dist/gcc/tree.h cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/dist/gcc/varasm.c cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/gcc/dist/gcc/config/aarch64/driver-aarch64.c cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000-logue.c cvs rdiff -u -r1.31 -r1.32 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/cp/decl.c cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/dist/gcc/doc/cpp.1 \ src/external/gpl3/gcc/dist/gcc/doc/gccint.info \ src/external/gpl3/gcc/dist/gcc/doc/gcov.1 cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/dist/gcc/doc/cpp.info \ src/external/gpl3/gcc/dist/gcc/doc/gcc.info cvs rdiff -u -r1.17 -r1.18 \ src/external/gpl3/gcc/dist/gcc/doc/cppinternals.info \ src/external/gpl3/gcc/dist/gcc/doc/g++.1 \ src/external/gpl3/gcc/dist/gcc/doc/gcc.1 \ src/external/gpl3/gcc/dist/gcc/doc/gccinstall.info cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/doc/cppopts.texi \ src/external/gpl3/gcc/dist/gcc/doc/extend.texi cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/dist/gcc/doc/fsf-funding.7 \ src/external/gpl3/gcc/dist/gcc/doc/gfdl.7 \ src/external/gpl3/gcc/dist/gcc/doc/gpl.7 cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/dist/gcc/doc/gcov-tool.1 cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/dist/gcc/doc/gfortran.1 cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/dist/gcc/doc/invoke.texi cvs rdiff -u -r1.32 -r1.33 src/external/gpl3/gcc/dist/libgcc/config.host cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/dist/libgomp/libgomp.info cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/libsanitizer/ChangeLog cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/dist/libsanitizer/configure.tgt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: uwe Date: Mon Jul 10 23:55:14 UTC 2023 Modified Files: src/share/man/man9: versioningsyscalls.9 Log Message: versioningsyscalls(9): wrap long line in the example To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/versioningsyscalls.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: uwe Date: Mon Jul 10 23:55:14 UTC 2023 Modified Files: src/share/man/man9: versioningsyscalls.9 Log Message: versioningsyscalls(9): wrap long line in the example To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/versioningsyscalls.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/versioningsyscalls.9 diff -u src/share/man/man9/versioningsyscalls.9:1.3 src/share/man/man9/versioningsyscalls.9:1.4 --- src/share/man/man9/versioningsyscalls.9:1.3 Mon Jul 10 15:54:18 2023 +++ src/share/man/man9/versioningsyscalls.9 Mon Jul 10 23:55:13 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: versioningsyscalls.9,v 1.3 2023/07/10 15:54:18 christos Exp $ +.\" $NetBSD: versioningsyscalls.9,v 1.4 2023/07/10 23:55:13 uwe Exp $ .\" .\" Copyright (c) 2023 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -325,11 +325,12 @@ syscall will be Overall, .Pa lib/libc/compat/sys/compat_my_syscall.c must at the minimum include -.Bd -literal +.Bd -literal -offset indent #include __warn_references(my_syscall, -"warning: reference to compatibility my_syscall(); message on how to use the next my_syscall()"); +"warning: reference to compatibility my_syscall();" +" message on how to use the next my_syscall()"); int my_syscall()
CVS commit: src/sys/compat/linux/arch/aarch64
Module Name:src
Committed By: christos
Date: Mon Jul 10 21:08:37 UTC 2023
Modified Files:
src/sys/compat/linux/arch/aarch64: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c linux_systrace_args.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/arch/aarch64/linux_syscall.h \
src/sys/compat/linux/arch/aarch64/linux_syscallargs.h \
src/sys/compat/linux/arch/aarch64/linux_syscalls.c \
src/sys/compat/linux/arch/aarch64/linux_sysent.c \
src/sys/compat/linux/arch/aarch64/linux_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/linux/arch/aarch64/linux_syscall.h
diff -u src/sys/compat/linux/arch/aarch64/linux_syscall.h:1.4 src/sys/compat/linux/arch/aarch64/linux_syscall.h:1.5
--- src/sys/compat/linux/arch/aarch64/linux_syscall.h:1.4 Wed Dec 1 23:39:44 2021
+++ src/sys/compat/linux/arch/aarch64/linux_syscall.h Mon Jul 10 17:08:37 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.4 2021/12/02 04:39:44 ryo Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.5 2023/07/10 21:08:37 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.3 2021/11/25 02:29:33 ryo Exp
+ * created from NetBSD: syscalls.master,v 1.5 2023/07/10 21:08:26 christos Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -588,6 +588,9 @@
/* syscall: "getrandom" ret: "ssize_t" args: "void *" "size_t" "unsigned int" */
#define LINUX_SYS_getrandom 278
+/* syscall: "memfd_create" ret: "int" args: "const char *" "unsigned int" */
+#define LINUX_SYS_memfd_create 279
+
/* syscall: "statx" ret: "int" args: "int" "const char *" "int" "unsigned int" "struct linux_statx *" */
#define LINUX_SYS_statx 291
Index: src/sys/compat/linux/arch/aarch64/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/aarch64/linux_syscallargs.h:1.4 src/sys/compat/linux/arch/aarch64/linux_syscallargs.h:1.5
--- src/sys/compat/linux/arch/aarch64/linux_syscallargs.h:1.4 Wed Dec 1 23:39:44 2021
+++ src/sys/compat/linux/arch/aarch64/linux_syscallargs.h Mon Jul 10 17:08:37 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.4 2021/12/02 04:39:44 ryo Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.5 2023/07/10 21:08:37 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.3 2021/11/25 02:29:33 ryo Exp
+ * created from NetBSD: syscalls.master,v 1.5 2023/07/10 21:08:26 christos Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -975,6 +975,12 @@ check_syscall_args(linux_sys_sendmmsg)
struct sys_getrandom_args;
+struct linux_sys_memfd_create_args {
+ syscallarg(const char *) name;
+ syscallarg(unsigned int) flags;
+};
+check_syscall_args(linux_sys_memfd_create)
+
struct linux_sys_statx_args {
syscallarg(int) fd;
syscallarg(const char *) path;
@@ -1375,6 +1381,8 @@ int linux_sys_sendmmsg(struct lwp *, con
int sys_getrandom(struct lwp *, const struct sys_getrandom_args *, register_t *);
+int linux_sys_memfd_create(struct lwp *, const struct linux_sys_memfd_create_args *, register_t *);
+
int linux_sys_statx(struct lwp *, const struct linux_sys_statx_args *, register_t *);
int linux_sys_nosys(struct lwp *, const void *, register_t *);
Index: src/sys/compat/linux/arch/aarch64/linux_syscalls.c
diff -u src/sys/compat/linux/arch/aarch64/linux_syscalls.c:1.4 src/sys/compat/linux/arch/aarch64/linux_syscalls.c:1.5
--- src/sys/compat/linux/arch/aarch64/linux_syscalls.c:1.4 Wed Dec 1 23:39:44 2021
+++ src/sys/compat/linux/arch/aarch64/linux_syscalls.c Mon Jul 10 17:08:37 2023
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.4 2021/12/02 04:39:44 ryo Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.5 2023/07/10 21:08:37 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.3 2021/11/25 02:29:33 ryo Exp
+ * created from NetBSD: syscalls.master,v 1.5 2023/07/10 21:08:26 christos Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.4 2021/12/02 04:39:44 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.5 2023/07/10 21:08:37 christos Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -340,7 +340,7 @@ const char *const linux_syscallnames[] =
/* 276 */ "#276 (unimplemented renameat2)",
/* 277 */ "#277 (unimplemented seccomp)",
/* 278 */ "getrandom",
- /* 279 */ "#279 (unimplemented memfd_create)",
+ /* 279 */ "memfd_create",
/* 280 */ "#280 (unimplemented bpf)",
/* 281 */ "#281 (unimplemented execveat)",
/* 282 */ "#282 (unimplemented userfaultfd)",
@@ -878,7 +878,7 @@ const char *const altlinux_syscallnames[
/* 276 */ NULL, /* unimplemented renameat2 */
/* 277 */ NULL, /* unimplemented
CVS commit: src/sys/compat/linux/arch/aarch64
Module Name:src Committed By: christos Date: Mon Jul 10 21:08:37 UTC 2023 Modified Files: src/sys/compat/linux/arch/aarch64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/arch/aarch64/linux_syscall.h \ src/sys/compat/linux/arch/aarch64/linux_syscallargs.h \ src/sys/compat/linux/arch/aarch64/linux_syscalls.c \ src/sys/compat/linux/arch/aarch64/linux_sysent.c \ src/sys/compat/linux/arch/aarch64/linux_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch/aarch64
Module Name:src
Committed By: christos
Date: Mon Jul 10 21:08:26 UTC 2023
Modified Files:
src/sys/compat/linux/arch/aarch64: syscalls.master
Log Message:
add memfd_create
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/arch/aarch64/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/linux/arch/aarch64/syscalls.master
diff -u src/sys/compat/linux/arch/aarch64/syscalls.master:1.4 src/sys/compat/linux/arch/aarch64/syscalls.master:1.5
--- src/sys/compat/linux/arch/aarch64/syscalls.master:1.4 Wed Dec 1 23:29:47 2021
+++ src/sys/compat/linux/arch/aarch64/syscalls.master Mon Jul 10 17:08:26 2023
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.4 2021/12/02 04:29:47 ryo Exp $
+ $NetBSD: syscalls.master,v 1.5 2023/07/10 21:08:26 christos Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -512,7 +512,8 @@
277 UNIMPL seccomp
278 NOARGS { ssize_t|sys||getrandom(void *buf, size_t buflen, \
unsigned int flags); }
-279 UNIMPL memfd_create
+279 STD { int|linux_sys||memfd_create(const char *name, \
+ unsigned int flags); }
280 UNIMPL bpf
281 UNIMPL execveat
282 UNIMPL userfaultfd
CVS commit: src/sys/compat/linux/arch/aarch64
Module Name:src Committed By: christos Date: Mon Jul 10 21:08:26 UTC 2023 Modified Files: src/sys/compat/linux/arch/aarch64: syscalls.master Log Message: add memfd_create To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/arch/aarch64/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Mon Jul 10 19:58:47 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: cgram.y err.c
Log Message:
lint: when debugging the parser, write messages on stderr
This way, all messages (regular debug, yacc debug, lint diagnostics)
occur in the correct order.
To generate a diff of this commit:
cvs rdiff -u -r1.451 -r1.452 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.209 -r1.210 src/usr.bin/xlint/lint1/err.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.451 src/usr.bin/xlint/lint1/cgram.y:1.452
--- src/usr.bin/xlint/lint1/cgram.y:1.451 Mon Jul 10 19:47:12 2023
+++ src/usr.bin/xlint/lint1/cgram.y Mon Jul 10 19:58:47 2023
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.451 2023/07/10 19:47:12 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.452 2023/07/10 19:58:47 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.451 2023/07/10 19:47:12 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.452 2023/07/10 19:58:47 rillig Exp $");
#endif
#include
@@ -160,7 +160,7 @@ is_either(const char *s, const char *a,
else
fprintf(yyo, "%Lg", $$->u.floating);
}
-%printer { fprintf(yyo, "'%s'", $$->sb_name); }
+%printer { fprintf(yyo, "'%s'", $$ != NULL ? $$->sb_name : ""); }
%printer { debug_sym("", $$, ""); }
%printer { fprintf(yyo, "%s", op_name($$)); }
%printer { fprintf(yyo, "%s", scl_name($$)); }
@@ -168,7 +168,11 @@ is_either(const char *s, const char *a,
%printer { fprintf(yyo, "%s", tqual_name($$)); }
%printer { fprintf(yyo, "%s", type_name($$)); }
%printer {
- fprintf(yyo, "%s '%s'", op_name($$->tn_op), type_name($$->tn_type));
+ if ($$ == NULL)
+ fprintf(yyo, "");
+ else
+ fprintf(yyo, "%s '%s'",
+ op_name($$->tn_op), type_name($$->tn_type));
}
%printer { fprintf(yyo, "%zu to %zu", $$.lo, $$.hi); }
%printer { fprintf(yyo, "length %zu", $$->st_len); }
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.209 src/usr.bin/xlint/lint1/err.c:1.210
--- src/usr.bin/xlint/lint1/err.c:1.209 Sun Jul 9 12:04:08 2023
+++ src/usr.bin/xlint/lint1/err.c Mon Jul 10 19:58:47 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.209 2023/07/09 12:04:08 rillig Exp $ */
+/* $NetBSD: err.c,v 1.210 2023/07/10 19:58:47 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: err.c,v 1.209 2023/07/09 12:04:08 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.210 2023/07/10 19:58:47 rillig Exp $");
#endif
#include
@@ -517,18 +517,24 @@ lbasename(const char *path)
return base;
}
+static FILE *
+output_channel(void)
+{
+ return yflag ? stderr : stdout;
+}
+
static void
verror_at(int msgid, const pos_t *pos, va_list ap)
{
- const char *fn;
if (is_suppressed[msgid])
return;
- fn = lbasename(pos->p_file);
- (void)printf("%s(%d): error: ", fn, pos->p_line);
- (void)vprintf(msgs[msgid], ap);
- (void)printf(" [%d]\n", msgid);
+ FILE *out = output_channel();
+ (void)fprintf(out, "%s(%d): error: ",
+ lbasename(pos->p_file), pos->p_line);
+ (void)vfprintf(out, msgs[msgid], ap);
+ (void)fprintf(out, " [%d]\n", msgid);
seen_error = true;
print_stack_trace();
}
@@ -536,7 +542,6 @@ verror_at(int msgid, const pos_t *pos, v
static void
vwarning_at(int msgid, const pos_t *pos, va_list ap)
{
- const char *fn;
if (is_suppressed[msgid])
return;
@@ -546,10 +551,11 @@ vwarning_at(int msgid, const pos_t *pos,
/* this warning is suppressed by a LINTED comment */
return;
- fn = lbasename(pos->p_file);
- (void)printf("%s(%d): warning: ", fn, pos->p_line);
- (void)vprintf(msgs[msgid], ap);
- (void)printf(" [%d]\n", msgid);
+ FILE *out = output_channel();
+ (void)fprintf(out, "%s(%d): warning: ",
+ lbasename(pos->p_file), pos->p_line);
+ (void)vfprintf(out, msgs[msgid], ap);
+ (void)fprintf(out, " [%d]\n", msgid);
seen_warning = true;
print_stack_trace();
}
@@ -557,15 +563,15 @@ vwarning_at(int msgid, const pos_t *pos,
static void
vmessage_at(int msgid, const pos_t *pos, va_list ap)
{
- const char *fn;
if (is_suppressed[msgid])
return;
- fn = lbasename(pos->p_file);
- (void)printf("%s(%d): ", fn, pos->p_line);
- (void)vprintf(msgs[msgid], ap);
- (void)printf(" [%d]\n", msgid);
+ FILE *out = output_channel();
+ (void)fprintf(out, "%s(%d): ",
+ lbasename(pos->p_file), pos->p_line);
+ (void)vfprintf(out, msgs[msgid], ap);
+ (void)fprintf(out, " [%d]\n", msgid);
print_stack_trace();
}
@@ -592,7 +598,6 @@ void
void
assert_failed(const char *file, int line, const char *func, const char *cond)
{
- const char *fn;
/*
* After encountering a parse error in the grammar, lint often does
@@ -607,11 +612,11 @@ assert_failed(const
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Mon Jul 10 19:58:47 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: cgram.y err.c Log Message: lint: when debugging the parser, write messages on stderr This way, all messages (regular debug, yacc debug, lint diagnostics) occur in the correct order. To generate a diff of this commit: cvs rdiff -u -r1.451 -r1.452 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.209 -r1.210 src/usr.bin/xlint/lint1/err.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Mon Jul 10 19:47:12 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: cgram.y ckbool.c debug.c lint1.h tree.c
Log Message:
lint: merge duplicate code for getting the name of an operator
To generate a diff of this commit:
cvs rdiff -u -r1.450 -r1.451 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/xlint/lint1/ckbool.c
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/xlint/lint1/debug.c
cvs rdiff -u -r1.183 -r1.184 src/usr.bin/xlint/lint1/lint1.h
cvs rdiff -u -r1.559 -r1.560 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.450 src/usr.bin/xlint/lint1/cgram.y:1.451
--- src/usr.bin/xlint/lint1/cgram.y:1.450 Mon Jul 10 19:04:52 2023
+++ src/usr.bin/xlint/lint1/cgram.y Mon Jul 10 19:47:12 2023
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.450 2023/07/10 19:04:52 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.451 2023/07/10 19:47:12 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.450 2023/07/10 19:04:52 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.451 2023/07/10 19:47:12 rillig Exp $");
#endif
#include
@@ -2223,7 +2223,7 @@ cgram_to_string(int token, YYSTYPE val)
case T_RELATIONAL:
case T_EQUALITY:
case T_OPASSIGN:
- return modtab[val.y_op].m_name;
+ return op_name(val.y_op);
case T_SCLASS:
return scl_name(val.y_scl);
case T_TYPE:
Index: src/usr.bin/xlint/lint1/ckbool.c
diff -u src/usr.bin/xlint/lint1/ckbool.c:1.24 src/usr.bin/xlint/lint1/ckbool.c:1.25
--- src/usr.bin/xlint/lint1/ckbool.c:1.24 Sun Jul 9 10:42:07 2023
+++ src/usr.bin/xlint/lint1/ckbool.c Mon Jul 10 19:47:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ckbool.c,v 1.24 2023/07/09 10:42:07 rillig Exp $ */
+/* $NetBSD: ckbool.c,v 1.25 2023/07/10 19:47:12 rillig Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: ckbool.c,v 1.24 2023/07/09 10:42:07 rillig Exp $");
+__RCSID("$NetBSD: ckbool.c,v 1.25 2023/07/10 19:47:12 rillig Exp $");
#endif
#include
@@ -50,12 +50,6 @@ __RCSID("$NetBSD: ckbool.c,v 1.24 2023/0
*/
-static const char *
-op_name(op_t op)
-{
- return modtab[op].m_name;
-}
-
/*
* See if in strict bool mode, the operator takes either two bool operands
* or two arbitrary other operands.
Index: src/usr.bin/xlint/lint1/debug.c
diff -u src/usr.bin/xlint/lint1/debug.c:1.48 src/usr.bin/xlint/lint1/debug.c:1.49
--- src/usr.bin/xlint/lint1/debug.c:1.48 Mon Jul 10 16:20:52 2023
+++ src/usr.bin/xlint/lint1/debug.c Mon Jul 10 19:47:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.c,v 1.48 2023/07/10 16:20:52 rillig Exp $ */
+/* $NetBSD: debug.c,v 1.49 2023/07/10 19:47:12 rillig Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: debug.c,v 1.48 2023/07/10 16:20:52 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.49 2023/07/10 19:47:12 rillig Exp $");
#endif
#include
@@ -166,7 +166,7 @@ debug_node(const tnode_t *tn) // NOLINT(
op = tn->tn_op;
debug_print_indent();
debug_printf("'%s'",
- op == CVT && !tn->tn_cast ? "convert" : modtab[op].m_name);
+ op == CVT && !tn->tn_cast ? "convert" : op_name(op));
if (op == NAME)
debug_printf(" '%s' with %s",
tn->tn_sym->s_name,
Index: src/usr.bin/xlint/lint1/lint1.h
diff -u src/usr.bin/xlint/lint1/lint1.h:1.183 src/usr.bin/xlint/lint1/lint1.h:1.184
--- src/usr.bin/xlint/lint1/lint1.h:1.183 Mon Jul 10 19:00:33 2023
+++ src/usr.bin/xlint/lint1/lint1.h Mon Jul 10 19:47:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lint1.h,v 1.183 2023/07/10 19:00:33 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.184 2023/07/10 19:47:12 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -551,6 +551,12 @@ is_nonzero(const tnode_t *tn)
return tn != NULL && tn->tn_op == CON && is_nonzero_val(>tn_val);
}
+static inline const char *
+op_name(op_t op)
+{
+ return modtab[op].m_name;
+}
+
static inline bool
is_binary(const tnode_t *tn)
{
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.559 src/usr.bin/xlint/lint1/tree.c:1.560
--- src/usr.bin/xlint/lint1/tree.c:1.559 Mon Jul 10 09:51:30 2023
+++ src/usr.bin/xlint/lint1/tree.c Mon Jul 10 19:47:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.559 2023/07/10 09:51:30 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.560 2023/07/10 19:47:12 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: tree.c,v 1.559 2023/07/10 09:51:30 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.560 2023/07/10 19:47:12 rillig Exp $");
#endif
#include
@@ -82,12 +82,6
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Mon Jul 10 19:47:12 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: cgram.y ckbool.c debug.c lint1.h tree.c Log Message: lint: merge duplicate code for getting the name of an operator To generate a diff of this commit: cvs rdiff -u -r1.450 -r1.451 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.24 -r1.25 src/usr.bin/xlint/lint1/ckbool.c cvs rdiff -u -r1.48 -r1.49 src/usr.bin/xlint/lint1/debug.c cvs rdiff -u -r1.183 -r1.184 src/usr.bin/xlint/lint1/lint1.h cvs rdiff -u -r1.559 -r1.560 src/usr.bin/xlint/lint1/tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Mon Jul 10 19:04:52 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: update debug logging of the parser for Bison 3.8.2
Bison 3.8.2 no longer knows YYPRINT.
To generate a diff of this commit:
cvs rdiff -u -r1.449 -r1.450 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.449 src/usr.bin/xlint/lint1/cgram.y:1.450
--- src/usr.bin/xlint/lint1/cgram.y:1.449 Mon Jul 10 19:00:33 2023
+++ src/usr.bin/xlint/lint1/cgram.y Mon Jul 10 19:04:52 2023
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.449 2023/07/10 19:00:33 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.450 2023/07/10 19:04:52 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.449 2023/07/10 19:00:33 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.450 2023/07/10 19:04:52 rillig Exp $");
#endif
#include
@@ -126,12 +126,9 @@ is_either(const char *s, const char *a,
return strcmp(s, a) == 0 || strcmp(s, b) == 0;
}
-#if YYDEBUG && (YYBYACC || YYBISON)
+#if YYDEBUG && YYBYACC
#define YYSTYPE_TOSTRING cgram_to_string
#endif
-#if YYDEBUG && YYBISON
-#define YYPRINT cgram_print
-#endif
%}
@@ -156,6 +153,37 @@ is_either(const char *s, const char *a,
bool y_in_system_header;
};
+/* for Bison:
+%printer {
+ if (is_integer($$->v_tspec))
+ fprintf(yyo, "%lld", (unsigned long long)$$->u.integer);
+ else
+ fprintf(yyo, "%Lg", $$->u.floating);
+}
+%printer { fprintf(yyo, "'%s'", $$->sb_name); }
+%printer { debug_sym("", $$, ""); }
+%printer { fprintf(yyo, "%s", op_name($$)); }
+%printer { fprintf(yyo, "%s", scl_name($$)); }
+%printer { fprintf(yyo, "%s", tspec_name($$)); }
+%printer { fprintf(yyo, "%s", tqual_name($$)); }
+%printer { fprintf(yyo, "%s", type_name($$)); }
+%printer {
+ fprintf(yyo, "%s '%s'", op_name($$->tn_op), type_name($$->tn_type));
+}
+%printer { fprintf(yyo, "%zu to %zu", $$.lo, $$.hi); }
+%printer { fprintf(yyo, "length %zu", $$->st_len); }
+%printer {
+ fprintf(yyo, "%s%s%s",
+ $$->p_const ? "const " : "",
+ $$->p_volatile ? "volatile " : "",
+ $$->p_pointer ? "*" : "");
+}
+%printer { fprintf(yyo, "%s", $$ ? "yes" : "no"); }
+%printer { fprintf(yyo, "%s", type_name($$->ga_arg)); }
+%printer { fprintf(yyo, "%d", $$.dim); }
+%printer { fprintf(yyo, "%s", $$ ? "yes" : "no"); }
+*/
+
%token T_LBRACE T_RBRACE T_LBRACK T_RBRACK T_LPAREN T_RPAREN
%token T_POINT T_ARROW
%token T_COMPLEMENT T_LOGNOT
@@ -390,12 +418,6 @@ is_either(const char *s, const char *a,
/* No type for gcc_attribute_parameters. */
%type sys
-%{
-#if YYDEBUG && YYBISON
-static inline void cgram_print(FILE *, int, YYSTYPE);
-#endif
-%}
-
%%
program:
@@ -2188,7 +2210,7 @@ yyerror(const char *msg)
return 0;
}
-#if YYDEBUG && (YYBYACC || YYBISON)
+#if YYDEBUG && YYBYACC
static const char *
cgram_to_string(int token, YYSTYPE val)
{
@@ -2217,14 +2239,6 @@ cgram_to_string(int token, YYSTYPE val)
}
#endif
-#if YYDEBUG && YYBISON
-static inline void
-cgram_print(FILE *output, int token, YYSTYPE val)
-{
- (void)fprintf(output, "%s", cgram_to_string(token, val));
-}
-#endif
-
static void
cgram_declare(sym_t *decl, bool has_initializer, sbuf_t *renaming)
{
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Mon Jul 10 19:04:52 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: cgram.y Log Message: lint: update debug logging of the parser for Bison 3.8.2 Bison 3.8.2 no longer knows YYPRINT. To generate a diff of this commit: cvs rdiff -u -r1.449 -r1.450 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Mon Jul 10 19:00:33 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: cgram.y lex.c lint1.h
Log Message:
lint: add debug logging for symbol kinds in the parser
An identifier can refer to a variable, type, member, tag or label.
Switching between these namespaces is tightly coupled with the
evaluation order of the grammar rules.
To generate a diff of this commit:
cvs rdiff -u -r1.448 -r1.449 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.173 -r1.174 src/usr.bin/xlint/lint1/lex.c
cvs rdiff -u -r1.182 -r1.183 src/usr.bin/xlint/lint1/lint1.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.448 src/usr.bin/xlint/lint1/cgram.y:1.449
--- src/usr.bin/xlint/lint1/cgram.y:1.448 Mon Jul 10 11:46:14 2023
+++ src/usr.bin/xlint/lint1/cgram.y Mon Jul 10 19:00:33 2023
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.448 2023/07/10 11:46:14 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.449 2023/07/10 19:00:33 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.448 2023/07/10 11:46:14 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.449 2023/07/10 19:00:33 rillig Exp $");
#endif
#include
@@ -469,7 +469,7 @@ primary_expression:
/* GCC primary-expression, see c_parser_postfix_expression */
/* TODO: C99 7.17p3 allows not only an identifier but a designator. */
| T_BUILTIN_OFFSETOF T_LPAREN type_name T_COMMA identifier T_RPAREN {
- symtyp = FMEMBER;
+ set_symtyp(FMEMBER);
$$ = build_offsetof($3, getsym($5));
}
;
@@ -592,11 +592,11 @@ gcc_statement_expr_item:
point_or_arrow: /* helper for 'postfix_expression' */
T_POINT {
- symtyp = FMEMBER;
+ set_symtyp(FMEMBER);
$$ = POINT;
}
| T_ARROW {
- symtyp = FMEMBER;
+ set_symtyp(FMEMBER);
$$ = ARROW;
}
;
@@ -963,14 +963,14 @@ struct_or_union_specifier: /* C99 6.7.2.
$$ = complete_struct_or_union($3);
}
| struct_or_union error {
- symtyp = FVFT;
+ set_symtyp(FVFT);
$$ = gettyp(INT);
}
;
struct_or_union: /* C99 6.7.2.1 */
T_STRUCT_OR_UNION {
- symtyp = FTAG;
+ set_symtyp(FTAG);
begin_declaration_level($1 == STRUCT ? DLK_STRUCT : DLK_UNION);
dcs->d_sou_size_in_bits = 0;
dcs->d_sou_align_in_bits = CHAR_SIZE;
@@ -987,7 +987,7 @@ braced_struct_declaration_list: /* see C
struct_declaration_lbrace: /* see C99 6.7.2.1 */
T_LBRACE {
- symtyp = FVFT;
+ set_symtyp(FVFT);
}
;
@@ -1010,15 +1010,15 @@ struct_declaration: /* C99 6.7.2.1 */
begin_type_qualifier_list end_type {
/* ^^ There is no check for the missing type-specifier. */
/* too late, i know, but getsym() compensates it */
- symtyp = FMEMBER;
+ set_symtyp(FMEMBER);
} notype_struct_declarators type_attribute_opt T_SEMI {
- symtyp = FVFT;
+ set_symtyp(FVFT);
$$ = $4;
}
| begin_type_specifier_qualifier_list end_type {
- symtyp = FMEMBER;
+ set_symtyp(FMEMBER);
} type_struct_declarators type_attribute_opt T_SEMI {
- symtyp = FVFT;
+ set_symtyp(FVFT);
$$ = $4;
}
| begin_type_qualifier_list end_type type_attribute_opt T_SEMI {
@@ -1028,7 +1028,7 @@ struct_declaration: /* C99 6.7.2.1 */
}
| begin_type_specifier_qualifier_list end_type type_attribute_opt
T_SEMI {
- symtyp = FVFT;
+ set_symtyp(FVFT);
if (!allow_c11 && !allow_gcc)
/* anonymous struct/union members is a C11 feature */
warning(49);
@@ -1044,7 +1044,7 @@ struct_declaration: /* C99 6.7.2.1 */
$$ = NULL;
}
| error T_SEMI {
- symtyp = FVFT;
+ set_symtyp(FVFT);
$$ = NULL;
}
;
@@ -1054,7 +1054,7 @@ notype_struct_declarators:
$$ = declare_member($1);
}
| notype_struct_declarators {
- symtyp = FMEMBER;
+ set_symtyp(FMEMBER);
} T_COMMA type_struct_declarator {
$$ = concat_symbols($1, declare_member($4));
}
@@ -1065,7 +1065,7 @@ type_struct_declarators:
$$ = declare_member($1);
}
| type_struct_declarators {
- symtyp = FMEMBER;
+ set_symtyp(FMEMBER);
} T_COMMA type_struct_declarator {
$$ = concat_symbols($1, declare_member($4));
}
@@ -1077,7 +1077,7 @@ notype_struct_declarator:
$$ = set_bit_field_width($1, to_int_constant($3, true));
}
| {
- symtyp = FVFT;
+ set_symtyp(FVFT);
} T_COLON constant_expr { /* C99 6.7.2.1 */
$$ = set_bit_field_width(NULL, to_int_constant($3, true));
}
@@ -1089,7 +1089,7 @@ type_struct_declarator:
$$ = set_bit_field_width($1, to_int_constant($3, true));
}
| {
- symtyp = FVFT;
+ set_symtyp(FVFT);
} T_COLON constant_expr {
$$ = set_bit_field_width(NULL, to_int_constant($3, true));
}
@@ -,14 +,14 @@ enum_specifier: /* C99 6.7.2.2 */
$$ = complete_enum($4);
}
| enum error {
- symtyp = FVFT;
+ set_symtyp(FVFT);
$$ =
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Mon Jul 10 19:00:33 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: cgram.y lex.c lint1.h Log Message: lint: add debug logging for symbol kinds in the parser An identifier can refer to a variable, type, member, tag or label. Switching between these namespaces is tightly coupled with the evaluation order of the grammar rules. To generate a diff of this commit: cvs rdiff -u -r1.448 -r1.449 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.173 -r1.174 src/usr.bin/xlint/lint1/lex.c cvs rdiff -u -r1.182 -r1.183 src/usr.bin/xlint/lint1/lint1.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Mon Jul 10 18:22:31 UTC 2023 Modified Files: src/sys/sys: mman.h Log Message: remove struct memfd definition To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/sys/mman.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Mon Jul 10 18:22:31 UTC 2023
Modified Files:
src/sys/sys: mman.h
Log Message:
remove struct memfd definition
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/sys/mman.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/sys/mman.h
diff -u src/sys/sys/mman.h:1.63 src/sys/sys/mman.h:1.64
--- src/sys/sys/mman.h:1.63 Sun Jul 9 22:31:55 2023
+++ src/sys/sys/mman.h Mon Jul 10 14:22:31 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mman.h,v 1.63 2023/07/10 02:31:55 christos Exp $ */
+/* $NetBSD: mman.h,v 1.64 2023/07/10 18:22:31 christos Exp $ */
/*-
* Copyright (c) 1982, 1986, 1993
@@ -247,24 +247,6 @@ int shm_open(const char *, int, mode_t);
int shm_unlink(const char *);
__END_DECLS
-#else
-
-#include /* for NAME_MAX */
-#include /* for struct timespec */
-#include /* for kmutex_t */
-
-struct memfd {
- char mfd_name[NAME_MAX+1];
- struct uvm_object *mfd_uobj;
- size_t mfd_size;
- int mfd_seals;
- kmutex_t mfd_lock; /* for truncate */
-
- struct timespec mfd_btime;
- struct timespec mfd_atime;
- struct timespec mfd_mtime;
-};
-
#endif /* !_KERNEL */
#endif /* !_SYS_MMAN_H_ */
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Mon Jul 10 16:20:52 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: debug.c
Log Message:
lint: improve debug output when debugging the grammar parser
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/xlint/lint1/debug.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/debug.c
diff -u src/usr.bin/xlint/lint1/debug.c:1.47 src/usr.bin/xlint/lint1/debug.c:1.48
--- src/usr.bin/xlint/lint1/debug.c:1.47 Sat Jul 8 12:07:21 2023
+++ src/usr.bin/xlint/lint1/debug.c Mon Jul 10 16:20:52 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.c,v 1.47 2023/07/08 12:07:21 rillig Exp $ */
+/* $NetBSD: debug.c,v 1.48 2023/07/10 16:20:52 rillig Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: debug.c,v 1.47 2023/07/08 12:07:21 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.48 2023/07/10 16:20:52 rillig Exp $");
#endif
#include
@@ -55,11 +55,8 @@ debug_file(void)
/*
* Using stdout preserves the order between the debug messages and
* lint's diagnostics.
- *
- * Using stderr preserves the order between lint's debug messages and
- * yacc's debug messages (see the -y option).
*/
- return stdout;
+ return yflag ? stderr : stdout;
}
void
@@ -76,7 +73,7 @@ void
debug_print_indent(void)
{
- debug_printf("%*s", 2 * debug_indentation, "");
+ debug_printf("%s%*s", yflag ? "| " : "", 2 * debug_indentation, "");
}
void
@@ -94,13 +91,6 @@ debug_indent_dec(void)
}
void
-debug_enter_func(const char *func)
-{
-
- fprintf(debug_file(), "%*s+ %s\n", 2 * debug_indentation++, "", func);
-}
-
-void
debug_step(const char *fmt, ...)
{
va_list va;
@@ -113,10 +103,19 @@ debug_step(const char *fmt, ...)
}
void
+debug_enter_func(const char *func)
+{
+
+ debug_step("+ %s", func);
+ debug_indent_inc();
+}
+
+void
debug_leave_func(const char *func)
{
- fprintf(debug_file(), "%*s- %s\n", 2 * --debug_indentation, "", func);
+ debug_indent_dec();
+ debug_step("- %s", func);
}
static void
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Mon Jul 10 16:20:52 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: debug.c Log Message: lint: improve debug output when debugging the grammar parser To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/usr.bin/xlint/lint1/debug.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: christos Date: Mon Jul 10 15:54:18 UTC 2023 Modified Files: src/share/man/man9: versioningsyscalls.9 Log Message: Forgot to commit the expanded userland portion To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man9/versioningsyscalls.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src
Committed By: christos
Date: Mon Jul 10 15:54:18 UTC 2023
Modified Files:
src/share/man/man9: versioningsyscalls.9
Log Message:
Forgot to commit the expanded userland portion
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man9/versioningsyscalls.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/versioningsyscalls.9
diff -u src/share/man/man9/versioningsyscalls.9:1.2 src/share/man/man9/versioningsyscalls.9:1.3
--- src/share/man/man9/versioningsyscalls.9:1.2 Sat Jul 8 20:29:49 2023
+++ src/share/man/man9/versioningsyscalls.9 Mon Jul 10 11:54:18 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: versioningsyscalls.9,v 1.2 2023/07/09 00:29:49 uwe Exp $
+.\" $NetBSD: versioningsyscalls.9,v 1.3 2023/07/10 15:54:18 christos Exp $
.\"
.\" Copyright (c) 2023 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -301,9 +301,37 @@ constant or a
.Li #define .
.
.Ss libc
-A userland version of any old and current versions of the syscall should be
-implemented in terms of the next syscall in
-.Pa lib/libc/compat/sys
-and should contain an appropriate call to
+A userland version of any old and current versions of the syscall must be
+implemented.
+For the current syscall with stub
+.Fn my_syscall struct\ my_struct\ *ms
+in
+.Pa sys/sys/my_header.h ,
+an implementation of
+.Fn my_syscall
+must be written in
+.Pa lib/libc/compat/sys/compat_my_syscall.c .
+.Pp
+Additionally, a call to
.Fn __warn_references
-for old and current versions of the syscall.
+must be added in
+.Pa lib/libc/compat/sys/compat_my_syscall.c
+to warn of any uses of the compat syscall and mention how to use the next
+version of the syscall.
+In almost all cases the instructions on how to use the next version of the
+syscall will be
+.Dq include to generate correct reference .
+.Pp
+Overall,
+.Pa lib/libc/compat/sys/compat_my_syscall.c
+must at the minimum include
+.Bd -literal
+#include
+
+__warn_references(my_syscall,
+"warning: reference to compatibility my_syscall(); message on how to use the next my_syscall()");
+
+int
+my_syscall()
+{ /* Compat implementation goes here. */ }
+.Ed
CVS commit: src
Module Name:src
Committed By: christos
Date: Mon Jul 10 15:49:19 UTC 2023
Modified Files:
src/sys/kern: sys_memfd.c
src/usr.bin/fstat: misc.c
Added Files:
src/sys/sys: miscfd.h
Log Message:
move the memfd struct to a separate file. Requested by riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/sys_memfd.c
cvs rdiff -u -r0 -r1.1 src/sys/sys/miscfd.h
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/fstat/misc.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/kern/sys_memfd.c
diff -u src/sys/kern/sys_memfd.c:1.1 src/sys/kern/sys_memfd.c:1.2
--- src/sys/kern/sys_memfd.c:1.1 Sun Jul 9 22:31:55 2023
+++ src/sys/kern/sys_memfd.c Mon Jul 10 11:49:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_memfd.c,v 1.1 2023/07/10 02:31:55 christos Exp $ */
+/* $NetBSD: sys_memfd.c,v 1.2 2023/07/10 15:49:18 christos Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.1 2023/07/10 02:31:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.2 2023/07/10 15:49:18 christos Exp $");
#include
#include
@@ -38,6 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,
#include
#include
#include
+#include
#include
#include
Index: src/usr.bin/fstat/misc.c
diff -u src/usr.bin/fstat/misc.c:1.25 src/usr.bin/fstat/misc.c:1.26
--- src/usr.bin/fstat/misc.c:1.25 Sun Jul 9 22:31:55 2023
+++ src/usr.bin/fstat/misc.c Mon Jul 10 11:49:19 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.25 2023/07/10 02:31:55 christos Exp $ */
+/* $NetBSD: misc.c,v 1.26 2023/07/10 15:49:19 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: misc.c,v 1.25 2023/07/10 02:31:55 christos Exp $");
+__RCSID("$NetBSD: misc.c,v 1.26 2023/07/10 15:49:19 christos Exp $");
#include
#include
@@ -56,9 +56,7 @@ __RCSID("$NetBSD: misc.c,v 1.25 2023/07/
#undef _KERNEL
#include
#include
-#define _KERNEL
-#include
-#undef _KERNEL
+#include
#include
#include
Added files:
Index: src/sys/sys/miscfd.h
diff -u /dev/null src/sys/sys/miscfd.h:1.1
--- /dev/null Mon Jul 10 11:49:19 2023
+++ src/sys/sys/miscfd.h Mon Jul 10 11:49:19 2023
@@ -0,0 +1,47 @@
+/* $NetBSD: miscfd.h,v 1.1 2023/07/10 15:49:19 christos Exp $ */
+
+/*-
+ * Copyright (c) 2023 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * 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.
+ */
+#ifndef _SYS_MISCFD_H_
+#define _SYS_MISCFD_H_
+
+#include /* for NAME_MAX */
+#include /* for struct timespec */
+#include /* for kmutex_t */
+
+struct memfd {
+ char mfd_name[NAME_MAX+1];
+ struct uvm_object *mfd_uobj;
+ size_t mfd_size;
+ int mfd_seals;
+ kmutex_t mfd_lock; /* for truncate */
+
+ struct timespec mfd_btime;
+ struct timespec mfd_atime;
+ struct timespec mfd_mtime;
+};
+
+#endif /* _SYS_MISCFD_H_ */
CVS commit: src
Module Name:src Committed By: christos Date: Mon Jul 10 15:49:19 UTC 2023 Modified Files: src/sys/kern: sys_memfd.c src/usr.bin/fstat: misc.c Added Files: src/sys/sys: miscfd.h Log Message: move the memfd struct to a separate file. Requested by riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/kern/sys_memfd.c cvs rdiff -u -r0 -r1.1 src/sys/sys/miscfd.h cvs rdiff -u -r1.25 -r1.26 src/usr.bin/fstat/misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint2
Module Name:src Committed By: rillig Date: Mon Jul 10 14:13:19 UTC 2023 Modified Files: src/usr.bin/xlint/lint2: chk.c msg.c read.c Log Message: lint: push memory management one layer down Just as with type_name in lint1, it is more convenient if the application code does not have to deal with memory management. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/usr.bin/xlint/lint2/chk.c cvs rdiff -u -r1.22 -r1.23 src/usr.bin/xlint/lint2/msg.c cvs rdiff -u -r1.85 -r1.86 src/usr.bin/xlint/lint2/read.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint2
Module Name:src
Committed By: rillig
Date: Mon Jul 10 14:13:19 UTC 2023
Modified Files:
src/usr.bin/xlint/lint2: chk.c msg.c read.c
Log Message:
lint: push memory management one layer down
Just as with type_name in lint1, it is more convenient if the
application code does not have to deal with memory management.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.bin/xlint/lint2/chk.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/xlint/lint2/msg.c
cvs rdiff -u -r1.85 -r1.86 src/usr.bin/xlint/lint2/read.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint2/chk.c
diff -u src/usr.bin/xlint/lint2/chk.c:1.58 src/usr.bin/xlint/lint2/chk.c:1.59
--- src/usr.bin/xlint/lint2/chk.c:1.58 Mon Jul 10 12:40:22 2023
+++ src/usr.bin/xlint/lint2/chk.c Mon Jul 10 14:13:19 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: chk.c,v 1.58 2023/07/10 12:40:22 rillig Exp $ */
+/* $NetBSD: chk.c,v 1.59 2023/07/10 14:13:19 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: chk.c,v 1.58 2023/07/10 12:40:22 rillig Exp $");
+__RCSID("$NetBSD: chk.c,v 1.59 2023/07/10 14:13:19 rillig Exp $");
#endif
#include
@@ -198,7 +198,6 @@ static void
check_multiple_definitions(const hte_t *hte)
{
sym_t *sym, *def1;
- char *pos1;
if (!hte->h_def)
return;
@@ -217,10 +216,8 @@ check_multiple_definitions(const hte_t *
def1 = sym;
continue;
}
- pos1 = xstrdup(mkpos(>s_pos));
/* %s multiply defined \t%s :: %s */
- msg(3, hte->h_name, pos1, mkpos(>s_pos));
- free(pos1);
+ msg(3, hte->h_name, mkpos(>s_pos), mkpos(>s_pos));
}
}
@@ -237,7 +234,6 @@ static void
chkvtui(const hte_t *hte, sym_t *def, sym_t *decl)
{
fcall_t *call;
- char *pos1;
type_t *tp1, *tp2;
bool dowarn, eq;
tspec_t t1;
@@ -273,19 +269,16 @@ chkvtui(const hte_t *hte, sym_t *def, sy
* behavior matches pcc-based lint, so it is
* accepted for now.
*/
-pos1 = xstrdup(mkpos(>s_pos));
/* %s function value must be declared ... */
msg(17, hte->h_name,
-pos1, mkpos(>f_pos));
-free(pos1);
+mkpos(>s_pos), mkpos(>f_pos));
}
continue;
}
if (!eq || (sflag && dowarn)) {
- pos1 = xstrdup(mkpos(>s_pos));
/* %s value used inconsistently \t%s :: %s */
- msg(4, hte->h_name, pos1, mkpos(>f_pos));
- free(pos1);
+ msg(4, hte->h_name,
+ mkpos(>s_pos), mkpos(>f_pos));
}
}
}
@@ -301,7 +294,6 @@ chkvtdi(const hte_t *hte, sym_t *def, sy
sym_t *sym;
type_t *tp1, *tp2;
bool eq, dowarn;
- char *pos1;
if (def == NULL)
def = decl;
@@ -323,11 +315,9 @@ chkvtdi(const hte_t *hte, sym_t *def, sy
false, false, false, );
}
if (!eq || (sflag && dowarn)) {
- pos1 = xstrdup(mkpos(>s_pos));
/* %s value declared inconsistently (%s != %s) \t... */
msg(5, hte->h_name, type_name(xt1), type_name(xt2),
- pos1, mkpos(>s_pos));
- free(pos1);
+ mkpos(>s_pos), mkpos(>s_pos));
}
}
}
@@ -344,7 +334,6 @@ chkfaui(const hte_t *hte, sym_t *def, sy
pos_t *pos1p = NULL;
fcall_t *calls, *call, *call1;
int n, as;
- char *pos1;
arginf_t *ai;
if ((calls = hte->h_calls) == NULL)
@@ -408,10 +397,8 @@ chkfaui(const hte_t *hte, sym_t *def, sy
* in the prototype.
*/
} else {
- pos1 = xstrdup(mkpos(pos1p));
/* %s: variable # of args \t%s :: %s */
- msg(7, hte->h_name, pos1, mkpos(>f_pos));
- free(pos1);
+ msg(7, hte->h_name, mkpos(pos1p), mkpos(>f_pos));
continue;
}
@@ -456,7 +443,6 @@ chkau(const hte_t *hte, int n, sym_t *de
bool promote, asgn, dowarn;
tspec_t t1, t2;
arginf_t *ai, *ai1;
- char *pos1;
/*
* If a function definition is available (def != NULL), we compare the
@@ -593,11 +579,9 @@ chkau(const hte_t *hte, int n, sym_t *de
return;
}
- pos1 = xstrdup(mkpos(pos1p));
/* %s, arg %d used inconsistently \t%s[%s] :: %s[%s] */
- msg(6, hte->h_name, n, pos1, type_name(arg1),
+ msg(6, hte->h_name, n, mkpos(pos1p), type_name(arg1),
mkpos(>f_pos), type_name(arg2));
- free(pos1);
}
/*
@@ -1131,8 +1115,6 @@ check_argument_declarations(const hte_t
int n;
sym_t *sym1, *sym;
type_t **ap1, **ap2, *tp1, *tp2;
- char *pos1;
- const char *pos2;
osdef = false;
if (def != NULL) {
@@ -1163,12 +1145,10 @@ check_argument_declarations(const hte_t
eq = types_compatible(xt1 = *ap1, xt2 = *ap2,
true, osdef, false, );
if (!eq || dowarn) {
-pos1 = xstrdup(mkpos(>s_pos));
-pos2 = mkpos(>s_pos);
/* %s, arg %d declared inconsistently ... */
msg(11, hte->h_name, n + 1,
-type_name(xt1), type_name(xt2), pos1, pos2);
-free(pos1);
+type_name(xt1), type_name(xt2),
+mkpos(>s_pos), mkpos(>s_pos));
}
n++;
ap1++;
@@ -1184,10 +1164,8 @@ check_argument_declarations(const hte_t
CVS commit: src/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Mon Jul 10 13:55:55 UTC 2023
Modified Files:
src/usr.bin/xlint/common: emit.c
src/usr.bin/xlint/lint2: main2.c msg.c
Log Message:
lint: replce sprintf with snprintf
Even though the sprintf calls were safe, they looked suspicious.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/xlint/common/emit.c
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/xlint/lint2/main2.c
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/xlint/lint2/msg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/common/emit.c
diff -u src/usr.bin/xlint/common/emit.c:1.20 src/usr.bin/xlint/common/emit.c:1.21
--- src/usr.bin/xlint/common/emit.c:1.20 Sun Jul 9 12:15:07 2023
+++ src/usr.bin/xlint/common/emit.c Mon Jul 10 13:55:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: emit.c,v 1.20 2023/07/09 12:15:07 rillig Exp $ */
+/* $NetBSD: emit.c,v 1.21 2023/07/10 13:55:55 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: emit.c,v 1.20 2023/07/09 12:15:07 rillig Exp $");
+__RCSID("$NetBSD: emit.c,v 1.21 2023/07/10 13:55:55 rillig Exp $");
#endif
#include
@@ -153,7 +153,7 @@ outint(int i)
if ((size_t)(ob.o_end - ob.o_next) < 3 * sizeof(int))
outxbuf();
- ob.o_next += sprintf(ob.o_next, "%d", i);
+ ob.o_next += snprintf(ob.o_next, ob.o_end - ob.o_next, "%d", i);
}
/* write a name to the output buffer, preceded by its length */
Index: src/usr.bin/xlint/lint2/main2.c
diff -u src/usr.bin/xlint/lint2/main2.c:1.32 src/usr.bin/xlint/lint2/main2.c:1.33
--- src/usr.bin/xlint/lint2/main2.c:1.32 Mon Jul 10 12:40:22 2023
+++ src/usr.bin/xlint/lint2/main2.c Mon Jul 10 13:55:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main2.c,v 1.32 2023/07/10 12:40:22 rillig Exp $ */
+/* $NetBSD: main2.c,v 1.33 2023/07/10 13:55:55 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: main2.c,v 1.32 2023/07/10 12:40:22 rillig Exp $");
+__RCSID("$NetBSD: main2.c,v 1.33 2023/07/10 13:55:55 rillig Exp $");
#endif
#include
@@ -99,7 +99,7 @@ main(int argc, char *argv[])
case 'C':
len = strlen(optarg);
lname = xmalloc(len + 10);
- (void)sprintf(lname, "llib-l%s.ln", optarg);
+ (void)snprintf(lname, len + 10, "llib-l%s.ln", optarg);
libname = lname;
Cflag = true;
uflag = true;
Index: src/usr.bin/xlint/lint2/msg.c
diff -u src/usr.bin/xlint/lint2/msg.c:1.21 src/usr.bin/xlint/lint2/msg.c:1.22
--- src/usr.bin/xlint/lint2/msg.c:1.21 Mon Jul 10 12:40:22 2023
+++ src/usr.bin/xlint/lint2/msg.c Mon Jul 10 13:55:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.c,v 1.21 2023/07/10 12:40:22 rillig Exp $ */
+/* $NetBSD: msg.c,v 1.22 2023/07/10 13:55:55 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: msg.c,v 1.21 2023/07/10 12:40:22 rillig Exp $");
+__RCSID("$NetBSD: msg.c,v 1.22 2023/07/10 13:55:55 rillig Exp $");
#endif
#include
@@ -104,31 +104,30 @@ lbasename(const char *path)
const char *
mkpos(const pos_t *posp)
{
- size_t len;
- const char *fn;
static char *buf;
- static size_t blen = 0;
- bool qm;
- int src, line;
+ static size_t buf_size;
+ int filename;
+ int lineno;
if (Hflag && posp->p_src != posp->p_isrc) {
- src = posp->p_isrc;
- line = posp->p_iline;
+ filename = posp->p_isrc;
+ lineno = posp->p_iline;
} else {
- src = posp->p_src;
- line = posp->p_line;
+ filename = posp->p_src;
+ lineno = posp->p_line;
}
- qm = !Hflag && posp->p_src != posp->p_isrc;
- len = strlen(fn = lbasename(fnames[src]));
- len += 3 * sizeof(unsigned short) + 4;
-
- if (len > blen)
- buf = xrealloc(buf, blen = len);
- if (line != 0)
- (void)sprintf(buf, "%s%s(%d)", fn, qm ? "?" : "", line);
+ bool qm = !Hflag && posp->p_src != posp->p_isrc;
+ const char *fn = lbasename(fnames[filename]);
+ size_t len = strlen(fn) + 1 + 1 + 3 * sizeof(int) + 1 + 1;
+
+ if (len > buf_size)
+ buf = xrealloc(buf, buf_size = len);
+ if (lineno != 0)
+ (void)snprintf(buf, buf_size, "%s%s(%d)",
+ fn, qm ? "?" : "", lineno);
else
- (void)sprintf(buf, "%s", fn);
+ (void)snprintf(buf, buf_size, "%s", fn);
return buf;
}
CVS commit: src/usr.bin/xlint
Module Name:src Committed By: rillig Date: Mon Jul 10 13:55:55 UTC 2023 Modified Files: src/usr.bin/xlint/common: emit.c src/usr.bin/xlint/lint2: main2.c msg.c Log Message: lint: replce sprintf with snprintf Even though the sprintf calls were safe, they looked suspicious. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.bin/xlint/common/emit.c cvs rdiff -u -r1.32 -r1.33 src/usr.bin/xlint/lint2/main2.c cvs rdiff -u -r1.21 -r1.22 src/usr.bin/xlint/lint2/msg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch/i386
Module Name:src Committed By: christos Date: Mon Jul 10 13:05:35 UTC 2023 Modified Files: src/sys/compat/linux/arch/i386: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/compat/linux/arch/i386/linux_syscall.h \ src/sys/compat/linux/arch/i386/linux_syscallargs.h \ src/sys/compat/linux/arch/i386/linux_sysent.c cvs rdiff -u -r1.122 -r1.123 src/sys/compat/linux/arch/i386/linux_syscalls.c cvs rdiff -u -r1.16 -r1.17 \ src/sys/compat/linux/arch/i386/linux_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch/i386
Module Name:src
Committed By: christos
Date: Mon Jul 10 13:05:35 UTC 2023
Modified Files:
src/sys/compat/linux/arch/i386: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c linux_systrace_args.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/compat/linux/arch/i386/linux_syscall.h \
src/sys/compat/linux/arch/i386/linux_syscallargs.h \
src/sys/compat/linux/arch/i386/linux_sysent.c
cvs rdiff -u -r1.122 -r1.123 src/sys/compat/linux/arch/i386/linux_syscalls.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/compat/linux/arch/i386/linux_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/linux/arch/i386/linux_syscall.h
diff -u src/sys/compat/linux/arch/i386/linux_syscall.h:1.121 src/sys/compat/linux/arch/i386/linux_syscall.h:1.122
--- src/sys/compat/linux/arch/i386/linux_syscall.h:1.121 Wed Dec 1 23:39:45 2021
+++ src/sys/compat/linux/arch/i386/linux_syscall.h Mon Jul 10 09:05:35 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.121 2021/12/02 04:39:45 ryo Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.122 2023/07/10 13:05:35 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.128 2021/09/20 02:20:02 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.130 2023/07/10 13:05:27 christos Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -773,6 +773,12 @@
/* syscall: "prlimit64" ret: "int" args: "pid_t" "int" "struct rlimit *" "struct rlimit *" */
#define LINUX_SYS_prlimit64 340
-#define LINUX_SYS_MAXSYSCALL 351
+/* syscall: "getrandom" ret: "ssize_t" args: "void *" "size_t" "unsigned int" */
+#define LINUX_SYS_getrandom 355
+
+/* syscall: "memfd_create" ret: "int" args: "const char *" "unsigned int" */
+#define LINUX_SYS_memfd_create 356
+
+#define LINUX_SYS_MAXSYSCALL 441
#define LINUX_SYS_NSYSENT 512
#endif /* _LINUX_SYS_SYSCALL_H_ */
Index: src/sys/compat/linux/arch/i386/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/i386/linux_syscallargs.h:1.121 src/sys/compat/linux/arch/i386/linux_syscallargs.h:1.122
--- src/sys/compat/linux/arch/i386/linux_syscallargs.h:1.121 Wed Dec 1 23:39:45 2021
+++ src/sys/compat/linux/arch/i386/linux_syscallargs.h Mon Jul 10 09:05:35 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.121 2021/12/02 04:39:45 ryo Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.122 2023/07/10 13:05:35 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.128 2021/09/20 02:20:02 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.130 2023/07/10 13:05:27 christos Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -1222,6 +1222,14 @@ struct linux_sys_prlimit64_args {
};
check_syscall_args(linux_sys_prlimit64)
+struct sys_getrandom_args;
+
+struct linux_sys_memfd_create_args {
+ syscallarg(const char *) name;
+ syscallarg(unsigned int) flags;
+};
+check_syscall_args(linux_sys_memfd_create)
+
/*
* System call prototypes.
*/
@@ -1712,4 +1720,8 @@ int linux_sys_pwritev(struct lwp *, cons
int linux_sys_prlimit64(struct lwp *, const struct linux_sys_prlimit64_args *, register_t *);
+int sys_getrandom(struct lwp *, const struct sys_getrandom_args *, register_t *);
+
+int linux_sys_memfd_create(struct lwp *, const struct linux_sys_memfd_create_args *, register_t *);
+
#endif /* _LINUX_SYS_SYSCALLARGS_H_ */
Index: src/sys/compat/linux/arch/i386/linux_sysent.c
diff -u src/sys/compat/linux/arch/i386/linux_sysent.c:1.121 src/sys/compat/linux/arch/i386/linux_sysent.c:1.122
--- src/sys/compat/linux/arch/i386/linux_sysent.c:1.121 Wed Dec 1 23:39:45 2021
+++ src/sys/compat/linux/arch/i386/linux_sysent.c Mon Jul 10 09:05:35 2023
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.121 2021/12/02 04:39:45 ryo Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.122 2023/07/10 13:05:35 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.128 2021/09/20 02:20:02 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.130 2023/07/10 13:05:27 christos Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.121 2021/12/02 04:39:45 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.122 2023/07/10 13:05:35 christos Exp $");
#include
#include
@@ -1500,11 +1500,15 @@ struct sysent linux_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 354 = filler */
{
- .sy_call = linux_sys_nosys,
- }, /* 355 = filler */
+ ns(struct sys_getrandom_args),
+ .sy_flags = SYCALL_ARG_PTR,
+ .sy_call = (sy_call_t *)sys_getrandom
+ }, /* 355 = getrandom */
{
- .sy_call = linux_sys_nosys,
- }, /* 356 = filler */
+ ns(struct linux_sys_memfd_create_args),
+
CVS commit: src/sys/compat/linux/arch/i386
Module Name:src Committed By: christos Date: Mon Jul 10 13:05:27 UTC 2023 Modified Files: src/sys/compat/linux/arch/i386: syscalls.master Log Message: Add new syscalls To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 src/sys/compat/linux/arch/i386/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch/i386
Module Name:src
Committed By: christos
Date: Mon Jul 10 13:05:27 UTC 2023
Modified Files:
src/sys/compat/linux/arch/i386: syscalls.master
Log Message:
Add new syscalls
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/compat/linux/arch/i386/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/linux/arch/i386/syscalls.master
diff -u src/sys/compat/linux/arch/i386/syscalls.master:1.129 src/sys/compat/linux/arch/i386/syscalls.master:1.130
--- src/sys/compat/linux/arch/i386/syscalls.master:1.129 Wed Dec 1 23:29:48 2021
+++ src/sys/compat/linux/arch/i386/syscalls.master Mon Jul 10 09:05:27 2023
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.129 2021/12/02 04:29:48 ryo Exp $
+ $NetBSD: syscalls.master,v 1.130 2023/07/10 13:05:27 christos Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -569,3 +569,95 @@
348 UNIMPL process_vm_writev
349 UNIMPL kcmp
350 UNIMPL finit_module
+351 UNIMPL sched_setattr
+352 UNIMPL sched_getattr
+353 UNIMPL renameat2
+354 UNIMPL seccomp
+355 NOARGS { ssize_t|sys||getrandom(void *buf, size_t buflen, \
+ unsigned int flags); }
+356 STD { int|linux_sys||memfd_create(const char *name, \
+ unsigned int flags); }
+357 UNIMPL bpf
+358 UNIMPL execveat
+359 UNIMPL socket
+360 UNIMPL socketpair
+361 UNIMPL bind
+362 UNIMPL connect
+363 UNIMPL listen
+364 UNIMPL accept4
+365 UNIMPL getsockopt
+366 UNIMPL setsockopt
+367 UNIMPL getsockname
+368 UNIMPL getpeername
+369 UNIMPL sendto
+370 UNIMPL sendmsg
+371 UNIMPL recvfrom
+372 UNIMPL recvmsg
+373 UNIMPL shutdown
+374 UNIMPL userfaultfd
+375 UNIMPL membarrier
+376 UNIMPL mlock2
+377 UNIMPL copy_file_range
+378 UNIMPL preadv2
+379 UNIMPL pwritev2
+380 UNIMPL pkey_mprotect
+381 UNIMPL pkey_alloc
+382 UNIMPL pkey_free
+383 UNIMPL statx
+384 UNIMPL arch_prctl
+385 UNIMPL io_pgetevents
+386 UNIMPL rseq
+387 UNIMPL
+388 UNIMPL
+389 UNIMPL
+390 UNIMPL
+391 UNIMPL
+392 UNIMPL
+393 UNIMPL semget
+394 UNIMPL semctl
+395 UNIMPL shmget
+396 UNIMPL shmctl
+397 UNIMPL shmat
+398 UNIMPL shmdt
+399 UNIMPL msgget
+400 UNIMPL msgsnd
+401 UNIMPL msgrcv
+402 UNIMPL msgctl
+403 UNIMPL clock_gettime64
+404 UNIMPL clock_settime64
+405 UNIMPL clock_adjtime64
+406 UNIMPL clock_getres_time64
+407 UNIMPL clock_nanosleep_time64
+408 UNIMPL timer_gettime64
+409 UNIMPL timer_settime64
+410 UNIMPL timerfd_gettime64
+411 UNIMPL timerfd_settime64
+412 UNIMPL utimensat_time64
+413 UNIMPL pselect6_time64
+414 UNIMPL ppoll_time64
+415 UNIMPL
+416 UNIMPL io_pgetevents_time64
+417 UNIMPL recvmmsg_time64
+418 UNIMPL mq_timedsend_time64
+419 UNIMPL mq_timedreceive_time64
+420 UNIMPL semtimedop_time64
+421 UNIMPL rt_sigtimedwait_time64
+422 UNIMPL futex_time64
+423 UNIMPL sched_rr_get_interval_time64
+424 UNIMPL pidfd_send_signal
+425 UNIMPL io_uring_setup
+426 UNIMPL io_uring_enter
+427 UNIMPL io_uring_register
+428 UNIMPL open_tree
+429 UNIMPL move_mount
+430 UNIMPL fsopen
+431 UNIMPL fsconfig
+432 UNIMPL fsmount
+433 UNIMPL fspick
+434 UNIMPL pidfd_open
+435 UNIMPL clone3
+436 UNIMPL close_range
+437 UNIMPL openat2
+438 UNIMPL pidfd_getfd
+439 UNIMPL faccessat2
+440 UNIMPL process_madvise
Re: CVS commit: src
> Date: Mon, 10 Jul 2023 08:48:55 -0400 > From: Christos Zoulas > > Yes, I don't like that either, but it is for fstat(1) support. > timerfd and eventfd were not added to fstat... An alternative is to > put it in a separate header file or copy it. I think we should err on the side of more small files with clear purposes rather than cramming as much into existing files as we can, making them unmaintainable messes that trigger giant rebuilds every time you sneeze at them.
Re: CVS commit: src
Yes, I don't like that either, but it is for fstat(1) support. timerfd and eventfd were not added to fstat... An alternative is to put it in a separate header file or copy it. christos > On Jul 10, 2023, at 8:14 AM, Jason Thorpe wrote: > > It’s great to see this land, but “struct memfd” does not appear to be needed > in . I would suggest moving it to sys_memfd.c. > >> On Jul 9, 2023, at 7:31 PM, Christos Zoulas wrote: >> >> Module Name: src >> Committed By: christos >> Date: Mon Jul 10 02:31:55 UTC 2023 >> >> Modified Files: >> src/distrib/sets/lists/comp: mi >> src/lib/libc/sys: Makefile.inc fcntl.2 >> src/sys/compat/linux/arch/amd64: syscalls.master >> src/sys/compat/linux/common: linux_fcntl.h linux_file.c linux_misc.c >> linux_sysctl.c >> src/sys/kern: sys_descrip.c vfs_syscalls.c vfs_vnops.c >> src/sys/sys: fcntl.h file.h mman.h >> src/usr.bin/fstat: fstat.c misc.c >> Added Files: >> src/lib/libc/sys: memfd_create.2 >> src/sys/kern: sys_memfd.c >> >> Log Message: >> Add memfd_create(2) from GSoC 2023 by Theodore Preduta >> >> >> To generate a diff of this commit: >> cvs rdiff -u -r1.2436 -r1.2437 src/distrib/sets/lists/comp/mi >> cvs rdiff -u -r1.250 -r1.251 src/lib/libc/sys/Makefile.inc >> cvs rdiff -u -r1.49 -r1.50 src/lib/libc/sys/fcntl.2 >> cvs rdiff -u -r0 -r1.1 src/lib/libc/sys/memfd_create.2 >> cvs rdiff -u -r1.67 -r1.68 src/sys/compat/linux/arch/amd64/syscalls.master >> cvs rdiff -u -r1.20 -r1.21 src/sys/compat/linux/common/linux_fcntl.h >> cvs rdiff -u -r1.122 -r1.123 src/sys/compat/linux/common/linux_file.c >> cvs rdiff -u -r1.256 -r1.257 src/sys/compat/linux/common/linux_misc.c >> cvs rdiff -u -r1.47 -r1.48 src/sys/compat/linux/common/linux_sysctl.c >> cvs rdiff -u -r1.47 -r1.48 src/sys/kern/sys_descrip.c >> cvs rdiff -u -r0 -r1.1 src/sys/kern/sys_memfd.c >> cvs rdiff -u -r1.559 -r1.560 src/sys/kern/vfs_syscalls.c >> cvs rdiff -u -r1.241 -r1.242 src/sys/kern/vfs_vnops.c >> cvs rdiff -u -r1.54 -r1.55 src/sys/sys/fcntl.h >> cvs rdiff -u -r1.92 -r1.93 src/sys/sys/file.h >> cvs rdiff -u -r1.62 -r1.63 src/sys/sys/mman.h >> cvs rdiff -u -r1.117 -r1.118 src/usr.bin/fstat/fstat.c >> cvs rdiff -u -r1.24 -r1.25 src/usr.bin/fstat/misc.c >> >> Please note that diffs are not public domain; they are subject to the >> copyright notices on the relevant files. >> > > -- thorpej signature.asc Description: Message signed with OpenPGP
CVS commit: src/usr.bin/xlint/lint2
Module Name:src
Committed By: rillig
Date: Mon Jul 10 12:40:22 UTC 2023
Modified Files:
src/usr.bin/xlint/lint2: chk.c externs2.h hash.c lint2.h main2.c msg.c
read.c
Log Message:
lint: clean up lint2
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/xlint/lint2/chk.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/xlint/lint2/externs2.h
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/xlint/lint2/hash.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/xlint/lint2/lint2.h
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/xlint/lint2/main2.c
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/xlint/lint2/msg.c
cvs rdiff -u -r1.84 -r1.85 src/usr.bin/xlint/lint2/read.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint2/chk.c
diff -u src/usr.bin/xlint/lint2/chk.c:1.57 src/usr.bin/xlint/lint2/chk.c:1.58
--- src/usr.bin/xlint/lint2/chk.c:1.57 Mon Jul 3 10:23:12 2023
+++ src/usr.bin/xlint/lint2/chk.c Mon Jul 10 12:40:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: chk.c,v 1.57 2023/07/03 10:23:12 rillig Exp $ */
+/* $NetBSD: chk.c,v 1.58 2023/07/10 12:40:22 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: chk.c,v 1.57 2023/07/03 10:23:12 rillig Exp $");
+__RCSID("$NetBSD: chk.c,v 1.58 2023/07/10 12:40:22 rillig Exp $");
#endif
#include
@@ -78,7 +78,7 @@ mark_main_as_used(void)
{
hte_t *hte;
- if ((hte = hsearch("main", false)) != NULL)
+ if ((hte = htab_search("main", false)) != NULL)
hte->h_used = true;
}
Index: src/usr.bin/xlint/lint2/externs2.h
diff -u src/usr.bin/xlint/lint2/externs2.h:1.19 src/usr.bin/xlint/lint2/externs2.h:1.20
--- src/usr.bin/xlint/lint2/externs2.h:1.19 Sat Jan 14 08:48:18 2023
+++ src/usr.bin/xlint/lint2/externs2.h Mon Jul 10 12:40:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: externs2.h,v 1.19 2023/01/14 08:48:18 rillig Exp $ */
+/* $NetBSD: externs2.h,v 1.20 2023/07/10 12:40:22 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,27 +35,27 @@
/*
* main2.c
*/
-extern bool xflag;
-extern bool uflag;
extern bool Cflag;
-extern const char *libname;
-extern bool sflag;
-extern bool tflag;
+extern bool Fflag;
extern bool Hflag;
extern bool hflag;
-extern bool Fflag;
+extern bool sflag;
+extern bool tflag;
+extern bool uflag;
+extern bool xflag;
+extern const char *libname;
/*
* hash.c
*/
-extern hte_t** htab_new(void);
-extern hte_t *_hsearch(hte_t **, const char *, bool);
-extern void symtab_init(void);
-extern void symtab_forall(void (*)(hte_t *));
-extern void symtab_forall_sorted(void (*)(hte_t *));
-extern void _destroyhash(hte_t **);
+hte_t** htab_new(void);
+hte_t *hash_search(hte_t **, const char *, bool);
+void symtab_init(void);
+void symtab_forall(void (*)(hte_t *));
+void symtab_forall_sorted(void (*)(hte_t *));
+void hash_free(hte_t **);
-#define hsearch(a, b) _hsearch(NULL, (a), (b))
+#define htab_search(a, b) hash_search(NULL, (a), (b))
/*
* read.c
@@ -63,23 +63,23 @@ extern void _destroyhash(hte_t **);
extern const char **fnames;
extern type_t **tlst;
-extern void readfile(const char *);
-extern void mkstatic(hte_t *);
+void readfile(const char *);
+void mkstatic(hte_t *);
/*
* chk.c
*/
-extern void mark_main_as_used(void);
-extern void check_name(const hte_t *);
+void mark_main_as_used(void);
+void check_name(const hte_t *);
/*
* msg.c
*/
-extern void msg(int, ...);
-extern const char *mkpos(pos_t *);
+void msg(int, ...);
+const char *mkpos(const pos_t *);
/*
* emit2.c
*/
-extern void outlib(const char *);
-extern int addoutfile(short);
+void outlib(const char *);
+int addoutfile(short);
Index: src/usr.bin/xlint/lint2/hash.c
diff -u src/usr.bin/xlint/lint2/hash.c:1.26 src/usr.bin/xlint/lint2/hash.c:1.27
--- src/usr.bin/xlint/lint2/hash.c:1.26 Mon Jul 10 09:51:30 2023
+++ src/usr.bin/xlint/lint2/hash.c Mon Jul 10 12:40:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.c,v 1.26 2023/07/10 09:51:30 rillig Exp $ */
+/* $NetBSD: hash.c,v 1.27 2023/07/10 12:40:22 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: hash.c,v 1.26 2023/07/10 09:51:30 rillig Exp $");
+__RCSID("$NetBSD: hash.c,v 1.27 2023/07/10 12:40:22 rillig Exp $");
#endif
#include
@@ -76,7 +76,7 @@ hash(const char *s)
* given name exists and mknew is set, create a new one.
*/
hte_t *
-_hsearch(hte_t **table, const char *s, bool mknew)
+hash_search(hte_t **table, const char *s, bool mknew)
{
unsigned int h;
hte_t *hte;
@@ -185,14 +185,11 @@ symtab_forall_sorted(void (*action)(hte_
* Free all contents of the hash table that this module allocated.
*/
void
-_destroyhash(hte_t **table)
+hash_free(hte_t **table)
{
int i;
hte_t *hte, *nexthte;
- if (table == NULL)
- err(1, "_destroyhash called on
CVS commit: src/usr.bin/xlint/lint2
Module Name:src Committed By: rillig Date: Mon Jul 10 12:40:22 UTC 2023 Modified Files: src/usr.bin/xlint/lint2: chk.c externs2.h hash.c lint2.h main2.c msg.c read.c Log Message: lint: clean up lint2 To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/usr.bin/xlint/lint2/chk.c cvs rdiff -u -r1.19 -r1.20 src/usr.bin/xlint/lint2/externs2.h cvs rdiff -u -r1.26 -r1.27 src/usr.bin/xlint/lint2/hash.c cvs rdiff -u -r1.22 -r1.23 src/usr.bin/xlint/lint2/lint2.h cvs rdiff -u -r1.31 -r1.32 src/usr.bin/xlint/lint2/main2.c cvs rdiff -u -r1.20 -r1.21 src/usr.bin/xlint/lint2/msg.c cvs rdiff -u -r1.84 -r1.85 src/usr.bin/xlint/lint2/read.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
It’s great to see this land, but “struct memfd” does not appear to be needed in . I would suggest moving it to sys_memfd.c. > On Jul 9, 2023, at 7:31 PM, Christos Zoulas wrote: > > Module Name: src > Committed By: christos > Date: Mon Jul 10 02:31:55 UTC 2023 > > Modified Files: > src/distrib/sets/lists/comp: mi > src/lib/libc/sys: Makefile.inc fcntl.2 > src/sys/compat/linux/arch/amd64: syscalls.master > src/sys/compat/linux/common: linux_fcntl.h linux_file.c linux_misc.c >linux_sysctl.c > src/sys/kern: sys_descrip.c vfs_syscalls.c vfs_vnops.c > src/sys/sys: fcntl.h file.h mman.h > src/usr.bin/fstat: fstat.c misc.c > Added Files: > src/lib/libc/sys: memfd_create.2 > src/sys/kern: sys_memfd.c > > Log Message: > Add memfd_create(2) from GSoC 2023 by Theodore Preduta > > > To generate a diff of this commit: > cvs rdiff -u -r1.2436 -r1.2437 src/distrib/sets/lists/comp/mi > cvs rdiff -u -r1.250 -r1.251 src/lib/libc/sys/Makefile.inc > cvs rdiff -u -r1.49 -r1.50 src/lib/libc/sys/fcntl.2 > cvs rdiff -u -r0 -r1.1 src/lib/libc/sys/memfd_create.2 > cvs rdiff -u -r1.67 -r1.68 src/sys/compat/linux/arch/amd64/syscalls.master > cvs rdiff -u -r1.20 -r1.21 src/sys/compat/linux/common/linux_fcntl.h > cvs rdiff -u -r1.122 -r1.123 src/sys/compat/linux/common/linux_file.c > cvs rdiff -u -r1.256 -r1.257 src/sys/compat/linux/common/linux_misc.c > cvs rdiff -u -r1.47 -r1.48 src/sys/compat/linux/common/linux_sysctl.c > cvs rdiff -u -r1.47 -r1.48 src/sys/kern/sys_descrip.c > cvs rdiff -u -r0 -r1.1 src/sys/kern/sys_memfd.c > cvs rdiff -u -r1.559 -r1.560 src/sys/kern/vfs_syscalls.c > cvs rdiff -u -r1.241 -r1.242 src/sys/kern/vfs_vnops.c > cvs rdiff -u -r1.54 -r1.55 src/sys/sys/fcntl.h > cvs rdiff -u -r1.92 -r1.93 src/sys/sys/file.h > cvs rdiff -u -r1.62 -r1.63 src/sys/sys/mman.h > cvs rdiff -u -r1.117 -r1.118 src/usr.bin/fstat/fstat.c > cvs rdiff -u -r1.24 -r1.25 src/usr.bin/fstat/misc.c > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. > -- thorpej
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Mon Jul 10 11:46:14 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: cgram.y check-msgs.lua
Log Message:
lint: ensure that untyped grammar rules are listed
Untyped grammar rules are suspicious because they subtly affect the
order in which the grammar actions are performed. This leads to the
various bugs mentioned in msg_347.c.
To generate a diff of this commit:
cvs rdiff -u -r1.447 -r1.448 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/xlint/lint1/check-msgs.lua
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.447 src/usr.bin/xlint/lint1/cgram.y:1.448
--- src/usr.bin/xlint/lint1/cgram.y:1.447 Fri Jul 7 19:45:22 2023
+++ src/usr.bin/xlint/lint1/cgram.y Mon Jul 10 11:46:14 2023
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.447 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.448 2023/07/10 11:46:14 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.447 2023/07/07 19:45:22 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.448 2023/07/10 11:46:14 rillig Exp $");
#endif
#include
@@ -245,34 +245,49 @@ is_either(const char *s, const char *a,
%token T_CON
%token T_STRING
+/* No type for program. */
%type identifier_sym
%type identifier
%type string
-
%type primary_expression
%type generic_selection
%type generic_assoc_list
%type generic_association
%type postfix_expression
+/* No type for comma_opt. */
%type gcc_statement_expr_list
%type gcc_statement_expr_item
%type point_or_arrow
%type argument_expression_list
%type unary_expression
%type cast_expression
+%type expression_opt
%type conditional_expression
%type assignment_expression
-%type expression_opt
%type expression
%type constant_expr
-
+/* No type for declaration_or_error. */
+/* No type for declaration. */
+/* No type for begin_type_declaration_specifiers. */
+/* No type for begin_type_declmods. */
+/* No type for begin_type_specifier_qualifier_list. */
+/* No type for begin_type_specifier_qualifier_list_postfix. */
%type begin_type_typespec
+/* No type for begin_type_qualifier_list. */
+/* No type for declmod. */
+/* No type for type_attribute_list_opt. */
+/* No type for type_attribute_list. */
+/* No type for type_attribute_opt. */
+/* No type for type_attribute. */
+/* No type for begin_type. */
+/* No type for end_type. */
%type type_specifier
%type notype_type_specifier
%type atomic_type_specifier
%type struct_or_union_specifier
%type struct_or_union
%type braced_struct_declaration_list
+/* No type for struct_declaration_lbrace. */
%type struct_declaration_list_with_rbrace
%type struct_declaration_list
%type struct_declaration
@@ -281,16 +296,23 @@ is_either(const char *s, const char *a,
%type notype_struct_declarator
%type type_struct_declarator
%type enum_specifier
+/* No type for enum. */
%type enum_declaration
+/* No type for enum_decl_lbrace. */
%type enums_with_opt_comma
%type enumerator_list
%type enumerator
%type type_qualifier
+/* No type for atomic. */
%type pointer
%type asterisk
%type type_qualifier_list_opt
%type type_qualifier_list
%type type_qualifier_list_elem
+/* No type for notype_init_declarators. */
+/* No type for type_init_declarators. */
+/* No type for notype_init_declarator. */
+/* No type for type_init_declarator. */
%type notype_declarator
%type type_declarator
%type notype_direct_declarator
@@ -300,6 +322,8 @@ is_either(const char *s, const char *a,
%type direct_param_declarator
%type direct_notype_param_declarator
%type param_list
+/* No type for id_list_lparen. */
+/* No type for abstract_decl_lparen. */
%type array_size_opt
%type array_size
%type identifier_list
@@ -308,16 +332,62 @@ is_either(const char *s, const char *a,
%type abstract_declarator
%type direct_abstract_declarator
%type abstract_decl_param_list
+/* No type for abstract_decl_lparen. */
%type vararg_parameter_type_list
%type parameter_type_list
%type parameter_declaration
+/* No type for braced_initializer. */
+/* No type for initializer. */
+/* No type for initializer_list. */
+/* No type for initializer_list_item. */
+/* No type for designation. */
+/* No type for begin_designation. */
+/* No type for designator_list. */
+/* No type for designator. */
+/* No type for static_assert_declaration. */
%type range
+/* No type for init_lbrace. */
+/* No type for init_rbrace. */
%type asm_or_symbolrename_opt
-
+/* No type for statement. */
+/* No type for non_expr_statement. */
+/* No type for labeled_statement. */
+/* No type for label. */
+/* No type for compound_statement. */
+/* No type for
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Mon Jul 10 11:46:14 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: cgram.y check-msgs.lua Log Message: lint: ensure that untyped grammar rules are listed Untyped grammar rules are suspicious because they subtly affect the order in which the grammar actions are performed. This leads to the various bugs mentioned in msg_347.c. To generate a diff of this commit: cvs rdiff -u -r1.447 -r1.448 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.18 -r1.19 src/usr.bin/xlint/lint1/check-msgs.lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Mon Jul 10 09:51:30 UTC 2023
Modified Files:
src/usr.bin/xlint/common: param.h
src/usr.bin/xlint/lint1: init.c lex.c tree.c
src/usr.bin/xlint/lint2: hash.c read.c
Log Message:
lint: clean up wchar_t and hash tables
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/xlint/common/param.h
cvs rdiff -u -r1.244 -r1.245 src/usr.bin/xlint/lint1/init.c
cvs rdiff -u -r1.172 -r1.173 src/usr.bin/xlint/lint1/lex.c
cvs rdiff -u -r1.558 -r1.559 src/usr.bin/xlint/lint1/tree.c
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/xlint/lint2/hash.c
cvs rdiff -u -r1.83 -r1.84 src/usr.bin/xlint/lint2/read.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/common/param.h
diff -u src/usr.bin/xlint/common/param.h:1.11 src/usr.bin/xlint/common/param.h:1.12
--- src/usr.bin/xlint/common/param.h:1.11 Fri Jun 9 15:36:31 2023
+++ src/usr.bin/xlint/common/param.h Mon Jul 10 09:51:30 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.11 2023/06/09 15:36:31 rillig Exp $ */
+/* $NetBSD: param.h,v 1.12 2023/07/10 09:51:30 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -32,19 +32,6 @@
*/
/*
- * Sizes of hash tables
- * Should be primes. Possible primes are
- * 307, 401, 503, 601, 701, 809, 907, 1009, 1103, 1201, 1301, 1409, 1511.
- *
- * HSHSIZ1 symbol table 1st pass
- * HSHSIZ2 symbol table 2nd pass
- * THSHSIZ2 type table 2nd pass
- */
-#define HSHSIZ1 503
-#define HSHSIZ2 1009
-#define THSHSIZ2 1009
-
-/*
* Pull in target-specific parameters.
*/
#include "targparam.h"
@@ -52,4 +39,4 @@
/*
* Make sure this matches wchar_t.
*/
-#define WCHAR INT
+#define WCHAR_TSPEC INT
Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.244 src/usr.bin/xlint/lint1/init.c:1.245
--- src/usr.bin/xlint/lint1/init.c:1.244 Sat Jul 1 06:09:24 2023
+++ src/usr.bin/xlint/lint1/init.c Mon Jul 10 09:51:30 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.244 2023/07/01 06:09:24 rillig Exp $ */
+/* $NetBSD: init.c,v 1.245 2023/07/10 09:51:30 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: init.c,v 1.244 2023/07/01 06:09:24 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.245 2023/07/10 09:51:30 rillig Exp $");
#endif
#include
@@ -206,7 +206,7 @@ can_init_character_array(const type_t *l
return rst == CHAR
? lst == CHAR || lst == UCHAR || lst == SCHAR
- : lst == WCHAR;
+ : lst == WCHAR_TSPEC;
}
/*
Index: src/usr.bin/xlint/lint1/lex.c
diff -u src/usr.bin/xlint/lint1/lex.c:1.172 src/usr.bin/xlint/lint1/lex.c:1.173
--- src/usr.bin/xlint/lint1/lex.c:1.172 Sun Jul 9 12:15:07 2023
+++ src/usr.bin/xlint/lint1/lex.c Mon Jul 10 09:51:30 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.172 2023/07/09 12:15:07 rillig Exp $ */
+/* $NetBSD: lex.c,v 1.173 2023/07/10 09:51:30 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: lex.c,v 1.172 2023/07/09 12:15:07 rillig Exp $");
+__RCSID("$NetBSD: lex.c,v 1.173 2023/07/10 09:51:30 rillig Exp $");
#endif
#include
@@ -182,7 +182,7 @@ static const struct keyword {
* The symbol table containing all keywords, identifiers and labels. The hash
* entries are linked via sym_t.s_symtab_next.
*/
-static sym_t *symtab[HSHSIZ1];
+static sym_t *symtab[503];
/*
* The kind of the next expected symbol, to distinguish the namespaces of
@@ -202,7 +202,7 @@ hash(const char *s)
v = (v << 4) + (unsigned char)*p;
v ^= v >> 28;
}
- return v % HSHSIZ1;
+ return v % (sizeof(symtab) / sizeof(symtab[0]));
}
static void
@@ -247,7 +247,7 @@ static void
symtab_remove_locals(void)
{
- for (size_t i = 0; i < HSHSIZ1; i++) {
+ for (size_t i = 0; i < sizeof(symtab) / sizeof(symtab[0]); i++) {
for (sym_t *sym = symtab[i]; sym != NULL; ) {
sym_t *next = sym->s_symtab_next;
if (sym->s_block_level >= 1)
@@ -927,7 +927,7 @@ lex_wide_character_constant(void)
}
yylval.y_val = xcalloc(1, sizeof(*yylval.y_val));
- yylval.y_val->v_tspec = WCHAR;
+ yylval.y_val->v_tspec = WCHAR_TSPEC;
yylval.y_val->v_char_constant = true;
yylval.y_val->u.integer = wc;
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.558 src/usr.bin/xlint/lint1/tree.c:1.559
--- src/usr.bin/xlint/lint1/tree.c:1.558 Sun Jul 9 12:04:08 2023
+++ src/usr.bin/xlint/lint1/tree.c Mon Jul 10 09:51:30 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.558 2023/07/09 12:04:08 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.559 2023/07/10 09:51:30 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: tree.c,v 1.558 2023/07/09 12:04:08 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.559 2023/07/10 09:51:30
CVS commit: src/usr.bin/xlint
Module Name:src Committed By: rillig Date: Mon Jul 10 09:51:30 UTC 2023 Modified Files: src/usr.bin/xlint/common: param.h src/usr.bin/xlint/lint1: init.c lex.c tree.c src/usr.bin/xlint/lint2: hash.c read.c Log Message: lint: clean up wchar_t and hash tables To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.bin/xlint/common/param.h cvs rdiff -u -r1.244 -r1.245 src/usr.bin/xlint/lint1/init.c cvs rdiff -u -r1.172 -r1.173 src/usr.bin/xlint/lint1/lex.c cvs rdiff -u -r1.558 -r1.559 src/usr.bin/xlint/lint1/tree.c cvs rdiff -u -r1.25 -r1.26 src/usr.bin/xlint/lint2/hash.c cvs rdiff -u -r1.83 -r1.84 src/usr.bin/xlint/lint2/read.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/host-mkdep
Module Name:src Committed By: rin Date: Mon Jul 10 08:55:44 UTC 2023 Modified Files: src/tools/host-mkdep: host-mkdep.in Log Message: host-mkdep(1): Add support for -iquote. Not used yet, but may eventually replace deprecated -I-, both for GCC and clang. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/tools/host-mkdep/host-mkdep.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/host-mkdep
Module Name:src
Committed By: rin
Date: Mon Jul 10 08:55:44 UTC 2023
Modified Files:
src/tools/host-mkdep: host-mkdep.in
Log Message:
host-mkdep(1): Add support for -iquote.
Not used yet, but may eventually replace deprecated -I-, both for
GCC and clang.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/tools/host-mkdep/host-mkdep.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/host-mkdep/host-mkdep.in
diff -u src/tools/host-mkdep/host-mkdep.in:1.32 src/tools/host-mkdep/host-mkdep.in:1.33
--- src/tools/host-mkdep/host-mkdep.in:1.32 Tue Oct 29 23:33:06 2019
+++ src/tools/host-mkdep/host-mkdep.in Mon Jul 10 08:55:44 2023
@@ -1,6 +1,6 @@
#!@BSHELL@ -
#
-# $NetBSD: host-mkdep.in,v 1.32 2019/10/29 23:33:06 joerg Exp $
+# $NetBSD: host-mkdep.in,v 1.33 2023/07/10 08:55:44 rin Exp $
#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
@@ -151,7 +151,7 @@ else
cppargs=${cppargs%x}
;;
- -[IDU]|-include|-isystem|-isysroot)
+ -[IDU]|-include|-iquote|-isystem|-isysroot)
set -- "$@" "$1" "$2"
shift 2
cppargs=${cppargs%xx}
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src
Committed By: mrg
Date: Mon Jul 10 07:59:24 UTC 2023
Modified Files:
src/external/bsd/jemalloc/lib: Makefile
Log Message:
this is not needed (or wanted) for jemalloc 1.0, so make it empty.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/jemalloc/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/lib/Makefile
diff -u src/external/bsd/jemalloc/lib/Makefile:1.3 src/external/bsd/jemalloc/lib/Makefile:1.4
--- src/external/bsd/jemalloc/lib/Makefile:1.3 Tue Mar 12 15:13:25 2019
+++ src/external/bsd/jemalloc/lib/Makefile Mon Jul 10 07:59:24 2023
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2019/03/12 15:13:25 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/07/10 07:59:24 mrg Exp $
WARNS?= 5
.include
LIB=jemalloc
+# The symbols from the stub only exist in newer jemalloc.
+.if ${HAVE_JEMALLOC:U0} != 100
SRCS=jemalloc_stub.c
+.endif
.include
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src Committed By: mrg Date: Mon Jul 10 07:59:24 UTC 2023 Modified Files: src/external/bsd/jemalloc/lib: Makefile Log Message: this is not needed (or wanted) for jemalloc 1.0, so make it empty. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/jemalloc/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/riscv
Module Name:src
Committed By: rin
Date: Mon Jul 10 07:04:20 UTC 2023
Modified Files:
src/sys/arch/riscv/riscv: autoconf.c riscv_machdep.c
Log Message:
riscv: Add FDT-based initrd, rndseed, and efirng support.
Can be used from our in-tree bootrisv64.efi.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/riscv/autoconf.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/riscv/riscv/riscv_machdep.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/arch/riscv/riscv/autoconf.c
diff -u src/sys/arch/riscv/riscv/autoconf.c:1.4 src/sys/arch/riscv/riscv/autoconf.c:1.5
--- src/sys/arch/riscv/riscv/autoconf.c:1.4 Sun May 7 12:41:48 2023
+++ src/sys/arch/riscv/riscv/autoconf.c Mon Jul 10 07:04:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.4 2023/05/07 12:41:48 skrll Exp $ */
+/* $NetBSD: autoconf.c,v 1.5 2023/07/10 07:04:20 rin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-__RCSID("$NetBSD: autoconf.c,v 1.4 2023/05/07 12:41:48 skrll Exp $");
+__RCSID("$NetBSD: autoconf.c,v 1.5 2023/07/10 07:04:20 rin Exp $");
#include
@@ -44,6 +44,8 @@ __RCSID("$NetBSD: autoconf.c,v 1.4 2023/
#include
+#include
+
void
cpu_configure(void)
{
@@ -63,6 +65,10 @@ cpu_rootconf(void)
}
void
-device_register(device_t dv, void *aux)
+device_register(device_t self, void *aux)
{
+
+ if (device_is_a(self, "mainbus")) {
+ fdt_setup_initrd();
+ }
}
Index: src/sys/arch/riscv/riscv/riscv_machdep.c
diff -u src/sys/arch/riscv/riscv/riscv_machdep.c:1.30 src/sys/arch/riscv/riscv/riscv_machdep.c:1.31
--- src/sys/arch/riscv/riscv/riscv_machdep.c:1.30 Mon Jul 10 07:01:48 2023
+++ src/sys/arch/riscv/riscv/riscv_machdep.c Mon Jul 10 07:04:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: riscv_machdep.c,v 1.30 2023/07/10 07:01:48 rin Exp $ */
+/* $NetBSD: riscv_machdep.c,v 1.31 2023/07/10 07:04:20 rin Exp $ */
/*-
* Copyright (c) 2014, 2019, 2022 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "opt_riscv_debug.h"
#include
-__RCSID("$NetBSD: riscv_machdep.c,v 1.30 2023/07/10 07:01:48 rin Exp $");
+__RCSID("$NetBSD: riscv_machdep.c,v 1.31 2023/07/10 07:04:20 rin Exp $");
#include
@@ -537,6 +537,9 @@ cpu_startup(void)
#endif
fdtbus_intr_init();
+
+ fdt_setup_rndseed();
+ fdt_setup_efirng();
}
static void
@@ -769,9 +772,17 @@ init_riscv(register_t hartid, paddr_t dt
VPRINTF("%s: memory start %" PRIx64 " end %" PRIx64 " (len %"
PRIx64 ")\n", __func__, memory_start, memory_end, memory_size);
+ /* Parse ramdisk, rndseed, and firmware's RNG from EFI */
+ fdt_probe_initrd();
+ fdt_probe_rndseed();
+ fdt_probe_efirng();
+
fdt_memory_remove_reserved(memory_start, memory_end);
fdt_memory_remove_range(dtb, dtbsize);
+ fdt_reserve_initrd();
+ fdt_reserve_rndseed();
+ fdt_reserve_efirng();
/* Perform PT build and VM init */
cpu_kernel_vm_init(memory_start, memory_end);
CVS commit: src/sys/arch/riscv/riscv
Module Name:src Committed By: rin Date: Mon Jul 10 07:04:20 UTC 2023 Modified Files: src/sys/arch/riscv/riscv: autoconf.c riscv_machdep.c Log Message: riscv: Add FDT-based initrd, rndseed, and efirng support. Can be used from our in-tree bootrisv64.efi. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/riscv/autoconf.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/riscv/riscv/riscv_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: rin Date: Mon Jul 10 07:01:48 UTC 2023 Modified Files: src/sys/arch/evbarm/fdt: fdt_machdep.c src/sys/arch/riscv/riscv: riscv_machdep.c src/sys/dev/fdt: fdt_boot.c fdt_boot.h Log Message: fdt(4): Factor out bootargs support from evbarm and riscv. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/sys/arch/evbarm/fdt/fdt_machdep.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/riscv/riscv/riscv_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/fdt_boot.c \ src/sys/dev/fdt/fdt_boot.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: rin
Date: Mon Jul 10 07:01:48 UTC 2023
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
src/sys/arch/riscv/riscv: riscv_machdep.c
src/sys/dev/fdt: fdt_boot.c fdt_boot.h
Log Message:
fdt(4): Factor out bootargs support from evbarm and riscv.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/riscv/riscv/riscv_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/fdt_boot.c \
src/sys/dev/fdt/fdt_boot.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/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.104 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.105
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.104 Mon Jul 10 07:00:12 2023
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Mon Jul 10 07:01:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.104 2023/07/10 07:00:12 rin Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.105 2023/07/10 07:01:48 rin Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.104 2023/07/10 07:00:12 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.105 2023/07/10 07:01:48 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_bootconfig.h"
@@ -110,12 +110,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep.
#include
#endif
-#ifndef FDT_MAX_BOOT_STRING
-#define FDT_MAX_BOOT_STRING 1024
-#endif
-
BootConfig bootconfig;
-char bootargs[FDT_MAX_BOOT_STRING] = "";
char *boot_args = NULL;
/* filled in before cleaning bss. keep in .data */
@@ -282,10 +277,7 @@ initarm(void *arg)
/* Early console may be available, announce ourselves. */
VPRINTF("FDT<%p>\n", fdt_addr_r);
- const int chosen = OF_finddevice("/chosen");
- if (chosen >= 0)
- OF_getprop(chosen, "bootargs", bootargs, sizeof(bootargs));
- boot_args = bootargs;
+ boot_args = fdt_get_bootargs();
/* Heads up ... Setup the CPU / MMU / TLB functions. */
VPRINTF("cpufunc\n");
@@ -383,7 +375,7 @@ initarm(void *arg)
/* Perform PT build and VM init */
cpu_kernel_vm_init(memory_start, memory_size);
- VPRINTF("bootargs: %s\n", bootargs);
+ VPRINTF("bootargs: %s\n", boot_args);
parse_mi_bootargs(boot_args);
Index: src/sys/arch/riscv/riscv/riscv_machdep.c
diff -u src/sys/arch/riscv/riscv/riscv_machdep.c:1.29 src/sys/arch/riscv/riscv/riscv_machdep.c:1.30
--- src/sys/arch/riscv/riscv/riscv_machdep.c:1.29 Mon Jun 12 19:04:14 2023
+++ src/sys/arch/riscv/riscv/riscv_machdep.c Mon Jul 10 07:01:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: riscv_machdep.c,v 1.29 2023/06/12 19:04:14 skrll Exp $ */
+/* $NetBSD: riscv_machdep.c,v 1.30 2023/07/10 07:01:48 rin Exp $ */
/*-
* Copyright (c) 2014, 2019, 2022 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "opt_riscv_debug.h"
#include
-__RCSID("$NetBSD: riscv_machdep.c,v 1.29 2023/06/12 19:04:14 skrll Exp $");
+__RCSID("$NetBSD: riscv_machdep.c,v 1.30 2023/07/10 07:01:48 rin Exp $");
#include
@@ -81,13 +81,9 @@ char machine_arch[] = MACHINE_ARCH;
#define VPRINTF(...) __nothing
#endif
-#ifndef FDT_MAX_BOOT_STRING
-#define FDT_MAX_BOOT_STRING 1024
-#endif
/* 64 should be enough, even for a ZFS UUID */
#define MAX_BOOT_DEV_STR 64
-char bootargs[FDT_MAX_BOOT_STRING] = "";
char bootdevstr[MAX_BOOT_DEV_STR] = "";
char *boot_args = NULL;
@@ -716,10 +712,7 @@ init_riscv(register_t hartid, paddr_t dt
/* Early console may be available, announce ourselves. */
VPRINTF("FDT<%p>\n", fdt_data);
- const int chosen = OF_finddevice("/chosen");
- if (chosen >= 0)
- OF_getprop(chosen, "bootargs", bootargs, sizeof(bootargs));
- boot_args = bootargs;
+ boot_args = fdt_get_bootargs();
VPRINTF("devmap %p\n", plat->fp_devmap());
pmap_devmap_bootstrap(0, plat->fp_devmap());
@@ -783,7 +776,7 @@ init_riscv(register_t hartid, paddr_t dt
/* Perform PT build and VM init */
cpu_kernel_vm_init(memory_start, memory_end);
- VPRINTF("bootargs: %s\n", bootargs);
+ VPRINTF("bootargs: %s\n", boot_args);
parse_mi_bootargs(boot_args);
Index: src/sys/dev/fdt/fdt_boot.c
diff -u src/sys/dev/fdt/fdt_boot.c:1.2 src/sys/dev/fdt/fdt_boot.c:1.3
--- src/sys/dev/fdt/fdt_boot.c:1.2 Mon Jul 10 07:00:12 2023
+++ src/sys/dev/fdt/fdt_boot.c Mon Jul 10 07:01:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_boot.c,v 1.2 2023/07/10 07:00:12 rin Exp $ */
+/* $NetBSD: fdt_boot.c,v 1.3 2023/07/10 07:01:48 rin Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -56,7 +56,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_boot.c,v 1.2 2023/07/10 07:00:12 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_boot.c,v 1.3 2023/07/10 07:01:48 rin Exp $");
#include "opt_efi.h"
#include "opt_md.h"
@@ -87,6 +87,11 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_boot.c,v
#endif
#include
+#ifndef FDT_MAX_BOOT_STRING
+#define
CVS commit: src/sys
Module Name:src
Committed By: rin
Date: Mon Jul 10 07:00:12 UTC 2023
Modified Files:
src/sys/arch/aarch64/aarch64: efi_machdep.c
src/sys/arch/arm/arm: efi_machdep.c efi_runtime.h
src/sys/arch/evbarm/fdt: fdt_machdep.c
src/sys/dev/fdt: fdt_boot.c fdt_boot.h
Added Files:
src/sys/arch/arm/include: efirt.h
src/sys/arch/evbarm/include: efirt.h
Log Message:
Factor out some fdt(4) features from {,evb}arm into dev/fdt.
Now, FDT-based support to efirt, initrd, rndseed, and efirng can be
used from, e.g., riscv.
Mostly from Nick Hudson.
XXX
As Nick comments, there can be some optimizations for fdt_map_range().
efiboot may also be modified to load these objects into aligned PAs.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/aarch64/aarch64/efi_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm/efi_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm/efi_runtime.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/include/efirt.h
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/include/efirt.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/fdt_boot.c \
src/sys/dev/fdt/fdt_boot.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: rin
Date: Mon Jul 10 07:00:12 UTC 2023
Modified Files:
src/sys/arch/aarch64/aarch64: efi_machdep.c
src/sys/arch/arm/arm: efi_machdep.c efi_runtime.h
src/sys/arch/evbarm/fdt: fdt_machdep.c
src/sys/dev/fdt: fdt_boot.c fdt_boot.h
Added Files:
src/sys/arch/arm/include: efirt.h
src/sys/arch/evbarm/include: efirt.h
Log Message:
Factor out some fdt(4) features from {,evb}arm into dev/fdt.
Now, FDT-based support to efirt, initrd, rndseed, and efirng can be
used from, e.g., riscv.
Mostly from Nick Hudson.
XXX
As Nick comments, there can be some optimizations for fdt_map_range().
efiboot may also be modified to load these objects into aligned PAs.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/aarch64/aarch64/efi_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm/efi_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm/efi_runtime.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/include/efirt.h
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/include/efirt.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/fdt_boot.c \
src/sys/dev/fdt/fdt_boot.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/arch/aarch64/aarch64/efi_machdep.c
diff -u src/sys/arch/aarch64/aarch64/efi_machdep.c:1.13 src/sys/arch/aarch64/aarch64/efi_machdep.c:1.14
--- src/sys/arch/aarch64/aarch64/efi_machdep.c:1.13 Tue May 3 20:10:20 2022
+++ src/sys/arch/aarch64/aarch64/efi_machdep.c Mon Jul 10 07:00:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_machdep.c,v 1.13 2022/05/03 20:10:20 skrll Exp $ */
+/* $NetBSD: efi_machdep.c,v 1.14 2023/07/10 07:00:11 rin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,12 +30,14 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.13 2022/05/03 20:10:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.14 2023/07/10 07:00:11 rin Exp $");
#include
+
#include
#include
+#include
#include
@@ -49,8 +51,8 @@ static struct {
static bool efi_userva = true;
void
-arm_efirt_md_map_range(vaddr_t va, paddr_t pa, size_t sz,
-enum arm_efirt_mem_type type)
+cpu_efirt_map_range(vaddr_t va, paddr_t pa, size_t sz,
+enum cpu_efirt_mem_type type)
{
int flags = 0;
int prot = 0;
Index: src/sys/arch/arm/arm/efi_machdep.c
diff -u src/sys/arch/arm/arm/efi_machdep.c:1.3 src/sys/arch/arm/arm/efi_machdep.c:1.4
--- src/sys/arch/arm/arm/efi_machdep.c:1.3 Sun Dec 18 12:02:46 2022
+++ src/sys/arch/arm/arm/efi_machdep.c Mon Jul 10 07:00:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_machdep.c,v 1.3 2022/12/18 12:02:46 skrll Exp $ */
+/* $NetBSD: efi_machdep.c,v 1.4 2023/07/10 07:00:12 rin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,11 +30,13 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.3 2022/12/18 12:02:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.4 2023/07/10 07:00:12 rin Exp $");
#include
+
#include
+#include
#include
#include
@@ -101,8 +103,8 @@ arm_efirt_md_exit(void)
void
-arm_efirt_md_map_range(vaddr_t va, paddr_t pa, size_t sz,
-enum arm_efirt_mem_type type)
+cpu_efirt_map_range(vaddr_t va, paddr_t pa, size_t sz,
+enum cpu_efirt_mem_type type)
{
int flags = 0;
int prot = 0;
Index: src/sys/arch/arm/arm/efi_runtime.h
diff -u src/sys/arch/arm/arm/efi_runtime.h:1.4 src/sys/arch/arm/arm/efi_runtime.h:1.5
--- src/sys/arch/arm/arm/efi_runtime.h:1.4 Sun Oct 10 13:03:09 2021
+++ src/sys/arch/arm/arm/efi_runtime.h Mon Jul 10 07:00:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_runtime.h,v 1.4 2021/10/10 13:03:09 jmcneill Exp $ */
+/* $NetBSD: efi_runtime.h,v 1.5 2023/07/10 07:00:12 rin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -44,13 +44,6 @@ efi_status arm_efirt_setvar(uint16_t *,
u_long, void *);
int arm_efirt_reset(enum efi_reset);
-enum arm_efirt_mem_type {
- ARM_EFIRT_MEM_CODE,
- ARM_EFIRT_MEM_DATA,
- ARM_EFIRT_MEM_MMIO,
-};
-
-void arm_efirt_md_map_range(vaddr_t, paddr_t, size_t, enum arm_efirt_mem_type);
int arm_efirt_md_enter(void);
void arm_efirt_md_exit(void);
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.103 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.104
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.103 Sat Apr 22 09:53:45 2023
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Mon Jul 10 07:00:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.103 2023/04/22 09:53:45 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.104 2023/07/10 07:00:12 rin Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.103 2023/04/22 09:53:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.104 2023/07/10 07:00:12 rin Exp $");
CVS commit: src/sys/kern
Module Name:src Committed By: mrg Date: Mon Jul 10 06:42:33 UTC 2023 Modified Files: src/sys/kern: files.kern Log Message: add missing sys_memfd.c. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/kern/files.kern Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/files.kern diff -u src/sys/kern/files.kern:1.58 src/sys/kern/files.kern:1.59 --- src/sys/kern/files.kern:1.58 Fri Jul 7 12:34:50 2023 +++ src/sys/kern/files.kern Mon Jul 10 06:42:33 2023 @@ -1,4 +1,4 @@ -# $NetBSD: files.kern,v 1.58 2023/07/07 12:34:50 riastradh Exp $ +# $NetBSD: files.kern,v 1.59 2023/07/10 06:42:33 mrg Exp $ # # kernel sources @@ -165,6 +165,7 @@ file kern/sys_eventfd.c kern file kern/sys_futex.c kern file kern/sys_generic.c kern file kern/sys_getrandom.c kern +file kern/sys_memfd.c kern file kern/sys_module.c kern file kern/sys_mqueue.c mqueue file kern/sys_lwp.c kern
CVS commit: src/sys/kern
Module Name:src Committed By: mrg Date: Mon Jul 10 06:42:33 UTC 2023 Modified Files: src/sys/kern: files.kern Log Message: add missing sys_memfd.c. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/kern/files.kern Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
