CVS commit: src
Module Name:src
Committed By: chs
Date: Mon Dec 26 22:22:22 UTC 2022
Modified Files:
src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common:
sanitizer_interceptors_ioctl_netbsd.inc
sanitizer_platform_limits_netbsd.cc
sanitizer_platform_limits_netbsd.h
src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common:
sanitizer_interceptors_ioctl_netbsd.inc
sanitizer_platform_limits_netbsd.cc
sanitizer_platform_limits_netbsd.h
Log Message:
remove the PPP HDLC ioctls from more copies of sanitizers.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc
\
src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
diff -u src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.1.1.1 src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.2
--- src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.1.1.1 Fri Apr 9 22:33:11 2021
+++ src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc Mon Dec 26 22:22:22 2022
@@ -1267,8 +1267,6 @@ static void ioctl_table_fill() {
_(TIOCGFLAGS, WRITE, sizeof(int));
_(TIOCSFLAGS, READ, sizeof(int));
_(TIOCDCDTIMESTAMP, WRITE, struct_timeval_sz);
- _(TIOCRCVFRAME, READ, sizeof(uptr));
- _(TIOCXMTFRAME, READ, sizeof(uptr));
_(TIOCPTMGET, WRITE, struct_ptmget_sz);
_(TIOCGRANTPT, NONE, 0);
_(TIOCPTSNAME, WRITE, struct_ptmget_sz);
Index: src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc
diff -u src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc:1.1.1.2 src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc:1.2
--- src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc:1.1.1.2 Fri Apr 9 22:33:11 2021
+++ src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc Mon Dec 26 22:22:22 2022
@@ -2341,8 +2341,6 @@ unsigned IOCTL_TIOCDRAIN = TIOCDRAIN;
unsigned IOCTL_TIOCGFLAGS = TIOCGFLAGS;
unsigned IOCTL_TIOCSFLAGS = TIOCSFLAGS;
unsigned IOCTL_TIOCDCDTIMESTAMP = TIOCDCDTIMESTAMP;
-unsigned IOCTL_TIOCRCVFRAME = TIOCRCVFRAME;
-unsigned IOCTL_TIOCXMTFRAME = TIOCXMTFRAME;
unsigned IOCTL_TIOCPTMGET = TIOCPTMGET;
unsigned IOCTL_TIOCGRANTPT = TIOCGRANTPT;
unsigned IOCTL_TIOCPTSNAME = TIOCPTSNAME;
Index: src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h
diff -u src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h:1.1.1.2 src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h:1.2
--- src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h:1.1.1.2 Fri Apr 9 22:33:11 2021
+++ src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h Mon Dec 26 22:22:22 2022
@@ -2194,8 +2194,6 @@ extern unsigned IOCTL_TIOCDRAIN;
extern unsigned IOCTL_TIOCGFLAGS;
extern unsigned IOCTL_TIOCSFLAGS;
extern unsigned IOCTL_TIOCDCDTIMESTAMP;
-extern unsigned IOCTL_TIOCRCVFRAME;
-extern unsigned IOCTL_TIOCXMTFRAME;
extern unsigned IOCTL_TIOCPTMGET;
extern unsigned IOCTL_TIOCGRANTPT;
extern unsigned IOCTL_TIOCPTSNAME;
Index: src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
diff -u src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.4 src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.5
--- src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.4 Fri Jan 31 14:01:36 2020
+++ src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc Mon Dec 26 22:22:22 2022
CVS commit: src
Module Name:src Committed By: chs Date: Mon Dec 26 22:22:22 UTC 2022 Modified Files: src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common: sanitizer_interceptors_ioctl_netbsd.inc sanitizer_platform_limits_netbsd.cc sanitizer_platform_limits_netbsd.h src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common: sanitizer_interceptors_ioctl_netbsd.inc sanitizer_platform_limits_netbsd.cc sanitizer_platform_limits_netbsd.h Log Message: remove the PPP HDLC ioctls from more copies of sanitizers. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc \ src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: christos Date: Mon Dec 26 17:46:00 UTC 2022 Modified Files: src/sys/arch/amd64/amd64: locore.S Log Message: sysret -> sysretl for new binutils To generate a diff of this commit: cvs rdiff -u -r1.214 -r1.215 src/sys/arch/amd64/amd64/locore.S 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/amd64/amd64/locore.S diff -u src/sys/arch/amd64/amd64/locore.S:1.214 src/sys/arch/amd64/amd64/locore.S:1.215 --- src/sys/arch/amd64/amd64/locore.S:1.214 Tue Sep 6 20:40:18 2022 +++ src/sys/arch/amd64/amd64/locore.S Mon Dec 26 12:46:00 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.214 2022/09/07 00:40:18 knakahara Exp $ */ +/* $NetBSD: locore.S,v 1.215 2022/12/26 17:46:00 christos Exp $ */ /* * Copyright-o-rama! @@ -1527,7 +1527,7 @@ SYSCALL_ENTRY syscall_svs,is_svs=1 #endif IDTVEC(syscall32) - sysret /* go away please */ + sysretl /* go away please */ IDTVEC_END(syscall32) TEXT_USER_END
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: christos Date: Mon Dec 26 17:46:00 UTC 2022 Modified Files: src/sys/arch/amd64/amd64: locore.S Log Message: sysret -> sysretl for new binutils To generate a diff of this commit: cvs rdiff -u -r1.214 -r1.215 src/sys/arch/amd64/amd64/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Mon Dec 26 16:42:50 UTC 2022 Modified Files: src/distrib/sets/lists/debug: mi shl.mi Log Message: make gnu ctf needed for all new binutils. To generate a diff of this commit: cvs rdiff -u -r1.394 -r1.395 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.299 -r1.300 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.394 src/distrib/sets/lists/debug/mi:1.395 --- src/distrib/sets/lists/debug/mi:1.394 Wed Nov 30 01:07:51 2022 +++ src/distrib/sets/lists/debug/mi Mon Dec 26 11:42:50 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.394 2022/11/30 06:07:51 ozaki-r Exp $ +# $NetBSD: mi,v 1.395 2022/12/26 16:42:50 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -72,7 +72,7 @@ ./usr/lib/libgcc_g.acomp-c-debuglib debuglib,compatfile,gcc ./usr/lib/libgcc_s_g.acomp-c-debuglib debuglib,compatfile,gcccmds ./usr/lib/libgcov_g.acomp-c-debuglib debuglib,compatfile,gcc -./usr/lib/libgnuctf_g.acomp-c-debuglib debuglib,compatfile,binutils=234 +./usr/lib/libgnuctf_g.acomp-c-debuglib debuglib,compatfile,binutils ./usr/lib/libgnumalloc_g.a comp-c-debuglib debuglib,compatfile ./usr/lib/libgomp_g.acomp-c-debuglib debuglib,compatfile,gcc ./usr/lib/libgssapi_g.acomp-c-debuglib debuglib,compatfile,kerberos Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.299 src/distrib/sets/lists/debug/shl.mi:1.300 --- src/distrib/sets/lists/debug/shl.mi:1.299 Sat Dec 24 18:01:35 2022 +++ src/distrib/sets/lists/debug/shl.mi Mon Dec 26 11:42:50 2022 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.299 2022/12/24 23:01:35 christos Exp $ +# $NetBSD: shl.mi,v 1.300 2022/12/26 16:42:50 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -125,8 +125,7 @@ ./usr/libdata/debug/usr/lib/libg2c.so.2.0.debug comp-obsolete obsolete ./usr/libdata/debug/usr/lib/libgcc_s.so.1.0.debug comp-sys-debug debug,compatfile,gcc ./usr/libdata/debug/usr/lib/libgmp.so.10.2.debug comp-obsolete obsolete -./usr/libdata/debug/usr/lib/libgnuctf.so.0.0.debug comp-sys-debug debug,compatfile,binutils=234 -./usr/libdata/debug/usr/lib/libgnuctf.so.1.0.debug comp-sys-debug debug,compatfile,binutils=239 +./usr/libdata/debug/usr/lib/libgnuctf.so.1.0.debug comp-sys-debug debug,compatfile,binutils ./usr/libdata/debug/usr/lib/libgnumalloc.so.1.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libgomp.so.1.3.debug comp-sys-debug compatfile,obsolete ./usr/libdata/debug/usr/lib/libgomp.so.2.0.debug comp-sys-debug debug,compatfile,gcc=9
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Mon Dec 26 16:42:50 UTC 2022 Modified Files: src/distrib/sets/lists/debug: mi shl.mi Log Message: make gnu ctf needed for all new binutils. To generate a diff of this commit: cvs rdiff -u -r1.394 -r1.395 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.299 -r1.300 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/usr.bin/common
Module Name:src
Committed By: christos
Date: Mon Dec 26 16:41:01 UTC 2022
Modified Files:
src/external/gpl3/binutils/usr.bin/common: Makefile.prog
Log Message:
Strip doc from the man path
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/binutils/usr.bin/common/Makefile.prog
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/usr.bin/common/Makefile.prog
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.10 src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.11
--- src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.10 Tue Jan 26 14:37:47 2016
+++ src/external/gpl3/binutils/usr.bin/common/Makefile.prog Mon Dec 26 11:41:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.prog,v 1.10 2016/01/26 19:37:47 christos Exp $
+# $NetBSD: Makefile.prog,v 1.11 2022/12/26 16:41:00 christos Exp $
#
# Common Makefile fragment for a binutils program.
#
@@ -17,7 +17,7 @@ BUPROG= ${G_PROGRAMS:M${XPROG}*:S/-/_/}
SRCS= ${G_${BUPROG}_OBJECTS:.o=.c} \
${G_${BUPROG}_DEPENDENCIES:M*.o:.o=.c}
-MAN= ${G_man_MANS:M${PROG}.1}
+MAN= ${G_man_MANS:T:M${PROG}.1}
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
CVS commit: src/external/gpl3/binutils/usr.bin/common
Module Name:src Committed By: christos Date: Mon Dec 26 16:41:01 UTC 2022 Modified Files: src/external/gpl3/binutils/usr.bin/common: Makefile.prog Log Message: Strip doc from the man path To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/binutils/usr.bin/common/Makefile.prog Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: msaitoh Date: Mon Dec 26 15:52:37 UTC 2022 Modified Files: src/sys/arch/amd64/amd64: genassym.cf src/sys/arch/i386/i386: genassym.cf Log Message: Reduce diff between i386/i386/genassym.cf and amd64/amd64/genassym.cf. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.129 -r1.130 src/sys/arch/i386/i386/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: msaitoh Date: Mon Dec 26 15:52:37 UTC 2022 Modified Files: src/sys/arch/amd64/amd64: genassym.cf src/sys/arch/i386/i386: genassym.cf Log Message: Reduce diff between i386/i386/genassym.cf and amd64/amd64/genassym.cf. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.129 -r1.130 src/sys/arch/i386/i386/genassym.cf 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/amd64/amd64/genassym.cf diff -u src/sys/arch/amd64/amd64/genassym.cf:1.91 src/sys/arch/amd64/amd64/genassym.cf:1.92 --- src/sys/arch/amd64/amd64/genassym.cf:1.91 Mon Dec 26 09:39:30 2022 +++ src/sys/arch/amd64/amd64/genassym.cf Mon Dec 26 15:52:37 2022 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.91 2022/12/26 09:39:30 msaitoh Exp $ +# $NetBSD: genassym.cf,v 1.92 2022/12/26 15:52:37 msaitoh Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -69,6 +69,11 @@ include "opt_compat_linux32.h" include "opt_xen.h" endif +if defined(_KERNEL) && defined(_KERNEL_OPT) +include "isa.h" +include "ioapic.h" +endif + quote #define __MUTEX_PRIVATE quote #define __RWLOCK_PRIVATE @@ -107,10 +112,6 @@ if defined(COMPAT_LINUX32) include endif -if defined(_KERNEL) && defined(_KERNEL_OPT) -include "isa.h" -include "ioapic.h" -endif if NISA > 0 include endif @@ -123,7 +124,7 @@ endif ifdef XEN include include -endif +endif include Index: src/sys/arch/i386/i386/genassym.cf diff -u src/sys/arch/i386/i386/genassym.cf:1.129 src/sys/arch/i386/i386/genassym.cf:1.130 --- src/sys/arch/i386/i386/genassym.cf:1.129 Mon Dec 26 09:39:29 2022 +++ src/sys/arch/i386/i386/genassym.cf Mon Dec 26 15:52:37 2022 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.129 2022/12/26 09:39:29 msaitoh Exp $ +# $NetBSD: genassym.cf,v 1.130 2022/12/26 15:52:37 msaitoh Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -70,6 +70,11 @@ include "opt_compat_netbsd.h" include "opt_xen.h" endif +if defined(_KERNEL) && defined(_KERNEL_OPT) +include "isa.h" +include "ioapic.h" +endif + quote #define __MUTEX_PRIVATE quote #define __RWLOCK_PRIVATE @@ -98,15 +103,6 @@ include include include -ifdef XEN -include -include -endif - -if defined(_KERNEL) && defined(_KERNEL_OPT) -include "ioapic.h" -endif - include ifdef COMPAT_LINUX @@ -118,16 +114,18 @@ ifdef COMPAT_FREEBSD include endif +if NISA > 0 +include +endif + if NIOAPIC > 0 include include endif -if defined(_KERNEL) && defined(_KERNEL_OPT) -include "isa.h" -endif -if NISA > 0 -include +ifdef XEN +include +include endif include
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Mon Dec 26 11:25:01 UTC 2022 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #23 and #24 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.8 src/doc/CHANGES-10.0:1.1.2.9 --- src/doc/CHANGES-10.0:1.1.2.8 Sat Dec 24 17:18:51 2022 +++ src/doc/CHANGES-10.0 Mon Dec 26 11:25:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.8 2022/12/24 17:18:51 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.9 2022/12/26 11:25:01 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -360,3 +360,15 @@ usr.sbin/tprof/tprof_top.c 1.8 tprof(8): use malloc instead of alloca so that SSP works. [christos, ticket #22] +sys/arch/evbarm/conf/GENERIC64 1.207 + + evbarm: PR 57044: allow vcaudio on RPI 4 to attach when booting + via EFI. + [nia, ticket #23] + +usr.sbin/tprof/tprof.c1.19,1.20 + + tprof(8): reflect recent new options for top operation, add a and c. + Fix parsing of event options. + [ryo, ticket #24] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Mon Dec 26 11:25:01 UTC 2022 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #23 and #24 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/tprof
Module Name:src
Committed By: martin
Date: Mon Dec 26 11:23:57 UTC 2022
Modified Files:
src/usr.sbin/tprof [netbsd-10]: tprof.c
Log Message:
Pull up following revision(s) (requested by ryo in ticket #24):
usr.sbin/tprof/tprof.c: revision 1.19
usr.sbin/tprof/tprof.c: revision 1.20
Reflect recent new options for top operation, add a and c
fixed parsing of event options.
if event option was specivied, it was stuck in a busy loop.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.2.1 src/usr.sbin/tprof/tprof.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.sbin/tprof/tprof.c
diff -u src/usr.sbin/tprof/tprof.c:1.18 src/usr.sbin/tprof/tprof.c:1.18.2.1
--- src/usr.sbin/tprof/tprof.c:1.18 Fri Dec 16 08:02:04 2022
+++ src/usr.sbin/tprof/tprof.c Mon Dec 26 11:23:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof.c,v 1.18 2022/12/16 08:02:04 ryo Exp $ */
+/* $NetBSD: tprof.c,v 1.18.2.1 2022/12/26 11:23:56 martin Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: tprof.c,v 1.18 2022/12/16 08:02:04 ryo Exp $");
+__RCSID("$NetBSD: tprof.c,v 1.18.2.1 2022/12/26 11:23:56 martin Exp $");
#endif /* not lint */
#include
@@ -133,7 +133,7 @@ usage(void)
" only outputs a counter.\n");
fprintf(stderr, "\tanalyze [-CkLPs] [-p pid] file\n");
fprintf(stderr, "\t\tAnalyze the samples of the file 'file'.\n");
- fprintf(stderr, "\ttop [-e name [-e ...]] [-i interval] [-u]\n");
+ fprintf(stderr, "\ttop [-e name [-e ...]] [-i interval] [-acu]\n");
fprintf(stderr, "\t\tDisplay profiling results in real-time.\n");
exit(EXIT_FAILURE);
}
@@ -310,6 +310,7 @@ tprof_parse_event(tprof_param_t *param,
"invalid option: '%c'", *opt);
goto done;
}
+ opt++;
}
} else if (allow_option) {
param->p_flags |= TPROF_PARAM_USER;
CVS commit: [netbsd-10] src/usr.sbin/tprof
Module Name:src Committed By: martin Date: Mon Dec 26 11:23:57 UTC 2022 Modified Files: src/usr.sbin/tprof [netbsd-10]: tprof.c Log Message: Pull up following revision(s) (requested by ryo in ticket #24): usr.sbin/tprof/tprof.c: revision 1.19 usr.sbin/tprof/tprof.c: revision 1.20 Reflect recent new options for top operation, add a and c fixed parsing of event options. if event option was specivied, it was stuck in a busy loop. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.2.1 src/usr.sbin/tprof/tprof.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Mon Dec 26 11:20:59 UTC 2022 Modified Files: src/sys/arch/evbarm/conf [netbsd-10]: GENERIC64 Log Message: Pull up following revision(s) (requested by nia in ticket #23): sys/arch/evbarm/conf/GENERIC64: revision 1.207 PR port-arm/57044 allow vcaudio on RPI 4 to attach when booting with EFI To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.206.2.1 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Mon Dec 26 11:20:59 UTC 2022 Modified Files: src/sys/arch/evbarm/conf [netbsd-10]: GENERIC64 Log Message: Pull up following revision(s) (requested by nia in ticket #23): sys/arch/evbarm/conf/GENERIC64: revision 1.207 PR port-arm/57044 allow vcaudio on RPI 4 to attach when booting with EFI To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.206.2.1 src/sys/arch/evbarm/conf/GENERIC64 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/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.206 src/sys/arch/evbarm/conf/GENERIC64:1.206.2.1 --- src/sys/arch/evbarm/conf/GENERIC64:1.206 Sat Oct 29 13:59:57 2022 +++ src/sys/arch/evbarm/conf/GENERIC64 Mon Dec 26 11:20:59 2022 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.206 2022/10/29 13:59:57 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.206.2.1 2022/12/26 11:20:59 martin Exp $ # # GENERIC ARM (aarch64) kernel # @@ -431,8 +431,9 @@ m25p* at spi? spiflash* at spiflashbus? # Broadcom VCHIQ, etc -vchiq0 at fdt? -vcaudio0 at vchiq0 +vchiq* at fdt? +vchiq* at acpi? +vcaudio0 at vchiq? # Audio support hdaudio* at fdt? # Intel HDA
CVS commit: src/sys/arch
Module Name:src Committed By: msaitoh Date: Mon Dec 26 09:39:30 UTC 2022 Modified Files: src/sys/arch/amd64/amd64: genassym.cf src/sys/arch/i386/i386: genassym.cf Log Message: Sort lines. Add comment. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.128 -r1.129 src/sys/arch/i386/i386/genassym.cf 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/amd64/amd64/genassym.cf diff -u src/sys/arch/amd64/amd64/genassym.cf:1.90 src/sys/arch/amd64/amd64/genassym.cf:1.91 --- src/sys/arch/amd64/amd64/genassym.cf:1.90 Mon Dec 26 09:12:42 2022 +++ src/sys/arch/amd64/amd64/genassym.cf Mon Dec 26 09:39:30 2022 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.90 2022/12/26 09:12:42 msaitoh Exp $ +# $NetBSD: genassym.cf,v 1.91 2022/12/26 09:39:30 msaitoh Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -127,13 +127,13 @@ endif include +# general constants define PAGE_SIZE PAGE_SIZE define UPAGES UPAGES define USPACE USPACE define PGOFSET PGOFSET define PGSHIFT PGSHIFT - define KERNBASE_LO KERNBASE_LO define KERNBASE_HI KERNBASE_HI define KERNBASE KERNBASE @@ -151,6 +151,7 @@ define PDE_SIZE sizeof(pd_entry_t) define VM_MAXUSER_ADDRESS (unsigned long long)VM_MAXUSER_ADDRESS +# lwp & proc fields and values define L_PCB offsetof(struct lwp, l_addr) define L_CPU offsetof(struct lwp, l_cpu) define L_FLAG offsetof(struct lwp, l_flag) @@ -173,13 +174,7 @@ define P_MD_SYSCALL offsetof(struct pro define LW_SYSTEM LW_SYSTEM -define M_DATA offsetof(struct mbuf, m_data) -define M_LEN offsetof(struct mbuf, m_len) -define M_NEXT offsetof(struct mbuf, m_next) - -define IP_SRC offsetof(struct ip, ip_src) -define IP_DST offsetof(struct ip, ip_dst) - +# pcb fields define PCB_CR3 offsetof(struct pcb, pcb_cr3) define PCB_CR0 offsetof(struct pcb, pcb_cr0) define PCB_ONFAULT offsetof(struct pcb, pcb_onfault) @@ -236,6 +231,7 @@ endif define TSS_RSP0 offsetof(struct cpu_tss, tss.tss_rsp0) +# CPU info structure define CPU_INFO_SCRATCH offsetof(struct cpu_info, ci_scratch) define CPU_INFO_SELF offsetof(struct cpu_info, ci_self) define CPU_INFO_RESCHED offsetof(struct cpu_info, ci_want_resched) @@ -302,6 +298,7 @@ define IOAPIC_SC_DATA offsetof(struct define PIC_LOCK offsetof(struct pic, pic_lock) endif +# interrupt handler fields define IH_FUN offsetof(struct intrhand, ih_fun) define IH_ARG offsetof(struct intrhand, ih_arg) define IH_LEVEL offsetof(struct intrhand, ih_level) @@ -344,6 +341,13 @@ define IREENT_MAGIC IREENT_MAGIC define PSL_MBO PSL_MBO +# Constants required for in_cksum() and friends. +define M_DATA offsetof(struct mbuf, m_data) +define M_LEN offsetof(struct mbuf, m_len) +define M_NEXT offsetof(struct mbuf, m_next) +define IP_SRC offsetof(struct ip, ip_src) +define IP_DST offsetof(struct ip, ip_dst) + define MTX_IPL offsetof(struct kmutex, u.s.mtxs_ipl) define MTX_LOCK offsetof(struct kmutex, u.s.mtxs_lock) define MTX_OWNER offsetof(struct kmutex, u.mtxa_owner) Index: src/sys/arch/i386/i386/genassym.cf diff -u src/sys/arch/i386/i386/genassym.cf:1.128 src/sys/arch/i386/i386/genassym.cf:1.129 --- src/sys/arch/i386/i386/genassym.cf:1.128 Mon Dec 26 09:12:42 2022 +++ src/sys/arch/i386/i386/genassym.cf Mon Dec 26 09:39:29 2022 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.128 2022/12/26 09:12:42 msaitoh Exp $ +# $NetBSD: genassym.cf,v 1.129 2022/12/26 09:39:29 msaitoh Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -132,6 +132,7 @@ endif include +# general constants define PAGE_SIZE PAGE_SIZE define UPAGES UPAGES define USPACE USPACE @@ -159,6 +160,7 @@ define IOMAPSIZE IOMAPSIZE define VM_MAXUSER_ADDRESS (int)VM_MAXUSER_ADDRESS +# lwp & proc fields and values define L_PCB offsetof(struct lwp, l_addr) define L_CPU offsetof(struct lwp, l_cpu) define L_FLAG offsetof(struct lwp, l_flag) @@ -182,16 +184,10 @@ define LW_SYSTEM LW_SYSTEM define GUFS_SEL GUFS_SEL define GUGS_SEL GUGS_SEL -define M_DATA offsetof(struct mbuf, m_data) -define M_LEN offsetof(struct mbuf, m_len) -define M_NEXT offsetof(struct mbuf, m_next) - -define IP_SRC offsetof(struct ip, ip_src) -define IP_DST offsetof(struct ip, ip_dst) - define IP6_SRC offsetof(struct ip6_hdr, ip6_src) define IP6_DST offsetof(struct ip6_hdr, ip6_dst) +# pcb fields define PCB_CR3 offsetof(struct pcb, pcb_cr3) define PCB_CR0 offsetof(struct pcb, pcb_cr0) define PCB_ONFAULT offsetof(struct pcb, pcb_onfault) @@ -242,6 +238,7 @@ define TSS_ESP0 offsetof(struct cpu_tss define TSS_IOBASE offsetof(struct cpu_tss, tss.tss_iobase) define TSS_IOMAP offsetof(struct cpu_tss, iomap) +# CPU info structure define CPU_INFO_SELF
CVS commit: src/sys/arch
Module Name:src Committed By: msaitoh Date: Mon Dec 26 09:39:30 UTC 2022 Modified Files: src/sys/arch/amd64/amd64: genassym.cf src/sys/arch/i386/i386: genassym.cf Log Message: Sort lines. Add comment. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.128 -r1.129 src/sys/arch/i386/i386/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: msaitoh Date: Mon Dec 26 09:12:42 UTC 2022 Modified Files: src/sys/arch/amd64/amd64: genassym.cf src/sys/arch/i386/i386: genassym.cf Log Message: Reduce diff between i386/i386/genassym.cf and amd64/amd64/genassym.cf. NFCI. - Whitespace fix. - Sort lines. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.127 -r1.128 src/sys/arch/i386/i386/genassym.cf 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/amd64/amd64/genassym.cf diff -u src/sys/arch/amd64/amd64/genassym.cf:1.89 src/sys/arch/amd64/amd64/genassym.cf:1.90 --- src/sys/arch/amd64/amd64/genassym.cf:1.89 Wed Sep 7 00:40:18 2022 +++ src/sys/arch/amd64/amd64/genassym.cf Mon Dec 26 09:12:42 2022 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.89 2022/09/07 00:40:18 knakahara Exp $ +# $NetBSD: genassym.cf,v 1.90 2022/12/26 09:12:42 msaitoh Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -127,8 +127,12 @@ endif include +define PAGE_SIZE PAGE_SIZE define UPAGES UPAGES define USPACE USPACE +define PGOFSET PGOFSET +define PGSHIFT PGSHIFT + define KERNBASE_LO KERNBASE_LO define KERNBASE_HI KERNBASE_HI @@ -148,19 +152,17 @@ define PDE_SIZE sizeof(pd_entry_t) define VM_MAXUSER_ADDRESS (unsigned long long)VM_MAXUSER_ADDRESS define L_PCB offsetof(struct lwp, l_addr) +define L_CPU offsetof(struct lwp, l_cpu) define L_FLAG offsetof(struct lwp, l_flag) define L_PROC offsetof(struct lwp, l_proc) define L_NCSW offsetof(struct lwp, l_ncsw) define L_NOPREEMPT offsetof(struct lwp, l_nopreempt) define L_DOPREEMPT offsetof(struct lwp, l_dopreempt) -define L_CPU offsetof(struct lwp, l_cpu) define L_KPRIORITY offsetof(struct lwp, l_kpriority) define L_MD_REGS offsetof(struct lwp, l_md.md_regs) define L_MD_FLAGS offsetof(struct lwp, l_md.md_flags) define L_MD_ASTPENDING offsetof(struct lwp, l_md.md_astpending) -define PAGE_SIZE PAGE_SIZE - define MDL_IRET MDL_IRET define MDL_COMPAT32 MDL_COMPAT32 define MDL_FPU_IN_CPU MDL_FPU_IN_CPU @@ -179,11 +181,11 @@ define IP_SRC offsetof(struct ip, ip_s define IP_DST offsetof(struct ip, ip_dst) define PCB_CR3 offsetof(struct pcb, pcb_cr3) +define PCB_CR0 offsetof(struct pcb, pcb_cr0) +define PCB_ONFAULT offsetof(struct pcb, pcb_onfault) define PCB_RBP offsetof(struct pcb, pcb_rbp) define PCB_RSP offsetof(struct pcb, pcb_rsp) define PCB_RSP0 offsetof(struct pcb, pcb_rsp0) -define PCB_CR0 offsetof(struct pcb, pcb_cr0) -define PCB_ONFAULT offsetof(struct pcb, pcb_onfault) define PCB_FLAGS offsetof(struct pcb, pcb_flags) define PCB_COMPAT32 PCB_COMPAT32 define PCB_FS offsetof(struct pcb, pcb_fs) @@ -222,6 +224,16 @@ define TF_REGSIZE offsetof(struct trapf # Total size includes registers pushed by hardware define FRAMESIZE sizeof(struct trapframe) +ifdef COMPAT_LINUX32 +define LINUX32_SF_HANDLER offsetof(struct linux32_sigframe, sf_handler) +define LINUX32_SF_SC offsetof(struct linux32_sigframe, sf_sc) +define LINUX32_RT_SF_HANDLER offsetof(struct linux32_rt_sigframe, sf_handler) +define LINUX32_RT_SF_UC offsetof(struct linux32_rt_sigframe, sf_uc) +define LINUX32_SYS_rt_sigreturn LINUX32_SYS_rt_sigreturn +define LINUX32_SYS_sigreturn LINUX32_SYS_sigreturn +define LINUX32_SYS_exit LINUX32_SYS_exit +endif + define TSS_RSP0 offsetof(struct cpu_tss, tss.tss_rsp0) define CPU_INFO_SCRATCH offsetof(struct cpu_info, ci_scratch) @@ -244,6 +256,7 @@ endif define CPU_INFO_NSYSCALL offsetof(struct cpu_info, ci_data.cpu_nsyscall) define CPU_INFO_NTRAP offsetof(struct cpu_info, ci_data.cpu_ntrap) define CPU_INFO_NINTR offsetof(struct cpu_info, ci_data.cpu_nintr) +define CPU_INFO_CC_SKEW offsetof(struct cpu_info, ci_data.cpu_cc_skew) define CPU_INFO_CURPRIORITY offsetof(struct cpu_info, ci_schedstate.spc_curpriority) define CPU_INFO_GDT offsetof(struct cpu_info, ci_gdt) @@ -258,7 +271,6 @@ define CPU_INFO_MTX_COUNT offsetof(struc define CPU_INFO_MTX_OLDSPL offsetof(struct cpu_info, ci_mtx_oldspl) define CPU_INFO_CPUID offsetof(struct cpu_info, ci_cpuid) define CPU_INFO_ISTATE offsetof(struct cpu_info, ci_istate) -define CPU_INFO_CC_SKEW offsetof(struct cpu_info, ci_data.cpu_cc_skew) define ACPI_SUSPEND_GDT offsetof(struct cpu_info, ci_suspend_gdt) define ACPI_SUSPEND_IDT offsetof(struct cpu_info, ci_suspend_idt) @@ -292,7 +304,7 @@ endif define IH_FUN offsetof(struct intrhand, ih_fun) define IH_ARG offsetof(struct intrhand, ih_arg) -define IH_LEVEL offsetof(struct intrhand, ih_level) +define IH_LEVEL offsetof(struct intrhand, ih_level) define IH_NEXT offsetof(struct intrhand, ih_next) ifdef COMPAT_NETBSD32 @@ -300,16 +312,6 @@ define SC_FS32 offsetof(struct netbsd3 define SC_GS32 offsetof(struct netbsd32_sigcontext, sc_gs) endif -ifdef
CVS commit: src/sys/arch
Module Name:src Committed By: msaitoh Date: Mon Dec 26 09:12:42 UTC 2022 Modified Files: src/sys/arch/amd64/amd64: genassym.cf src/sys/arch/i386/i386: genassym.cf Log Message: Reduce diff between i386/i386/genassym.cf and amd64/amd64/genassym.cf. NFCI. - Whitespace fix. - Sort lines. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.127 -r1.128 src/sys/arch/i386/i386/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: msaitoh Date: Mon Dec 26 08:59:01 UTC 2022 Modified Files: src/sys/arch/i386/i386: genassym.cf Log Message: Remove duplicated IPL_SCHED. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/sys/arch/i386/i386/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: msaitoh Date: Mon Dec 26 08:59:01 UTC 2022 Modified Files: src/sys/arch/i386/i386: genassym.cf Log Message: Remove duplicated IPL_SCHED. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/sys/arch/i386/i386/genassym.cf 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/i386/i386/genassym.cf diff -u src/sys/arch/i386/i386/genassym.cf:1.126 src/sys/arch/i386/i386/genassym.cf:1.127 --- src/sys/arch/i386/i386/genassym.cf:1.126 Wed Sep 7 00:40:18 2022 +++ src/sys/arch/i386/i386/genassym.cf Mon Dec 26 08:59:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.126 2022/09/07 00:40:18 knakahara Exp $ +# $NetBSD: genassym.cf,v 1.127 2022/12/26 08:59:01 msaitoh Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -321,7 +321,6 @@ define IS_MASK_COUNT offsetof(struct in define IPL_NONE IPL_NONE define IPL_PREEMPT IPL_PREEMPT define IPL_NET IPL_NET -define IPL_SCHED IPL_SCHED define IPL_CLOCK IPL_CLOCK define IPL_VM IPL_VM define IPL_SCHED IPL_SCHED
CVS commit: src/usr.sbin/tprof
Module Name:src
Committed By: ryo
Date: Mon Dec 26 08:00:13 UTC 2022
Modified Files:
src/usr.sbin/tprof: tprof.c
Log Message:
fixed parsing of event options.
if event option was specivied, it was stuck in a busy loop.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/tprof/tprof.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.sbin/tprof/tprof.c
diff -u src/usr.sbin/tprof/tprof.c:1.19 src/usr.sbin/tprof/tprof.c:1.20
--- src/usr.sbin/tprof/tprof.c:1.19 Mon Dec 26 03:25:55 2022
+++ src/usr.sbin/tprof/tprof.c Mon Dec 26 08:00:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof.c,v 1.19 2022/12/26 03:25:55 ryoon Exp $ */
+/* $NetBSD: tprof.c,v 1.20 2022/12/26 08:00:13 ryo Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: tprof.c,v 1.19 2022/12/26 03:25:55 ryoon Exp $");
+__RCSID("$NetBSD: tprof.c,v 1.20 2022/12/26 08:00:13 ryo Exp $");
#endif /* not lint */
#include
@@ -310,6 +310,7 @@ tprof_parse_event(tprof_param_t *param,
"invalid option: '%c'", *opt);
goto done;
}
+ opt++;
}
} else if (allow_option) {
param->p_flags |= TPROF_PARAM_USER;
CVS commit: src/usr.sbin/tprof
Module Name:src Committed By: ryo Date: Mon Dec 26 08:00:13 UTC 2022 Modified Files: src/usr.sbin/tprof: tprof.c Log Message: fixed parsing of event options. if event option was specivied, it was stuck in a busy loop. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/tprof/tprof.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
