CVS commit: src/doc
Module Name:src Committed By: maxv Date: Sun Jul 15 05:25:20 UTC 2018 Modified Files: src/doc: CHANGES Log Message: Note improved tprof and removal of ipkdb. To generate a diff of this commit: cvs rdiff -u -r1.2409 -r1.2410 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2409 src/doc/CHANGES:1.2410 --- src/doc/CHANGES:1.2409 Fri Jul 13 18:49:44 2018 +++ src/doc/CHANGES Sun Jul 15 05:25:20 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2409 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2410 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -173,3 +173,6 @@ Changes from NetBSD 8.0 to NetBSD 9.0: ssh-agent(1): /usr/pkg/lib* whitelisted by default for PKCS11 related libraries, in place of /usr/local/lib*. [sevan 20180710] x86: Support for -static -pie binaries. [joerg 20180712] + kernel: Remove pmc(9) and X86PMC. Replaced by a revamped + tprof(4). [maxv 20180714] + ipkdb(4): Removed. [maxv 20180714]
CVS commit: src
Module Name:src Committed By: maxv Date: Sun Jul 15 05:16:45 UTC 2018 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi src/share/examples/secmodel: secmodel_example.c src/share/man/man4: Makefile src/share/man/man7: hier.7 src.7 src/share/man/man9: Makefile boothowto.9 intro.9 kauth.9 panic.9 secmodel_securelevel.9 src/sys/arch/amigappc/amigappc: locore.S machdep.c src/sys/arch/arm/arm32: fault.c src/sys/arch/arm/at91: at91bus.c at91emac.c src/sys/arch/arm/include/arm32: machdep.h src/sys/arch/bebox/bebox: locore.S machdep.c src/sys/arch/evbarm/armadaxp: armadaxp_machdep.c src/sys/arch/evbarm/beagle: beagle_machdep.c src/sys/arch/evbarm/gemini: gemini_machdep.c src/sys/arch/evbarm/imx31: imx31lk_machdep.c src/sys/arch/evbarm/mmnet: mmnet_machdep.c src/sys/arch/evbarm/mpcsa: mpcsa_machdep.c src/sys/arch/evbarm/tisdp24xx: sdp24xx_machdep.c src/sys/arch/evbppc/ev64260: ev64260_locore.S machdep.c src/sys/arch/evbppc/mpc85xx: mpc85xx_start.S src/sys/arch/evbppc/obs405: obs200_locore.S obs200_machdep.c obs266_machdep.c obs600_machdep.c src/sys/arch/evbppc/pmppc: machdep.c pmppc_locore.S src/sys/arch/evbppc/virtex: machdep.c virtex_start.S src/sys/arch/evbppc/walnut: machdep.c walnut_start.S src/sys/arch/ibmnws/ibmnws: locore.S src/sys/arch/macppc/macppc: locore.S machdep.c src/sys/arch/mvmeppc/mvmeppc: locore.S src/sys/arch/ofppc/ofppc: locore.S src/sys/arch/powerpc/conf: files.powerpc src/sys/arch/powerpc/ibm4xx: genassym.cf ibm4xx_machdep.c trap_subr.S src/sys/arch/powerpc/ibm4xx/openbios: locore.S src/sys/arch/powerpc/include: cpu.h src/sys/arch/powerpc/oea: genassym.cf oea_machdep.c ofwoea_machdep.c src/sys/arch/powerpc/powerpc: trap_subr.S src/sys/arch/prep/prep: locore.S src/sys/arch/rs6000/rs6000: locore.S src/sys/arch/sandpoint/sandpoint: locore.S machdep.c src/sys/dev/cadence: if_cemac.c src/sys/dev/ic: dp8390.c dp8390var.h ne2000.c ne2000var.h src/sys/dev/ofw: ofnet.c src/sys/dev/pci: files.pci if_ne_pci.c src/sys/netinet: udp_usrreq.c src/sys/secmodel/keylock: secmodel_keylock.c src/sys/secmodel/securelevel: secmodel_securelevel.c src/sys/secmodel/suser: secmodel_suser.c src/sys/sys: kauth.h Removed Files: src/share/man/man4: ipkdb.4 src/share/man/man9: ipkdb.9 src/sys/arch/amigappc/include: ipkdb.h src/sys/arch/bebox/include: ipkdb.h src/sys/arch/evbppc/include: ipkdb.h src/sys/arch/ibmnws/include: ipkdb.h src/sys/arch/macppc/include: ipkdb.h src/sys/arch/mvmeppc/include: ipkdb.h src/sys/arch/ofppc/include: ipkdb.h src/sys/arch/powerpc/include: ipkdb.h src/sys/arch/powerpc/powerpc: ipkdb_glue.c src/sys/arch/prep/include: ipkdb.h src/sys/arch/rs6000/include: ipkdb.h src/sys/arch/sandpoint/include: ipkdb.h src/sys/ipkdb: README.port TODO files.ipkdb ipkdb.h ipkdb_if.c ipkdb_ipkdb.c Log Message: Retire ipkdb entirely. The option was removed from the config files yesterday. ok kamil christos To generate a diff of this commit: cvs rdiff -u -r1.2210 -r1.2211 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1598 -r1.1599 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.26 -r1.27 src/share/examples/secmodel/secmodel_example.c cvs rdiff -u -r1.657 -r1.658 src/share/man/man4/Makefile cvs rdiff -u -r1.7 -r0 src/share/man/man4/ipkdb.4 cvs rdiff -u -r1.129 -r1.130 src/share/man/man7/hier.7 cvs rdiff -u -r1.11 -r1.12 src/share/man/man7/src.7 cvs rdiff -u -r1.428 -r1.429 src/share/man/man9/Makefile cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/boothowto.9 cvs rdiff -u -r1.22 -r1.23 src/share/man/man9/intro.9 cvs rdiff -u -r1.9 -r0 src/share/man/man9/ipkdb.9 cvs rdiff -u -r1.111 -r1.112 src/share/man/man9/kauth.9 cvs rdiff -u -r1.21 -r1.22 src/share/man/man9/panic.9 cvs rdiff -u -r1.17 -r1.18 src/share/man/man9/secmodel_securelevel.9 cvs rdiff -u -r1.25 -r1.26 src/sys/arch/amigappc/amigappc/locore.S cvs rdiff -u -r1.52 -r1.53 src/sys/arch/amigappc/amigappc/machdep.c cvs rdiff -u -r1.1 -r0 src/sys/arch/amigappc/include/ipkdb.h cvs rdiff -u -r1.105 -r1.106 src/sys/arch/arm/arm32/fault.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/at91/at91bus.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/at91/at91emac.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/include/arm32/machdep.h cvs rdiff -u -r1.28 -r1.29 src/sys/arch/bebox/bebox/locore.S cvs rdiff -u -r1.107 -r1.108 src/sys/arch/bebox/bebox/machdep.c cvs rdiff -u -r1.2 -r0 src/sys/arch/bebox/include/ipkdb.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c cvs rdiff -u -r1.69 -r1.70
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: christos Date: Sun Jul 15 01:02:15 UTC 2018 Modified Files: src/external/gpl3/gcc/dist/gcc: tree-ssa-ccp.c Log Message: Handle aarch64 jemalloc constant To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c 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/dist/gcc/tree-ssa-ccp.c diff -u src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c:1.9 src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c:1.10 --- src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c:1.9 Thu Feb 1 22:41:04 2018 +++ src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c Sat Jul 14 21:02:15 2018 @@ -2908,6 +2908,7 @@ make_pass_fold_builtins (gcc::context *c #elif defined(__alpha__) || defined(__amd64__) || defined(__sparc64__) \ || (defined(__arm__) && defined(__ARM_EABI__)) \ || defined(__ia64__) || defined(__powerpc__) \ + || defined(__aarch64__) \ || ((defined(__mips__) || defined(__riscv__)) && defined(_LP64)) #define JEMALLOC_TINY_MIN_2POW 3 #endif
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src
Committed By: christos
Date: Sun Jul 15 00:59:50 UTC 2018
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
Aarch64 specific generated files.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/external/gpl3/gcc/usr.bin/backend/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/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.49 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.50
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.49 Thu Apr 19 18:01:27 2018
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Sat Jul 14 20:59:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2018/04/19 22:01:27 mrg Exp $
+# $NetBSD: Makefile,v 1.50 2018/07/15 00:59:49 christos Exp $
LIBISPRIVATE= yes
@@ -448,9 +448,16 @@ CASECFNDEPS= aarch64-builtins.c arm-buil
gimple-ssa-backprop.c
${CASECFNDEPS}: case-cfn-macros.h
+aarch64-builtin-iterators.h: ${DIST}/gcc/config/aarch64/geniterators.sh \
+${DIST}/gcc/config/aarch64/iterators.md
+ $(HOST_SH) ${.ALLSRC} > ${.TARGET}
+
+CLEANFILES+= aarch-builtin-iterators.h
+
#
# Required hard-coded dependancies.
#
+aarch64-builtins.o: aarch64-builtin-iterators.h
tm.h: insn-constants.h
genextract.lo: insn-config.h
gencondmd.lo: tm_p.h tm-constrs.h
@@ -583,3 +590,6 @@ CFLAGS+= -fno-exceptions -fno-rtti -fasy
.PATH: ${DIST}/gcc ${DIST}/libiberty ${GCCARCH} ${G_out_file:H} ${DIST}/include
.PATH: ${DIST}/gcc/config
+.if ${MACHINE_ARCH} == "aarch64"
+.PATH: ${DIST}/gcc/config/arm
+.endif
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: christos Date: Sun Jul 15 00:36:13 UTC 2018 Modified Files: src/sys/arch/arm/include: int_fmtio.h Log Message: Fix formats for gcc where int64 is long not long long (like clang which should be changed). To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/include/int_fmtio.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/arm/include/int_fmtio.h diff -u src/sys/arch/arm/include/int_fmtio.h:1.9 src/sys/arch/arm/include/int_fmtio.h:1.10 --- src/sys/arch/arm/include/int_fmtio.h:1.9 Wed Aug 13 15:48:17 2014 +++ src/sys/arch/arm/include/int_fmtio.h Sat Jul 14 20:36:13 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.9 2014/08/13 19:48:17 matt Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.10 2018/07/15 00:36:13 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -43,31 +43,57 @@ #define PRId8 "d" /* int8_t */ #define PRId16 "d" /* int16_t */ #define PRId32 "d" /* int32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRId64 "lld" /* int64_t */ +#else +#define PRId64 "ld" /* int64_t */ +#endif #define PRIdLEAST8 "d" /* int_least8_t */ #define PRIdLEAST16 "d" /* int_least16_t */ #define PRIdLEAST32 "d" /* int_least32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIdLEAST64 "lld" /* int_least64_t */ +#else +#define PRIdLEAST64 "ld" /* int_least64_t */ +#endif #define PRIdFAST8 "d" /* int_fast8_t */ #define PRIdFAST16 "d" /* int_fast16_t */ #define PRIdFAST32 "d" /* int_fast32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIdFAST64 "lld" /* int_fast64_t */ #define PRIdMAX "lld" /* intmax_t */ +#else +#define PRIdFAST64 "ld" /* int_fast64_t */ +#define PRIdMAX "ld" /* intmax_t */ +#endif #define PRIdPTR "ld" /* intptr_t */ #define PRIi8 "i" /* int8_t */ #define PRIi16 "i" /* int16_t */ #define PRIi32 "i" /* int32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIi64 "lli" /* int64_t */ +#else +#define PRIi64 "li" /* int64_t */ +#endif #define PRIiLEAST8 "i" /* int_least8_t */ #define PRIiLEAST16 "i" /* int_least16_t */ #define PRIiLEAST32 "i" /* int_least32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIiLEAST64 "lli" /* int_least64_t */ +#else +#define PRIiLEAST64 "li" /* int_least64_t */ +#endif #define PRIiFAST8 "i" /* int_fast8_t */ #define PRIiFAST16 "i" /* int_fast16_t */ #define PRIiFAST32 "i" /* int_fast32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIiFAST64 "lli" /* int_fast64_t */ #define PRIiMAX "lli" /* intmax_t */ +#else +#define PRIiFAST64 "li" /* int_fast64_t */ +#define PRIiMAX "li" /* intmax_t */ +#endif #define PRIiPTR "li" /* intptr_t */ /* fprintf macros for unsigned integers */ @@ -75,61 +101,113 @@ #define PRIo8 "o" /* uint8_t */ #define PRIo16 "o" /* uint16_t */ #define PRIo32 "o" /* uint32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIo64 "llo" /* uint64_t */ +#else +#define PRIo64 "lo" /* uint64_t */ +#endif #define PRIoLEAST8 "o" /* uint_least8_t */ #define PRIoLEAST16 "o" /* uint_least16_t */ #define PRIoLEAST32 "o" /* uint_least32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIoLEAST64 "llo" /* uint_least64_t */ +#else +#define PRIoLEAST64 "lo" /* uint_least64_t */ +#endif #define PRIoFAST8 "o" /* uint_fast8_t */ #define PRIoFAST16 "o" /* uint_fast16_t */ #define PRIoFAST32 "o" /* uint_fast32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIoFAST64 "llo" /* uint_fast64_t */ #define PRIoMAX "llo" /* uintmax_t */ +#else +#define PRIoFAST64 "lo" /* uint_fast64_t */ +#define PRIoMAX "lo" /* uintmax_t */ +#endif #define PRIoPTR "lo" /* uintptr_t */ #define PRIu8 "u" /* uint8_t */ #define PRIu16 "u" /* uint16_t */ #define PRIu32 "u" /* uint32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIu64 "llu" /* uint64_t */ +#else +#define PRIu64 "lu" /* uint64_t */ +#endif #define PRIuLEAST8 "u" /* uint_least8_t */ #define PRIuLEAST16 "u" /* uint_least16_t */ #define PRIuLEAST32 "u" /* uint_least32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIuLEAST64 "llu" /* uint_least64_t */ +#else +#define PRIuLEAST64 "lu" /* uint_least64_t */ +#endif #define PRIuFAST8 "u" /* uint_fast8_t */ #define PRIuFAST16 "u" /* uint_fast16_t */ #define PRIuFAST32 "u" /* uint_fast32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIuFAST64 "llu" /* uint_fast64_t */ #define PRIuMAX "llu" /* uintmax_t */ +#else +#define PRIuFAST64 "lu" /* uint_fast64_t */ +#define PRIuMAX "lu" /* uintmax_t */ +#endif #define PRIuPTR "lu" /* uintptr_t */ #define PRIx8 "x" /* uint8_t */ #define PRIx16 "x" /* uint16_t */ #define PRIx32 "x" /* uint32_t */ +#if defined(__clang__) || !defined(_LP64) #define PRIx64 "llx" /* uint64_t */ +#else +#define PRIx64 "lx" /*
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common
Module Name:src
Committed By: christos
Date: Sun Jul 15 00:32:40 UTC 2018
Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_linux.cc sanitizer_stoptheworld_linux_libcdep.cc
Log Message:
aarch64 sanitizer bits
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
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/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.19 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.20
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.19 Tue Jun 26 16:55:38 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc Sat Jul 14 20:32:40 2018
@@ -1018,7 +1018,7 @@ uptr internal_clone(int (*fn)(void *), v
: "memory", "$29" );
return res;
}
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) && SANITIZER_LINUX
uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg,
int *parent_tidptr, void *newtls, int *child_tidptr) {
long long res;
@@ -1171,9 +1171,15 @@ void GetPcSpBp(void *context, uptr *pc,
# endif
#elif defined(__aarch64__)
ucontext_t *ucontext = (ucontext_t*)context;
+# if SANITIZER_NETBSD
+ *pc = _UC_MACHINE_PC(ucontext);
+ *sp = _UC_MACHINE_SP(ucontext);
+ *bp = ucontext->uc_mcontext.__gregs[29]; /* XXX */
+# else
*pc = ucontext->uc_mcontext.pc;
*bp = ucontext->uc_mcontext.regs[29];
*sp = ucontext->uc_mcontext.sp;
+# endif
#elif defined(__hppa__)
ucontext_t *ucontext = (ucontext_t*)context;
# if SANITIZER_NETBSD
Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.2 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.3
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.2 Tue Jun 26 16:55:38 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc Sat Jul 14 20:32:40 2018
@@ -34,7 +34,7 @@
#if SANITIZER_ANDROID && defined(__arm__)
# include // for pt_regs
#else
-# ifdef __aarch64__
+# if SANITIZER_LINUX && defined( __aarch64__)
// GLIBC 2.20+ sys/user does not include asm/ptrace.h
# include
# endif
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch
Module Name:src
Committed By: christos
Date: Sun Jul 15 00:18:13 UTC 2018
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch: Makefile
Added Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/aarch64:
Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/arm: Makefile
Log Message:
c++config for 32/64 arm
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/aarch64/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/arm/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/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.3 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.4
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.3 Fri Sep 19 13:23:24 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile Sat Jul 14 20:18:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/09/19 17:23:24 matt Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/15 00:18:13 christos Exp $
# install multilib c++config.h files
@@ -27,9 +27,10 @@ SUBDIR= riscv32 riscv64
CXXCONFIGARGS= riscv64 _LP64 riscv32
.endif
-# XXX arm variants are missing, but hopefully won't need them
-# until aarch64 anyway.
-
+.if ${MACHINE_ARCH} == "aarch64"
+SUBDIR= arm aarch64
+CXXCONFIGARGS= aarch64 _LP64 arm
+.endif
# now install the generated front end
Added files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/aarch64/Makefile
diff -u /dev/null src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/aarch64/Makefile:1.1
--- /dev/null Sat Jul 14 20:18:14 2018
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/aarch64/Makefile Sat Jul 14 20:18:13 2018
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile,v 1.1 2018/07/15 00:18:13 christos Exp $
+
+GCC_MACHINE_ARCH=aarch64
+.include "../Makefile.arch_bits"
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/arm/Makefile
diff -u /dev/null src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/arm/Makefile:1.1
--- /dev/null Sat Jul 14 20:18:14 2018
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/arm/Makefile Sat Jul 14 20:18:13 2018
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile,v 1.1 2018/07/15 00:18:13 christos Exp $
+
+GCC_MACHINE_ARCH=arm
+.include "../Makefile.arch_bits"
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64
Module Name:src Committed By: christos Date: Sat Jul 14 23:49:20 UTC 2018 Added Files: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h Log Message: aarch64 files for gmp To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/Makefile.inc \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp-mparam.h \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/Makefile.inc diff -u /dev/null src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/Makefile.inc:1.1 --- /dev/null Sat Jul 14 19:49:20 2018 +++ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/Makefile.inc Sat Jul 14 19:49:20 2018 @@ -0,0 +1,197 @@ +# $NetBSD: Makefile.inc,v 1.1 2018/07/14 23:49:20 christos Exp $ + +GMP_LIMB_BITS=64 + +C_SRCS_LIST= \ + add.c mpn/generic/add.c \ + add_1.c mpn/generic/add_1.c \ + add_err1_n.c mpn/generic/add_err1_n.c \ + add_err2_n.c mpn/generic/add_err2_n.c \ + add_err3_n.c mpn/generic/add_err3_n.c \ + add_n_sub_n.c mpn/generic/add_n_sub_n.c \ + bdiv_q.c mpn/generic/bdiv_q.c \ + bdiv_q_1.c mpn/generic/bdiv_q_1.c \ + bdiv_qr.c mpn/generic/bdiv_qr.c \ + binvert.c mpn/generic/binvert.c \ + broot.c mpn/generic/broot.c \ + brootinv.c mpn/generic/brootinv.c \ + bsqrt.c mpn/generic/bsqrt.c \ + bsqrtinv.c mpn/generic/bsqrtinv.c \ + cmp.c mpn/generic/cmp.c \ + cnd_swap.c mpn/generic/cnd_swap.c \ + comb_tables.c mpn/generic/comb_tables.c \ + dcpi1_bdiv_q.c mpn/generic/dcpi1_bdiv_q.c \ + dcpi1_bdiv_qr.c mpn/generic/dcpi1_bdiv_qr.c \ + dcpi1_div_q.c mpn/generic/dcpi1_div_q.c \ + dcpi1_div_qr.c mpn/generic/dcpi1_div_qr.c \ + dcpi1_divappr_q.c mpn/generic/dcpi1_divappr_q.c \ + div_q.c mpn/generic/div_q.c \ + div_qr_1.c mpn/generic/div_qr_1.c \ + div_qr_1n_pi1.c mpn/generic/div_qr_1n_pi1.c \ + div_qr_2.c mpn/generic/div_qr_2.c \ + div_qr_2n_pi1.c mpn/generic/div_qr_2n_pi1.c \ + div_qr_2u_pi1.c mpn/generic/div_qr_2u_pi1.c \ + dive_1.c mpn/generic/dive_1.c \ + diveby3.c mpn/generic/diveby3.c \ + divexact.c mpn/generic/divexact.c \ + divis.c mpn/generic/divis.c \ + divrem.c mpn/generic/divrem.c \ + divrem_1.c mpn/generic/divrem_1.c \ + divrem_2.c mpn/generic/divrem_2.c \ + dump.c mpn/generic/dump.c \ + fib2_ui.c mpn/generic/fib2_ui.c \ + gcd.c mpn/generic/gcd.c \ + gcd_subdiv_step.c mpn/generic/gcd_subdiv_step.c \ + gcdext.c mpn/generic/gcdext.c \ + gcdext_1.c mpn/generic/gcdext_1.c \ + gcdext_lehmer.c mpn/generic/gcdext_lehmer.c \ + get_d.c mpn/generic/get_d.c \ + get_str.c mpn/generic/get_str.c \ + hgcd.c mpn/generic/hgcd.c \ + hgcd2.c mpn/generic/hgcd2.c \ + hgcd2_jacobi.c mpn/generic/hgcd2_jacobi.c \ + hgcd_appr.c mpn/generic/hgcd_appr.c \ + hgcd_jacobi.c mpn/generic/hgcd_jacobi.c \ + hgcd_matrix.c mpn/generic/hgcd_matrix.c \ + hgcd_reduce.c mpn/generic/hgcd_reduce.c \ + hgcd_step.c mpn/generic/hgcd_step.c \ + invert.c mpn/generic/invert.c \ + invertappr.c mpn/generic/invertappr.c \ + jacbase.c mpn/generic/jacbase.c \ + jacobi.c mpn/generic/jacobi.c \ + jacobi_2.c mpn/generic/jacobi_2.c \ + lshiftc.c mpn/generic/lshiftc.c \ + matrix22_mul.c mpn/generic/matrix22_mul.c \ + matrix22_mul1_inverse_vector.c mpn/generic/matrix22_mul1_inverse_vector.c \ + mod_1.c mpn/generic/mod_1.c \ + mod_1_1.c mpn/generic/mod_1_1.c \ + mod_1_2.c mpn/generic/mod_1_2.c \ + mod_1_3.c mpn/generic/mod_1_3.c \ + mod_1_4.c mpn/generic/mod_1_4.c \ + mode1o.c mpn/generic/mode1o.c \ + mu_bdiv_q.c mpn/generic/mu_bdiv_q.c \ + mu_bdiv_qr.c mpn/generic/mu_bdiv_qr.c \ + mu_div_q.c mpn/generic/mu_div_q.c \ + mu_div_qr.c mpn/generic/mu_div_qr.c \ + mu_divappr_q.c mpn/generic/mu_divappr_q.c \ + mul.c mpn/generic/mul.c \ + mul_basecase.c mpn/generic/mul_basecase.c \ + mul_fft.c mpn/generic/mul_fft.c \ + mul_n.c mpn/generic/mul_n.c \ + mullo_basecase.c mpn/generic/mullo_basecase.c \ + mullo_n.c mpn/generic/mullo_n.c \ + mulmid.c mpn/generic/mulmid.c \ + mulmid_basecase.c mpn/generic/mulmid_basecase.c \ + mulmid_n.c mpn/generic/mulmid_n.c \ + mulmod_bnm1.c mpn/generic/mulmod_bnm1.c \ + neg.c mpn/generic/neg.c \ + nussbaumer_mul.c mpn/generic/nussbaumer_mul.c \ + perfpow.c mpn/generic/perfpow.c \ + perfsqr.c mpn/generic/perfsqr.c \ + pow_1.c mpn/generic/pow_1.c \ + powlo.c mpn/generic/powlo.c \ + powm.c mpn/generic/powm.c \ + pre_divrem_1.c mpn/generic/pre_divrem_1.c \ + pre_mod_1.c mpn/generic/pre_mod_1.c \ + random.c mpn/generic/random.c \ + random2.c mpn/generic/random2.c \ + redc_1.c mpn/generic/redc_1.c \ + redc_2.c mpn/generic/redc_2.c \ + redc_n.c mpn/generic/redc_n.c \ + remove.c mpn/generic/remove.c \ + rootrem.c mpn/generic/rootrem.c \ + sbpi1_bdiv_q.c mpn/generic/sbpi1_bdiv_q.c \ + sbpi1_bdiv_qr.c mpn/generic/sbpi1_bdiv_qr.c \
CVS commit: src/external/gpl3/gcc/dist/libiberty
Module Name:src
Committed By: christos
Date: Sat Jul 14 23:42:23 UTC 2018
Modified Files:
src/external/gpl3/gcc/dist/libiberty: sha1.c
Log Message:
clang does not like the c-like definition of alignof
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/libiberty/sha1.c
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/dist/libiberty/sha1.c
diff -u src/external/gpl3/gcc/dist/libiberty/sha1.c:1.1.1.2 src/external/gpl3/gcc/dist/libiberty/sha1.c:1.2
--- src/external/gpl3/gcc/dist/libiberty/sha1.c:1.1.1.2 Sat Mar 1 03:41:40 2014
+++ src/external/gpl3/gcc/dist/libiberty/sha1.c Sat Jul 14 19:42:23 2018
@@ -230,7 +230,11 @@ sha1_process_bytes (const void *buffer,
if (len >= 64)
{
#if !_STRING_ARCH_unaligned
+# ifdef __clang__
+# define alignof(type) __alignof__(type)
+# else
# define alignof(type) offsetof (struct { char c; type x; }, x)
+# endif
# define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0)
if (UNALIGNED_P (buffer))
while (len > 64)
CVS commit: src/external/gpl3/gcc/dist/libiberty
Module Name:src
Committed By: christos
Date: Sat Jul 14 23:41:43 UTC 2018
Modified Files:
src/external/gpl3/gcc/dist/libiberty: alloca.c
Log Message:
clang does not like auto in c++
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/libiberty/alloca.c
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/dist/libiberty/alloca.c
diff -u src/external/gpl3/gcc/dist/libiberty/alloca.c:1.1.1.1 src/external/gpl3/gcc/dist/libiberty/alloca.c:1.2
--- src/external/gpl3/gcc/dist/libiberty/alloca.c:1.1.1.1 Mon Jun 20 21:23:29 2011
+++ src/external/gpl3/gcc/dist/libiberty/alloca.c Sat Jul 14 19:41:43 2018
@@ -161,7 +161,7 @@ static header *last_alloca_header = NULL
PTR
C_alloca (size_t size)
{
- auto char probe; /* Probes stack depth: */
+ char probe; /* Probes stack depth: */
register char *depth = ADDRESS_FUNCTION (probe);
#if STACK_DIRECTION == 0
CVS commit: src/external/gpl3/gcc/lib/libgcc
Module Name:src
Committed By: christos
Date: Sat Jul 14 23:40:19 UTC 2018
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
Log Message:
avoid dups for aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
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/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.35 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.36
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.35 Sat Oct 22 16:33:28 2016
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Sat Jul 14 19:40:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.35 2016/10/22 20:33:28 christos Exp $
+# $NetBSD: Makefile.inc,v 1.36 2018/07/14 23:40:19 christos Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -68,6 +68,7 @@ LIB2FUNCS_ALL+= \
.if ${LIBGCC_MACHINE_ARCH} != "coldfire" && \
empty(LIBGCC_MACHINE_ARCH:Mearm*) && \
+empty(LIBGCC_MACHINE_ARCH:Maarch64*) && \
empty(LIBGCC_MACHINE_ARCH:Mmips64*)
# non swfloat versions
CVS commit: src/share/mk
Module Name:src
Committed By: maya
Date: Sat Jul 14 22:57:47 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Update comment to match what the below text does
(This logic needs to go into gcc config files, but removing it
requires mknative)
To generate a diff of this commit:
cvs rdiff -u -r1.1067 -r1.1068 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1067 src/share/mk/bsd.own.mk:1.1068
--- src/share/mk/bsd.own.mk:1.1067 Thu Jul 12 21:41:25 2018
+++ src/share/mk/bsd.own.mk Sat Jul 14 22:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1067 2018/07/12 21:41:25 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.1068 2018/07/14 22:57:47 maya Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -125,7 +125,7 @@ HAVE_LIBGCC?= yes
.endif
-# ia64 is not support
+# Should libgcc have unwinding code?
.if ${HAVE_LLVM:Uno} == "yes" || !empty(MACHINE_ARCH:Mearm*)
HAVE_LIBGCC_EH?= no
.else
CVS commit: src/usr.sbin/tprof
Module Name:src
Committed By: jmcneill
Date: Sat Jul 14 16:34:15 UTC 2018
Modified Files:
src/usr.sbin/tprof: tprof.c
Log Message:
Fix a crash when running tprof with no arguments; check argc before accessing
argv[0]
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/usr.sbin/tprof/tprof.c:1.11
--- src/usr.sbin/tprof/tprof.c:1.10 Fri Jul 13 19:54:53 2018
+++ src/usr.sbin/tprof/tprof.c Sat Jul 14 16:34:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof.c,v 1.10 2018/07/13 19:54:53 joerg Exp $ */
+/* $NetBSD: tprof.c,v 1.11 2018/07/14 16:34:15 jmcneill Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: tprof.c,v 1.10 2018/07/13 19:54:53 joerg Exp $");
+__RCSID("$NetBSD: tprof.c,v 1.11 2018/07/14 16:34:15 jmcneill Exp $");
#endif /* not lint */
#include
@@ -287,6 +287,9 @@ main(int argc, char *argv[])
err(EXIT_FAILURE, "cpu not supported");
}
+ if (argc == 0)
+ usage();
+
for (ct = tprof_cmdtab; ct->label != NULL; ct++) {
if (strcmp(argv[0], ct->label) == 0) {
if (!ct->argsoptional &&
CVS commit: src/usr.sbin/tprof/arch
Module Name:src
Committed By: jmcneill
Date: Sat Jul 14 15:38:59 UTC 2018
Modified Files:
src/usr.sbin/tprof/arch: tprof_noarch.c
Log Message:
Mark tprof_event_init, tprof_event_list, tprof_event_lookup as dead
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/tprof/arch/tprof_noarch.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/arch/tprof_noarch.c
diff -u src/usr.sbin/tprof/arch/tprof_noarch.c:1.2 src/usr.sbin/tprof/arch/tprof_noarch.c:1.3
--- src/usr.sbin/tprof/arch/tprof_noarch.c:1.2 Sat Jul 14 07:54:37 2018
+++ src/usr.sbin/tprof/arch/tprof_noarch.c Sat Jul 14 15:38:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof_noarch.c,v 1.2 2018/07/14 07:54:37 maxv Exp $ */
+/* $NetBSD: tprof_noarch.c,v 1.3 2018/07/14 15:38:59 jmcneill Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -43,19 +43,19 @@ int tprof_event_init(uint32_t);
void tprof_event_list(void);
void tprof_event_lookup(const char *, struct tprof_param *);
-int
+__dead int
tprof_event_init(uint32_t ident)
{
errx(EXIT_FAILURE, "architecture not supported");
}
-void
+__dead void
tprof_event_list(void)
{
errx(EXIT_FAILURE, "architecture not supported");
}
-void
+__dead void
tprof_event_lookup(const char *name, struct tprof_param *param)
{
errx(EXIT_FAILURE, "architecture not supported");
CVS commit: src/sys/arch
Module Name:src Committed By: maxv Date: Sat Jul 14 15:09:41 UTC 2018 Modified Files: src/sys/arch/bebox/conf: INSTALL src/sys/arch/evbarm/conf: ARMADAXP ARMADILLO-IOT-G3 BCM5301X BCM56340 CUBOX CUBOX-I DUOVERO EXYNOS GENERIC GENERIC.common GENERIC64 GOLDENGATE IGEPV2 IMX31LITE IMX6UL-STARTER MARVELL_NAS N900 NITROGEN6X OMAP5EVM OVERO PANDABOARD PEPPER SUNXI TEGRA TISDP2420 TISDP2430 VEXPRESS_A15 VIRT VTC100 src/sys/arch/sandpoint/conf: ENCPP1 SANDPOINT Log Message: Remove "options IPKDB", and the other associated options, from the config files. ipkdb is being retired. Its code is really old, and hasn't kept pace with today's expectations: IPv6, SMP, modern NICs. The associated code for x86 was already removed because it was too incorrect to stay. There are plans to rewrite a similar feature from scratch. ok kamil christos To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/bebox/conf/INSTALL cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/ARMADAXP cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/conf/BCM5301X cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/BCM56340 \ src/sys/arch/evbarm/conf/NITROGEN6X cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/CUBOX \ src/sys/arch/evbarm/conf/PEPPER cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/CUBOX-I cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/DUOVERO cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/conf/EXYNOS \ src/sys/arch/evbarm/conf/MARVELL_NAS cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/GENERIC.common cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/conf/GENERIC64 \ src/sys/arch/evbarm/conf/PANDABOARD cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/GOLDENGATE \ src/sys/arch/evbarm/conf/VTC100 cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/IGEPV2 cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/IMX31LITE cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/IMX6UL-STARTER \ src/sys/arch/evbarm/conf/VIRT cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/conf/N900 cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/OMAP5EVM cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/OVERO cvs rdiff -u -r1.78 -r1.79 src/sys/arch/evbarm/conf/SUNXI cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/conf/TEGRA cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/TISDP2420 cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/TISDP2430 cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/VEXPRESS_A15 cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sandpoint/conf/ENCPP1 cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sandpoint/conf/SANDPOINT 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/bebox/conf/INSTALL diff -u src/sys/arch/bebox/conf/INSTALL:1.63 src/sys/arch/bebox/conf/INSTALL:1.64 --- src/sys/arch/bebox/conf/INSTALL:1.63 Sat Jul 14 14:56:02 2018 +++ src/sys/arch/bebox/conf/INSTALL Sat Jul 14 15:09:40 2018 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.63 2018/07/14 14:56:02 maxv Exp $ +# $NetBSD: INSTALL,v 1.64 2018/07/14 15:09:40 maxv Exp $ # # First try for BeBox config file # @@ -18,10 +18,6 @@ options MEMORY_DISK_SERVER=0 # no users options MEMORY_DISK_ROOT_SIZE=4096 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode -#options IPKDBUSERHACK # Allow access to mapped memory via kgdb -# HMAC key to be used for debugging sessions -#options IPKDBKEY="\"HMAC pass phrase text\"" -#options IPKDBSECURE # Allow debugging even when securelevel > 0 #makeoptions DEBUG="-g" #options DEBUG Index: src/sys/arch/evbarm/conf/ARMADAXP diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.24 src/sys/arch/evbarm/conf/ARMADAXP:1.25 --- src/sys/arch/evbarm/conf/ARMADAXP:1.24 Thu Jul 12 10:46:43 2018 +++ src/sys/arch/evbarm/conf/ARMADAXP Sat Jul 14 15:09:41 2018 @@ -1,5 +1,5 @@ # -# $NetBSD: ARMADAXP,v 1.24 2018/07/12 10:46:43 maxv Exp $ +# $NetBSD: ARMADAXP,v 1.25 2018/07/14 15:09:41 maxv Exp $ # # ARMADA XP DEV BOARD # @@ -116,7 +116,6 @@ options DIAGNOSTIC # internal consiste #options DEBUG #options PMAP_DEBUG # Enable pmap_debug_level code options PMAPCOUNTERS -#options IPKDB # remote kernel debugging #options VERBOSE_INIT_ARM # verbose bootstraping messages options DDB # in-kernel debugger options DDB_ONPANIC=1 Index: src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 diff -u src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.11 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.12 --- src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.11 Thu Jul 12 10:46:43 2018 +++ src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 Sat Jul 14 15:09:41 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ARMADILLO-IOT-G3,v 1.11 2018/07/12 10:46:43 maxv Exp $ +# $NetBSD: ARMADILLO-IOT-G3,v 1.12 2018/07/14 15:09:41
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: jmcneill
Date: Sat Jul 14 15:06:05 UTC 2018
Modified Files:
src/sys/arch/arm/fdt: psci_fdt.c
Log Message:
Fix non-MULTIPROCESSOR build
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/fdt/psci_fdt.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/arm/fdt/psci_fdt.c
diff -u src/sys/arch/arm/fdt/psci_fdt.c:1.8 src/sys/arch/arm/fdt/psci_fdt.c:1.9
--- src/sys/arch/arm/fdt/psci_fdt.c:1.8 Mon Jul 9 09:13:20 2018
+++ src/sys/arch/arm/fdt/psci_fdt.c Sat Jul 14 15:06:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: psci_fdt.c,v 1.8 2018/07/09 09:13:20 jmcneill Exp $ */
+/* $NetBSD: psci_fdt.c,v 1.9 2018/07/14 15:06:05 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -29,7 +29,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.8 2018/07/09 09:13:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.9 2018/07/14 15:06:05 jmcneill Exp $");
#include
#include
@@ -153,6 +153,7 @@ psci_fdt_preinit(void)
return psci_fdt_init(phandle);
}
+#ifdef MULTIPROCESSOR
static bus_addr_t psci_fdt_read_mpidr_aff(void)
{
#ifdef __aarch64__
@@ -173,6 +174,7 @@ psci_fdt_mpstart_pa(void)
return (register_t)cortex_mpstart;
#endif
}
+#endif
void
psci_fdt_bootstrap(void)
CVS commit: src/sys/arch
Module Name:src Committed By: maxv Date: Sat Jul 14 14:56:02 UTC 2018 Modified Files: src/sys/arch/bebox/conf: INSTALL src/sys/arch/sandpoint/conf: ENCPP1 SANDPOINT Log Message: Remove "options DEBUG_BY_TOOLS", it doesn't exist. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/arch/bebox/conf/INSTALL cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/conf/ENCPP1 cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sandpoint/conf/SANDPOINT 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/bebox/conf/INSTALL diff -u src/sys/arch/bebox/conf/INSTALL:1.62 src/sys/arch/bebox/conf/INSTALL:1.63 --- src/sys/arch/bebox/conf/INSTALL:1.62 Thu Sep 14 07:58:39 2017 +++ src/sys/arch/bebox/conf/INSTALL Sat Jul 14 14:56:02 2018 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.62 2017/09/14 07:58:39 mrg Exp $ +# $NetBSD: INSTALL,v 1.63 2018/07/14 14:56:02 maxv Exp $ # # First try for BeBox config file # @@ -19,7 +19,6 @@ options MEMORY_DISK_ROOT_SIZE=4096 # si options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode #options IPKDBUSERHACK # Allow access to mapped memory via kgdb -#options DEBUG_BY_TOOLS # Allow debugging from toolsnet # HMAC key to be used for debugging sessions #options IPKDBKEY="\"HMAC pass phrase text\"" #options IPKDBSECURE # Allow debugging even when securelevel > 0 Index: src/sys/arch/sandpoint/conf/ENCPP1 diff -u src/sys/arch/sandpoint/conf/ENCPP1:1.18 src/sys/arch/sandpoint/conf/ENCPP1:1.19 --- src/sys/arch/sandpoint/conf/ENCPP1:1.18 Thu Sep 14 07:58:43 2017 +++ src/sys/arch/sandpoint/conf/ENCPP1 Sat Jul 14 14:56:02 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ENCPP1,v 1.18 2017/09/14 07:58:43 mrg Exp $ +# $NetBSD: ENCPP1,v 1.19 2018/07/14 14:56:02 maxv Exp $ # # Ampro EnCorePP1 machine description file # @@ -23,12 +23,11 @@ options PIC_I8259 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ENCPP1-$Revision: 1.18 $" +#ident "ENCPP1-$Revision: 1.19 $" maxusers 32 #options IPKDBUSERHACK # Allow access to mapped memory via kgdb -#options DEBUG_BY_TOOLS # Allow debugging from toolsnet # HMAC key to be used for debugging sessions #options IPKDBKEY="\"HMAC pass phrase text\"" #options IPKDBSECURE # Allow debugging even when securelevel > 0 Index: src/sys/arch/sandpoint/conf/SANDPOINT diff -u src/sys/arch/sandpoint/conf/SANDPOINT:1.14 src/sys/arch/sandpoint/conf/SANDPOINT:1.15 --- src/sys/arch/sandpoint/conf/SANDPOINT:1.14 Thu Sep 14 07:58:43 2017 +++ src/sys/arch/sandpoint/conf/SANDPOINT Sat Jul 14 14:56:02 2018 @@ -1,4 +1,4 @@ -# $NetBSD: SANDPOINT,v 1.14 2017/09/14 07:58:43 mrg Exp $ +# $NetBSD: SANDPOINT,v 1.15 2018/07/14 14:56:02 maxv Exp $ # # Sandpoint X3/X2 machine description file # @@ -23,14 +23,13 @@ options PIC_I8259 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "SANDPOINT-$Revision: 1.14 $" +#ident "SANDPOINT-$Revision: 1.15 $" maxusers 32 options ALTIVEC # Include AltiVec support #options IPKDBUSERHACK # Allow access to mapped memory via kgdb -#options DEBUG_BY_TOOLS # Allow debugging from toolsnet # HMAC key to be used for debugging sessions #options IPKDBKEY="\"HMAC pass phrase text\"" #options IPKDBSECURE # Allow debugging even when securelevel > 0
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: maxv
Date: Sat Jul 14 14:46:41 UTC 2018
Modified Files:
src/sys/arch/x86/x86: via_padlock.c
Log Message:
Add splhigh() around the FPU code, we don't want to be preempted in the
middle, this could corrupt the FPU state and trigger undefined behavior.
Intentionally use splhigh and not kpreempt_disable, to match the generic
x86 FPU code.
Compile-tested only (I don't have VIA).
Found by Maya almost a year ago.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x86/x86/via_padlock.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/x86/x86/via_padlock.c
diff -u src/sys/arch/x86/x86/via_padlock.c:1.25 src/sys/arch/x86/x86/via_padlock.c:1.26
--- src/sys/arch/x86/x86/via_padlock.c:1.25 Sat Feb 27 00:54:59 2016
+++ src/sys/arch/x86/x86/via_padlock.c Sat Jul 14 14:46:41 2018
@@ -1,5 +1,5 @@
/* $OpenBSD: via.c,v 1.8 2006/11/17 07:47:56 tom Exp $ */
-/* $NetBSD: via_padlock.c,v 1.25 2016/02/27 00:54:59 tls Exp $ */
+/* $NetBSD: via_padlock.c,v 1.26 2018/07/14 14:46:41 maxv Exp $ */
/*-
* Copyright (c) 2003 Jason Wright
@@ -20,7 +20,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.25 2016/02/27 00:54:59 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.26 2018/07/14 14:46:41 maxv Exp $");
#include
#include
@@ -332,10 +332,13 @@ static __inline void
via_padlock_cbc(void *cw, void *src, void *dst, void *key, int rep,
void *iv)
{
- unsigned int creg0;
+ unsigned int cr0;
+ int s;
- creg0 = rcr0(); /* Permit access to SIMD/FPU path */
- lcr0(creg0 & ~(CR0_EM|CR0_TS));
+ s = splhigh();
+
+ cr0 = rcr0(); /* Permit access to SIMD/FPU path */
+ lcr0(cr0 & ~(CR0_EM|CR0_TS));
/* Do the deed */
__asm __volatile("pushfl; popfl"); /* force key reload */
@@ -343,7 +346,9 @@ via_padlock_cbc(void *cw, void *src, voi
: "a" (iv), "b" (key), "c" (rep), "d" (cw), "S" (src), "D" (dst)
: "memory", "cc");
- lcr0(creg0);
+ lcr0(cr0);
+
+ splx(s);
}
int
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: maxv
Date: Sat Jul 14 14:34:32 UTC 2018
Modified Files:
src/sys/arch/x86/x86: patch.c
Log Message:
Remove ifdef GPROF.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x86/x86/patch.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/x86/x86/patch.c
diff -u src/sys/arch/x86/x86/patch.c:1.34 src/sys/arch/x86/x86/patch.c:1.35
--- src/sys/arch/x86/x86/patch.c:1.34 Tue Mar 13 16:52:42 2018
+++ src/sys/arch/x86/x86/patch.c Sat Jul 14 14:34:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: patch.c,v 1.34 2018/03/13 16:52:42 maxv Exp $ */
+/* $NetBSD: patch.c,v 1.35 2018/07/14 14:34:32 maxv Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: patch.c,v 1.34 2018/03/13 16:52:42 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: patch.c,v 1.35 2018/07/14 14:34:32 maxv Exp $");
#include "opt_lockdebug.h"
#ifdef i386
@@ -119,17 +119,6 @@ patchfunc(void *from_s, void *from_e, vo
memcpy(to_s, from_s, (uintptr_t)to_e - (uintptr_t)to_s);
if (pcrel != NULL)
adjust_jumpoff(pcrel, from_s, to_s);
-
-#ifdef GPROF
-#ifdef i386
-#define MCOUNT_CALL_OFFSET 3
-#endif
-#ifdef __x86_64__
-#define MCOUNT_CALL_OFFSET 5
-#endif
- /* Patch mcount call offset */
- adjust_jumpoff((uint8_t *)from_s + MCOUNT_CALL_OFFSET, from_s, to_s);
-#endif
}
static inline void __unused
@@ -209,7 +198,6 @@ x86_patch(bool early)
x86_patch_window_open(, );
-#if !defined(GPROF)
if (!early && ncpu == 1) {
#ifndef LOCKDEBUG
/*
@@ -244,7 +232,6 @@ x86_patch(bool early)
NULL
);
}
-#endif /* GPROF */
#ifdef i386
/*
CVS commit: src/sys/arch
Module Name:src Committed By: maxv Date: Sat Jul 14 14:29:40 UTC 2018 Modified Files: src/sys/arch/amd64/acpi: acpi_wakeup_low.S src/sys/arch/amd64/amd64: amd64_trap.S copy.S cpufunc.S linux32_sigcode.S lock_stubs.S locore.S netbsd32_sigcode.S spl.S vector.S src/sys/arch/amd64/stand/prekern: trap.S src/sys/arch/i386/i386: bioscall.S copy.S cpufunc.S i386_trap.S linux_sigcode.S lock_stubs.S locore.S vector.S src/sys/arch/i386/pnpbios: pnpbioscall.S Log Message: Drop NENTRY() from the x86 kernels, use ENTRY(). With PMCs (and other hardware tracing facilities) we have a much better ways of monitoring the CPU activity than GPROF, without software modification. Also I think GPROF has never worked, because the 'start' functions of both i386 and amd64 use ENTRY(), and it would have caused a function call while the kernel was not yet relocated. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/acpi/acpi_wakeup_low.S cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amd64/amd64/amd64_trap.S cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/amd64/copy.S cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amd64/amd64/cpufunc.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/amd64/linux32_sigcode.S cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amd64/amd64/lock_stubs.S cvs rdiff -u -r1.170 -r1.171 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/amd64/netbsd32_sigcode.S cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amd64/amd64/spl.S cvs rdiff -u -r1.63 -r1.64 src/sys/arch/amd64/amd64/vector.S cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/stand/prekern/trap.S cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/i386/bioscall.S \ src/sys/arch/i386/i386/linux_sigcode.S cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/i386/copy.S cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/i386/cpufunc.S cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/i386/i386_trap.S cvs rdiff -u -r1.28 -r1.29 src/sys/arch/i386/i386/lock_stubs.S cvs rdiff -u -r1.158 -r1.159 src/sys/arch/i386/i386/locore.S cvs rdiff -u -r1.77 -r1.78 src/sys/arch/i386/i386/vector.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/pnpbios/pnpbioscall.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/acpi/acpi_wakeup_low.S diff -u src/sys/arch/amd64/acpi/acpi_wakeup_low.S:1.9 src/sys/arch/amd64/acpi/acpi_wakeup_low.S:1.10 --- src/sys/arch/amd64/acpi/acpi_wakeup_low.S:1.9 Wed Nov 1 09:47:53 2017 +++ src/sys/arch/amd64/acpi/acpi_wakeup_low.S Sat Jul 14 14:29:40 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_wakeup_low.S,v 1.9 2017/11/01 09:47:53 maxv Exp $ */ +/* $NetBSD: acpi_wakeup_low.S,v 1.10 2018/07/14 14:29:40 maxv Exp $ */ /* * Copyright (c) 2007 Joerg Sonnenberger @@ -36,7 +36,7 @@ .text .p2align 2, 0x90 -NENTRY(acpi_md_sleep_exit) +ENTRY(acpi_md_sleep_exit) lgdt ACPI_SUSPEND_GDT(%r8) /* Reload fixed descriptors for new GDT */ @@ -113,7 +113,7 @@ NENTRY(acpi_md_sleep_exit) END(acpi_md_sleep_exit) .p2align 2, 0x90 -NENTRY(acpi_md_sleep_prepare) +ENTRY(acpi_md_sleep_prepare) movq CPUVAR(SELF),%r8 movq %rbx,ACPI_SUSPEND_REG+(1*8)(%r8) movq %rbp,ACPI_SUSPEND_REG+(2*8)(%r8) Index: src/sys/arch/amd64/amd64/amd64_trap.S diff -u src/sys/arch/amd64/amd64/amd64_trap.S:1.43 src/sys/arch/amd64/amd64/amd64_trap.S:1.44 --- src/sys/arch/amd64/amd64/amd64_trap.S:1.43 Thu Jul 12 19:48:16 2018 +++ src/sys/arch/amd64/amd64/amd64_trap.S Sat Jul 14 14:29:40 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: amd64_trap.S,v 1.43 2018/07/12 19:48:16 maxv Exp $ */ +/* $NetBSD: amd64_trap.S,v 1.44 2018/07/14 14:29:40 maxv Exp $ */ /* * Copyright (c) 1998, 2007, 2008, 2017 The NetBSD Foundation, Inc. @@ -626,7 +626,7 @@ END(kernuser_reenter) * All traps go through here. Call the generic trap handler, and * check for ASTs afterwards. */ -NENTRY(alltraps) +ENTRY(alltraps) INTRENTRY .Lalltraps_noentry: STI(si) Index: src/sys/arch/amd64/amd64/copy.S diff -u src/sys/arch/amd64/amd64/copy.S:1.29 src/sys/arch/amd64/amd64/copy.S:1.30 --- src/sys/arch/amd64/amd64/copy.S:1.29 Sun Jan 7 12:42:46 2018 +++ src/sys/arch/amd64/amd64/copy.S Sat Jul 14 14:29:40 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: copy.S,v 1.29 2018/01/07 12:42:46 maxv Exp $ */ +/* $NetBSD: copy.S,v 1.30 2018/07/14 14:29:40 maxv Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -236,16 +236,16 @@ ENTRY(copyin) DEFERRED_SWITCH_CALL END(copyin) -NENTRY(copy_efault) +ENTRY(copy_efault) movq $EFAULT,%rax ret END(copy_efault) -NENTRY(kcopy_fault) +ENTRY(kcopy_fault) ret END(kcopy_fault) -NENTRY(copy_fault) +ENTRY(copy_fault) SMAP_ENABLE ret END(copy_fault) @@ -547,7 +547,7 @@ ENTRY(ucas_efault) ret END(ucas_efault) -NENTRY(ucas_fault) +ENTRY(ucas_fault) SMAP_ENABLE ret END(ucas_fault) Index: src/sys/arch/amd64/amd64/cpufunc.S diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.31
CVS commit: src/usr.sbin/tprof/arch
Module Name:src Committed By: maxv Date: Sat Jul 14 07:54:38 UTC 2018 Modified Files: src/usr.sbin/tprof/arch: tprof_noarch.c Log Message: specialreg.h is x86-specific, don't include it To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/tprof/arch/tprof_noarch.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/arch/tprof_noarch.c diff -u src/usr.sbin/tprof/arch/tprof_noarch.c:1.1 src/usr.sbin/tprof/arch/tprof_noarch.c:1.2 --- src/usr.sbin/tprof/arch/tprof_noarch.c:1.1 Fri Jul 13 07:56:29 2018 +++ src/usr.sbin/tprof/arch/tprof_noarch.c Sat Jul 14 07:54:37 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: tprof_noarch.c,v 1.1 2018/07/13 07:56:29 maxv Exp $ */ +/* $NetBSD: tprof_noarch.c,v 1.2 2018/07/14 07:54:37 maxv Exp $ */ /* * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -36,7 +36,6 @@ #include #include #include -#include #include #include "../tprof.h"
CVS commit: src/usr.sbin/tprof
Module Name:src
Committed By: maxv
Date: Sat Jul 14 07:54:04 UTC 2018
Modified Files:
src/usr.sbin/tprof: tprof_analyze.c
src/usr.sbin/tprof/arch: tprof_x86.c
Log Message:
Finish the Skylake/Kabylake table, and improve the output of "tprof analyze".
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/tprof/tprof_analyze.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/tprof/arch/tprof_x86.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_analyze.c
diff -u src/usr.sbin/tprof/tprof_analyze.c:1.2 src/usr.sbin/tprof/tprof_analyze.c:1.3
--- src/usr.sbin/tprof/tprof_analyze.c:1.2 Fri Jul 13 12:04:50 2018
+++ src/usr.sbin/tprof/tprof_analyze.c Sat Jul 14 07:54:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof_analyze.c,v 1.2 2018/07/13 12:04:50 maxv Exp $ */
+/* $NetBSD: tprof_analyze.c,v 1.3 2018/07/14 07:54:04 maxv Exp $ */
/*
* Copyright (c) 2010,2011,2012 YAMAMOTO Takashi,
@@ -28,7 +28,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: tprof_analyze.c,v 1.2 2018/07/13 12:04:50 maxv Exp $");
+__RCSID("$NetBSD: tprof_analyze.c,v 1.3 2018/07/14 07:54:04 maxv Exp $");
#endif /* not lint */
#include
@@ -275,7 +275,8 @@ tprof_analyze(int argc, char **argv)
struct addr *a;
struct addr **l;
struct addr **p;
- size_t naddrs, i;
+ size_t naddrs, nsamples, i;
+ float perc;
int ch;
bool distinguish_processes = true;
bool distinguish_cpus = true;
@@ -339,6 +340,7 @@ tprof_analyze(int argc, char **argv)
*/
naddrs = 0;
+ nsamples = 0;
while (/*CONSTCOND*/true) {
struct addr *o;
tprof_sample_t sample;
@@ -400,6 +402,7 @@ tprof_analyze(int argc, char **argv)
} else {
naddrs++;
}
+ nsamples++;
}
/*
@@ -418,7 +421,10 @@ tprof_analyze(int argc, char **argv)
* print addresses and number of samples, preferably with
* resolved symbol names.
*/
-
+ printf("File: %s\n", argv[0]);
+ printf("Number of samples: %zu\n\n", nsamples);
+ printf("percentage nsamples pidlwp cpu k address symbol\n");
+ printf(" -- - --\n");
for (i = 0; i < naddrs; i++) {
const char *name;
char buf[100];
@@ -439,8 +445,12 @@ tprof_analyze(int argc, char **argv)
offset);
name = buf;
}
- printf("%8u %6" PRIu32 " %4" PRIu32 " %2" PRIu32 " %u %016"
+
+ perc = ((float)a->nsamples / (float)nsamples) * 100.0;
+
+ printf("%11f%% %8u %6" PRIu32 " %4" PRIu32 " %4" PRIu32 " %u %016"
PRIx64 " %s\n",
+ perc,
a->nsamples, a->pid, a->lwpid, a->cpuid, a->in_kernel,
a->addr, name);
}
Index: src/usr.sbin/tprof/arch/tprof_x86.c
diff -u src/usr.sbin/tprof/arch/tprof_x86.c:1.3 src/usr.sbin/tprof/arch/tprof_x86.c:1.4
--- src/usr.sbin/tprof/arch/tprof_x86.c:1.3 Fri Jul 13 09:53:42 2018
+++ src/usr.sbin/tprof/arch/tprof_x86.c Sat Jul 14 07:54:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof_x86.c,v 1.3 2018/07/13 09:53:42 maxv Exp $ */
+/* $NetBSD: tprof_x86.c,v 1.4 2018/07/14 07:54:04 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -119,11 +119,156 @@ init_intel_arch1(void)
}
/*
- * Intel Skylake/Kabylake. TODO: there are many more events available.
+ * Intel Skylake/Kabylake.
+ *
+ * The events that are not listed, because they are of little interest or
+ * require extra configuration:
+ * TX_*
+ * FRONTEND_RETIRED.*
+ * FP_ARITH_INST_RETIRED.*
+ * HLE_RETIRED.*
+ * RTM_RETIRED.*
+ * MEM_TRANS_RETIRED.*
+ * UOPS_DISPATCHED_PORT.*
*/
static struct name_to_event intel_skylake_kabylake_names[] = {
/* Event Name - Event Select - UMask */
- { "itlb-misses-causes-a-walk", 0x85, 0x01, true },
+ { "LD_BLOCKS.STORE_FORWARD", 0x03, 0x02, true },
+ { "LD_BLOCKS.NO_SR", 0x03, 0x08, true },
+ { "LD_BLOCKS_PARTIAL.ADDRESS_ALIAS",0x07, 0x01, true },
+ { "DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK", 0x08, 0x01, true },
+ { "DTLB_LOAD_MISSES.WALK_COMPLETED_4K",0x08, 0x02, true },
+ { "DTLB_LOAD_MISSES.WALK_COMPLETED_2M_4M", 0x08, 0x04, true },
+ { "DTLB_LOAD_MISSES.WALK_COMPLETED_1G",0x08, 0x08, true },
+ { "DTLB_LOAD_MISSES.WALK_COMPLETED",0x08, 0x0E, true },
+ { "DTLB_LOAD_MISSES.WALK_PENDING",0x08, 0x10, true },
+ { "DTLB_LOAD_MISSES.STLB_HIT", 0x08, 0x20, true },
+ { "INT_MISC.RECOVERY_CYCLES", 0x0D, 0x01, true },
+ { "INT_MISC.CLEAR_RESTEER_CYCLES",0x0D, 0x80, true },
+ { "UOPS_ISSUED.ANY", 0x0E, 0x01, true },
+ { "UOPS_ISSUED.VECTOR_WIDTH_MISMATCH",0x0E, 0x02, true },
+ { "UOPS_ISSUED.SLOW_LEA", 0x0E, 0x20, true },
+ { "L2_RQSTS.DEMAND_DATA_RD_MISS",0x24, 0x21, true },
+ { "L2_RQSTS.RFO_MISS", 0x24, 0x22, true },
+ { "L2_RQSTS.CODE_RD_MISS", 0x24, 0x24, true },
+ { "L2_RQSTS.ALL_DEMAND_MISS", 0x24, 0x27, true },
+ { "L2_RQSTS.PF_MISS", 0x24, 0x38, true },
+ { "L2_RQSTS.MISS", 0x24, 0x3F, true },
+ {
