CVS commit: src/external/mit/ctwm/etc
Module Name:src Committed By: nia Date: Thu Dec 9 07:33:24 UTC 2021 Modified Files: src/external/mit/ctwm/etc: system.ctwmrc Log Message: PR misc/56541 ctwm complains about TitleFocus line in system.ctwmrc TitleFocus is the default so it's likely safe to remove, it being kept here was only left over from us previously having NoTitleFocus. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/mit/ctwm/etc/system.ctwmrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/ctwm/etc/system.ctwmrc diff -u src/external/mit/ctwm/etc/system.ctwmrc:1.13 src/external/mit/ctwm/etc/system.ctwmrc:1.14 --- src/external/mit/ctwm/etc/system.ctwmrc:1.13 Sun Apr 11 11:05:49 2021 +++ src/external/mit/ctwm/etc/system.ctwmrc Thu Dec 9 07:33:24 2021 @@ -1,5 +1,5 @@ # -# $NetBSD: system.ctwmrc,v 1.13 2021/04/11 11:05:49 nia Exp $ +# $NetBSD: system.ctwmrc,v 1.14 2021/12/09 07:33:24 nia Exp $ # # ctwmrc by nia # @@ -150,8 +150,6 @@ StayUpMenus WarpToDefaultMenuEntry MenuShadowDepth 1 -TitleFocus - # warp through all windows in the current workspace WindowRing WarpRingOnScreen
CVS commit: src/external/mit/ctwm/etc
Module Name:src Committed By: nia Date: Thu Dec 9 07:33:24 UTC 2021 Modified Files: src/external/mit/ctwm/etc: system.ctwmrc Log Message: PR misc/56541 ctwm complains about TitleFocus line in system.ctwmrc TitleFocus is the default so it's likely safe to remove, it being kept here was only left over from us previously having NoTitleFocus. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/mit/ctwm/etc/system.ctwmrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/kernel
Module Name:src
Committed By: rillig
Date: Thu Dec 9 06:38:23 UTC 2021
Modified Files:
src/tests/kernel: t_magic_symlinks.sh
Log Message:
tests/t_magic_symlinks: remove duplicate word in test description
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/t_magic_symlinks.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/t_magic_symlinks.sh
diff -u src/tests/kernel/t_magic_symlinks.sh:1.1 src/tests/kernel/t_magic_symlinks.sh:1.2
--- src/tests/kernel/t_magic_symlinks.sh:1.1 Wed Jul 1 13:49:26 2020
+++ src/tests/kernel/t_magic_symlinks.sh Thu Dec 9 06:38:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_magic_symlinks.sh,v 1.1 2020/07/01 13:49:26 jruoho Exp $
+# $NetBSD: t_magic_symlinks.sh,v 1.2 2021/12/09 06:38:23 rillig Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -222,7 +222,7 @@ atf_test_case realpath cleanup
nointerpreter_head() {
atf_set "require.user" "root"
atf_set "descr" "Check that realpath(1) agrees with the "
- "the kernel on magic symlink(7)'s (PR lib/55361)"
+ "kernel on magic symlink(7)'s (PR lib/55361)"
}
realpath_body() {
CVS commit: src/tests/kernel
Module Name:src Committed By: rillig Date: Thu Dec 9 06:38:23 UTC 2021 Modified Files: src/tests/kernel: t_magic_symlinks.sh Log Message: tests/t_magic_symlinks: remove duplicate word in test description To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/t_magic_symlinks.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/elex/dist/tests
Module Name:othersrc Committed By: agc Date: Thu Dec 9 04:18:00 UTC 2021 Modified Files: othersrc/external/bsd/elex/dist/tests: 14.expected 14.in 20.expected 20.in Log Message: Omit RCS Ids from test input and expected output files. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/elex/dist/tests/14.expected \ othersrc/external/bsd/elex/dist/tests/14.in \ othersrc/external/bsd/elex/dist/tests/20.expected \ othersrc/external/bsd/elex/dist/tests/20.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/elex/dist/tests/14.expected diff -u othersrc/external/bsd/elex/dist/tests/14.expected:1.1 othersrc/external/bsd/elex/dist/tests/14.expected:1.2 --- othersrc/external/bsd/elex/dist/tests/14.expected:1.1 Thu Dec 9 04:15:26 2021 +++ othersrc/external/bsd/elex/dist/tests/14.expected Thu Dec 9 04:18:00 2021 @@ -2,10 +2,6 @@ [1] 2 ' ' -[3] 61 '# $NetBSD: 14.expected,v 1.1 2021/12/09 04:15:26 agc Exp $' -[1] 2 ' - -' [3] 53 '# Copyright (c) 2013 Alistair Crooks ' [1] 1 ' ' Index: othersrc/external/bsd/elex/dist/tests/14.in diff -u othersrc/external/bsd/elex/dist/tests/14.in:1.1 othersrc/external/bsd/elex/dist/tests/14.in:1.2 --- othersrc/external/bsd/elex/dist/tests/14.in:1.1 Thu Dec 9 04:15:26 2021 +++ othersrc/external/bsd/elex/dist/tests/14.in Thu Dec 9 04:18:00 2021 @@ -1,7 +1,5 @@ #! /bin/sh -# $NetBSD: 14.in,v 1.1 2021/12/09 04:15:26 agc Exp $ - # Copyright (c) 2013 Alistair Crooks # All rights reserved. # Index: othersrc/external/bsd/elex/dist/tests/20.expected diff -u othersrc/external/bsd/elex/dist/tests/20.expected:1.1 othersrc/external/bsd/elex/dist/tests/20.expected:1.2 --- othersrc/external/bsd/elex/dist/tests/20.expected:1.1 Thu Dec 9 04:15:26 2021 +++ othersrc/external/bsd/elex/dist/tests/20.expected Thu Dec 9 04:18:00 2021 @@ -1,9 +1,6 @@ [3] 9 '#!/bin/sh' [1] 1 ' ' -[3] 91 '# $Header: /cvsroot/othersrc/external/bsd/elex/dist/tests/20.expected,v 1.1 2021/12/09 04:15:26 agc Exp $' -[1] 1 ' -' [3] 1 '#' [1] 1 ' ' Index: othersrc/external/bsd/elex/dist/tests/20.in diff -u othersrc/external/bsd/elex/dist/tests/20.in:1.1 othersrc/external/bsd/elex/dist/tests/20.in:1.2 --- othersrc/external/bsd/elex/dist/tests/20.in:1.1 Thu Dec 9 04:15:26 2021 +++ othersrc/external/bsd/elex/dist/tests/20.in Thu Dec 9 04:18:00 2021 @@ -1,5 +1,4 @@ #!/bin/sh -# $Header: /cvsroot/othersrc/external/bsd/elex/dist/tests/20.in,v 1.1 2021/12/09 04:15:26 agc Exp $ # # Install Perl scripts, adjusting for the correct pathname # $1 = name of perl program
CVS commit: othersrc/external/bsd/elex/dist/tests
Module Name:othersrc Committed By: agc Date: Thu Dec 9 04:18:00 UTC 2021 Modified Files: othersrc/external/bsd/elex/dist/tests: 14.expected 14.in 20.expected 20.in Log Message: Omit RCS Ids from test input and expected output files. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/elex/dist/tests/14.expected \ othersrc/external/bsd/elex/dist/tests/14.in \ othersrc/external/bsd/elex/dist/tests/20.expected \ othersrc/external/bsd/elex/dist/tests/20.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/elex
Module Name:othersrc
Committed By: agc
Date: Thu Dec 9 04:15:26 UTC 2021
Added Files:
othersrc/external/bsd/elex: Makefile README TODO
othersrc/external/bsd/elex/bin: Makefile
othersrc/external/bsd/elex/dist: Makefile agcre.c agcre.h elex.c elex.h
main.c striter.c striter.h
othersrc/external/bsd/elex/dist/tests: 1.expected 1.in 1.lex
10.expected 10.in 11.expected 11.in 12.expected 12.lex 13.expected
13.lex 14.expected 14.in 14.lex 15.expected 15.in 15.lex
16.expected 16.in 16.lex 17.expected 17.in 17.lex 18.expected 18.in
18.lex 19.expected 19.in 19.lex 2.expected 2.in 20.expected 20.in
20.lex 21.expected 21.in 21.lex 22.expected 22.lex 23.expected
23.lex 24.expected 24.lex 25.expected 25.lex 26.expected 26.lex
27.expected 27.lex 28.expected 29.expected 29.in 29.lex 3.expected
3.in 3.lex 30.expected 30.lex 4.expected 4.lex 5.expected 5.in
5.lex 6.expected 6.in 6.lex 7.expected 7.in 7.lex 8.expected 8.in
8.lex 9.expected 9.in 9.lex
othersrc/external/bsd/elex/lib: Makefile shlib_version
Log Message:
Elex - an embeddable regexp-based lexer
===
I have found myself fairly often needing a lexer utility to tokenise
input (for configuration files, for various file-scanning utilities,
and for other applciations), but using full-blown lex(1) program to do
this is overkill, or designed for a separate process, which doesn't fit
well with the design - syntax-coloring editors, for example.
This utility, elex, is a regexp-based tokenizer, an embedded lexer,
which can be used for various uses. It usually takes a lexer file
(similar to lex input files), although the API allows lexers to be
built on the fly by just issuing the calls to make new rules.
Implementation
==
Normal lex(1) is implemented (usually) as a conglomeration of all the
regular expressions for a start state - if multiple matches are found,
the largest match is the one used. I've found that, in practice, this
constrains the way a number of things are done. So I've implemented
elex, using a multiple, prioritised multiple regexp matching scheme.
This supercedes the usual way of distinguishing reserved words and
identifiers in the lexer - recognising all "words" first, and
searching for each word through a number of tables; if a match is not
found, then the word recognized is an identifier. elex works around
this by using a regexp to match reserved words first, and then to
recognise the word as an identifier after that. Since normal regular
expressions usually progress through the input trying to find a match,
the regular expressions used in elex are constrained by anchoring the
search, not allowing progression through the input. In practice, this
makes for more efficient matching.
another side effect is the ability to use more modern regexp features,
such as perl escapes, UTF-8 matching, in-subexpression ignore case, etc.
elex implements start states, similar to flex. These are useful for
recognising multiline comments (almost any language), or multi-line
strings (perl, python, lua etc).
elex dynamically sizes the regmatch arrays used to accommodate the
largest regexp in the input, and matching subexpressions can be
returned to the caller. The 0'th subexpression is the whole matching
expression, and is the same as "yytext".
And so on to an elex definition which recognises C and some C++:
# start state
%state COMMENT
# the types we define
%type IDENT 0xdb8ea4d
%type PUNCT 0xe454e3a
%type NUMBER0xca1edaec
%type COMMENT 0xee5ae423
%type CONSTANT 0xd497741f
%type PREPROC 0xdcf9b98d
%type RESWORD1 0xb5ac6a6a
%type RESWORD2 0xb5ac6a6b
# and finally... the rules
(auto|char|class|const|double|enum|extern|float|friend|inline|int|long|mutable|namespace|new|private|protected|public|register|requires|short|signed|static|this|struct|this|typedef|union|unsigned|void|volatile)\>
{ return RESWORD1; }
(asm|break|case|catch|continue|default|do|else|for|goto|if|return|switch|throw|try|while)\>
{ return RESWORD2; }
[a-zA-Z_][0-9a-zA-Z_]* { return IDENT; }
([1-9][0-9]*|0x[0-9a-f]|0X[0-9A-F]+|0[0-7]*|'(\\.|[^'])*')
{ return NUMBER; }
[ \t\n\r]+ { return PUNCT; }
/\* { BEGIN(COMMENT); return
COMMENT; }
[^\n]*\*/ { BEGIN(INITIAL); return
COMMENT; }
\n|[^\n]+ { return COMMENT; }
//[^\n]*{ return COMMENT; }
"(\\.|[^"])*" { return CONSTANT; }
(==|[-]>|!=|<=|>=|~=|%=|&=|[*]=|[-]=|[+]=|[|]=|(<<|>>)=?)
{ return PUNCT; }
[\u005b;(){}\u005d*<>,+/%~!\u005e&=|.?:\u002d]
{ return
CVS commit: src/games/trek
Module Name:src Committed By: snj Date: Wed Dec 8 23:38:51 UTC 2021 Modified Files: src/games/trek/DOC: trekmanual.nr src/games/trek/USD.doc: trek.me Log Message: fix typo, pointed out by Andras Farkas To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/games/trek/DOC/trekmanual.nr cvs rdiff -u -r1.4 -r1.5 src/games/trek/USD.doc/trek.me Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/trek/DOC/trekmanual.nr diff -u src/games/trek/DOC/trekmanual.nr:1.3 src/games/trek/DOC/trekmanual.nr:1.4 --- src/games/trek/DOC/trekmanual.nr:1.3 Tue Jun 12 15:17:12 2001 +++ src/games/trek/DOC/trekmanual.nr Wed Dec 8 23:38:51 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: trekmanual.nr,v 1.3 2001/06/12 15:17:12 wiz Exp $ +.\" $NetBSD: trekmanual.nr,v 1.4 2021/12/08 23:38:51 snj Exp $ .br .po 10 .if n \!. @@ -654,7 +654,7 @@ except that "..." means that you don't yet know what is there, and ".1." means that you know that a starbase exists, but you don't know anything else. -"$$$" mans the quadrant +"$$$" means the quadrant that you are currently in. .qq trajectory -- prints the course and distance Index: src/games/trek/USD.doc/trek.me diff -u src/games/trek/USD.doc/trek.me:1.4 src/games/trek/USD.doc/trek.me:1.5 --- src/games/trek/USD.doc/trek.me:1.4 Tue Sep 30 20:46:59 2014 +++ src/games/trek/USD.doc/trek.me Wed Dec 8 23:38:51 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: trek.me,v 1.4 2014/09/30 20:46:59 christos Exp $ +.\" $NetBSD: trek.me,v 1.5 2021/12/08 23:38:51 snj Exp $ .\" .\" Copyright (c) 1980, 1993 .\" The Regents of the University of California. All rights reserved. @@ -724,7 +724,7 @@ except that "..." means that you don't yet know what is there, and ".1." means that you know that a starbase exists, but you don't know anything else. -"$$$" mans the quadrant +"$$$" means the quadrant that you are currently in. .qq trajectory -- prints the course and distance
CVS commit: src/games/trek
Module Name:src Committed By: snj Date: Wed Dec 8 23:38:51 UTC 2021 Modified Files: src/games/trek/DOC: trekmanual.nr src/games/trek/USD.doc: trek.me Log Message: fix typo, pointed out by Andras Farkas To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/games/trek/DOC/trekmanual.nr cvs rdiff -u -r1.4 -r1.5 src/games/trek/USD.doc/trek.me Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: andvar Date: Wed Dec 8 20:50:03 UTC 2021 Modified Files: src/include/arpa: nameser.h src/lib/libcurses: attributes.c src/lib/libresolv: res_findzonecut.c src/sys/arch/evbppc/explora/dev: le_elb.c src/sys/arch/mips/mips: sys_machdep.c src/sys/arch/powerpc/pci: pci_machdep_common.c src/sys/arch/rs6000/rs6000: machdep.c src/sys/dev: video.c src/sys/dev/ic: smc91cxxreg.h src/sys/dev/isa: if_le_isa.c src/sys/dev/isapnp: if_le_isapnp.c src/sys/dev/pcmcia: fdc_pcmcia.c src/sys/sys: wait.h src/tests/dev/audio: audiotest.c Log Message: fix various typos in comments and log messages. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/include/arpa/nameser.h cvs rdiff -u -r1.32 -r1.33 src/lib/libcurses/attributes.c cvs rdiff -u -r1.1 -r1.2 src/lib/libresolv/res_findzonecut.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/dev/le_elb.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mips/mips/sys_machdep.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/pci/pci_machdep_common.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/rs6000/rs6000/machdep.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/video.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/smc91cxxreg.h cvs rdiff -u -r1.51 -r1.52 src/sys/dev/isa/if_le_isa.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/isapnp/if_le_isapnp.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pcmcia/fdc_pcmcia.c cvs rdiff -u -r1.36 -r1.37 src/sys/sys/wait.h cvs rdiff -u -r1.16 -r1.17 src/tests/dev/audio/audiotest.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: andvar
Date: Wed Dec 8 20:50:03 UTC 2021
Modified Files:
src/include/arpa: nameser.h
src/lib/libcurses: attributes.c
src/lib/libresolv: res_findzonecut.c
src/sys/arch/evbppc/explora/dev: le_elb.c
src/sys/arch/mips/mips: sys_machdep.c
src/sys/arch/powerpc/pci: pci_machdep_common.c
src/sys/arch/rs6000/rs6000: machdep.c
src/sys/dev: video.c
src/sys/dev/ic: smc91cxxreg.h
src/sys/dev/isa: if_le_isa.c
src/sys/dev/isapnp: if_le_isapnp.c
src/sys/dev/pcmcia: fdc_pcmcia.c
src/sys/sys: wait.h
src/tests/dev/audio: audiotest.c
Log Message:
fix various typos in comments and log messages.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/include/arpa/nameser.h
cvs rdiff -u -r1.32 -r1.33 src/lib/libcurses/attributes.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libresolv/res_findzonecut.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/dev/le_elb.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mips/mips/sys_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/pci/pci_machdep_common.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/rs6000/rs6000/machdep.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/video.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/smc91cxxreg.h
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/isa/if_le_isa.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/isapnp/if_le_isapnp.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pcmcia/fdc_pcmcia.c
cvs rdiff -u -r1.36 -r1.37 src/sys/sys/wait.h
cvs rdiff -u -r1.16 -r1.17 src/tests/dev/audio/audiotest.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/arpa/nameser.h
diff -u src/include/arpa/nameser.h:1.26 src/include/arpa/nameser.h:1.27
--- src/include/arpa/nameser.h:1.26 Sat Oct 10 19:51:48 2020
+++ src/include/arpa/nameser.h Wed Dec 8 20:50:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nameser.h,v 1.26 2020/10/10 19:51:48 christos Exp $ */
+/* $NetBSD: nameser.h,v 1.27 2021/12/08 20:50:01 andvar Exp $ */
/*
* Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -113,7 +113,7 @@ typedef enum __ns_sect {
} ns_sect;
/*%
- * Network name (compressed or not) type. Equivilent to a pointer when used
+ * Network name (compressed or not) type. Equivalent to a pointer when used
* in a function prototype. Can be const'd.
*/
typedef u_char ns_nname[NS_MAXNNAME];
Index: src/lib/libcurses/attributes.c
diff -u src/lib/libcurses/attributes.c:1.32 src/lib/libcurses/attributes.c:1.33
--- src/lib/libcurses/attributes.c:1.32 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/attributes.c Wed Dec 8 20:50:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: attributes.c,v 1.32 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: attributes.c,v 1.33 2021/12/08 20:50:01 andvar Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: attributes.c,v 1.32 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: attributes.c,v 1.33 2021/12/08 20:50:01 andvar Exp $");
#endif/* not lint */
#include "curses.h"
@@ -364,7 +364,7 @@ __wattr_on(WINDOW *win, attr_t attr)
const TERMINAL *t = win->screen->term;
__CTRACE(__CTRACE_ATTR, "wattr_on: win %p, attr %08x\n", win, attr);
- /* If can enter modes, set the relevent attribute bits. */
+ /* If can enter modes, set the relevant attribute bits. */
if (t_exit_attribute_mode(t) != NULL) {
if (attr & __BLINK && t_enter_blink_mode(t) != NULL)
win->wattr |= __BLINK;
@@ -411,7 +411,7 @@ __wattr_off(WINDOW *win, attr_t attr)
const TERMINAL *t = win->screen->term;
__CTRACE(__CTRACE_ATTR, "wattr_off: win %p, attr %08x\n", win, attr);
- /* If can do exit modes, unset the relevent attribute bits. */
+ /* If can do exit modes, unset the relevant attribute bits. */
if (t_exit_attribute_mode(t) != NULL) {
if (attr & __BLINK)
win->wattr &= ~__BLINK;
Index: src/lib/libresolv/res_findzonecut.c
diff -u src/lib/libresolv/res_findzonecut.c:1.1 src/lib/libresolv/res_findzonecut.c:1.2
--- src/lib/libresolv/res_findzonecut.c:1.1 Thu Nov 15 18:48:48 2012
+++ src/lib/libresolv/res_findzonecut.c Wed Dec 8 20:50:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: res_findzonecut.c,v 1.1 2012/11/15 18:48:48 christos Exp $ */
+/* $NetBSD: res_findzonecut.c,v 1.2 2021/12/08 20:50:01 andvar Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -20,7 +20,7 @@
#if 0
static const char rcsid[] = "Id: res_findzonecut.c,v 1.10 2005/10/11 00:10:16 marka Exp ";
#else
-__RCSID("$NetBSD: res_findzonecut.c,v 1.1 2012/11/15 18:48:48 christos Exp $");
+__RCSID("$NetBSD: res_findzonecut.c,v 1.2 2021/12/08 20:50:01 andvar Exp $");
#endif
@@ -120,7 +120,7 @@ static void res_dprintf(const char *, ..
* notes:
*\li this function calls res_nsend() which means it depends on correctly
* functioning recursive
CVS commit: src
Module Name:src
Committed By: andvar
Date: Wed Dec 8 20:21:10 UTC 2021
Modified Files:
src/bin/sh: parser.c
src/libexec/telnetd: telnetd.c
src/sys/arch/alpha/alpha: fp_complete.c
src/sys/arch/arm/omap: omap_mputmr.c
Log Message:
s/desireable/desirable/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/bin/sh/parser.c
cvs rdiff -u -r1.56 -r1.57 src/libexec/telnetd/telnetd.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/alpha/alpha/fp_complete.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/omap/omap_mputmr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.176 src/bin/sh/parser.c:1.177
--- src/bin/sh/parser.c:1.176 Sun Dec 5 04:42:54 2021
+++ src/bin/sh/parser.c Wed Dec 8 20:21:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.c,v 1.176 2021/12/05 04:42:54 msaitoh Exp $ */
+/* $NetBSD: parser.c,v 1.177 2021/12/08 20:21:09 andvar Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95";
#else
-__RCSID("$NetBSD: parser.c,v 1.176 2021/12/05 04:42:54 msaitoh Exp $");
+__RCSID("$NetBSD: parser.c,v 1.177 2021/12/08 20:21:09 andvar Exp $");
#endif
#endif /* not lint */
@@ -673,7 +673,7 @@ simplecmd(union node **rpp, union node *
/*
* Make sure there are no unquoted $'s in the
* name (allowing those, not expanding them,
- * simply treating '$' as a character, is desireable
+ * simply treating '$' as a character, is desirable
* but the parser has converted them to CTLxxx
* chars, and that's not what we want
*
Index: src/libexec/telnetd/telnetd.c
diff -u src/libexec/telnetd/telnetd.c:1.56 src/libexec/telnetd/telnetd.c:1.57
--- src/libexec/telnetd/telnetd.c:1.56 Thu Aug 15 01:15:21 2019
+++ src/libexec/telnetd/telnetd.c Wed Dec 8 20:21:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: telnetd.c,v 1.56 2019/08/15 01:15:21 kamil Exp $ */
+/* $NetBSD: telnetd.c,v 1.57 2021/12/08 20:21:09 andvar Exp $ */
/*
* Copyright (C) 1997 and 1998 WIDE Project.
@@ -65,7 +65,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: telnetd.c,v 1.56 2019/08/15 01:15:21 kamil Exp $");
+__RCSID("$NetBSD: telnetd.c,v 1.57 2021/12/08 20:21:09 andvar Exp $");
#endif
#endif /* not lint */
@@ -749,7 +749,7 @@ telnet(int f, int p)
get_slc_defaults();
/*
- * Do some tests where it is desireable to wait for a response.
+ * Do some tests where it is desirable to wait for a response.
* Rather than doing them slowly, one at a time, do them all
* at once.
*/
Index: src/sys/arch/alpha/alpha/fp_complete.c
diff -u src/sys/arch/alpha/alpha/fp_complete.c:1.28 src/sys/arch/alpha/alpha/fp_complete.c:1.29
--- src/sys/arch/alpha/alpha/fp_complete.c:1.28 Mon Oct 4 21:02:40 2021
+++ src/sys/arch/alpha/alpha/fp_complete.c Wed Dec 8 20:21:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fp_complete.c,v 1.28 2021/10/04 21:02:40 andvar Exp $ */
+/* $NetBSD: fp_complete.c,v 1.29 2021/12/08 20:21:09 andvar Exp $ */
/*-
* Copyright (c) 2001 Ross Harvey
@@ -37,7 +37,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: fp_complete.c,v 1.28 2021/10/04 21:02:40 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fp_complete.c,v 1.29 2021/12/08 20:21:09 andvar Exp $");
#include
#include
@@ -435,7 +435,7 @@ uint64_t
alpha_read_fp_c(struct lwp *l)
{
/*
- * A possibly-desireable EV6-specific optimization would deviate from
+ * A possibly-desirable EV6-specific optimization would deviate from
* the Alpha Architecture spec and keep some FP_C bits in the FPCR,
* but in a transparent way. Some of the code for that would need to
* go right here.
Index: src/sys/arch/arm/omap/omap_mputmr.c
diff -u src/sys/arch/arm/omap/omap_mputmr.c:1.7 src/sys/arch/arm/omap/omap_mputmr.c:1.8
--- src/sys/arch/arm/omap/omap_mputmr.c:1.7 Fri May 29 12:30:39 2020
+++ src/sys/arch/arm/omap/omap_mputmr.c Wed Dec 8 20:21:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: omap_mputmr.c,v 1.7 2020/05/29 12:30:39 rin Exp $ */
+/* $NetBSD: omap_mputmr.c,v 1.8 2021/12/08 20:21:10 andvar Exp $ */
/*
* Based on i80321_timer.c and arch/arm/sa11x0/sa11x0_ost.c
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: omap_mputmr.c,v 1.7 2020/05/29 12:30:39 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_mputmr.c,v 1.8 2021/12/08 20:21:10 andvar Exp $");
#include
#include
@@ -412,7 +412,7 @@ calc_timer_factors(int ints_per_sec, tim
*
* To save that last smidgen of power, find the largest prescaler that
* will give us a reload value that doesn't have any error. However,
- * to keep delay() accurate, it is desireable to have the number of
+ * to keep delay() accurate, it is desirable to have the number of
* counts per us be
CVS commit: src
Module Name:src Committed By: andvar Date: Wed Dec 8 20:21:10 UTC 2021 Modified Files: src/bin/sh: parser.c src/libexec/telnetd: telnetd.c src/sys/arch/alpha/alpha: fp_complete.c src/sys/arch/arm/omap: omap_mputmr.c Log Message: s/desireable/desirable/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/bin/sh/parser.c cvs rdiff -u -r1.56 -r1.57 src/libexec/telnetd/telnetd.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/alpha/alpha/fp_complete.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/omap/omap_mputmr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: andvar
Date: Wed Dec 8 20:11:54 UTC 2021
Modified Files:
src/common/lib/libc/arch/i386/string: strlen.S
src/common/lib/libc/arch/x86_64/string: strlen.S
src/lib/libc/include: reentrant.h
src/sys/fs/ptyfs: ptyfs_vnops.c
src/sys/miscfs/procfs: procfs_vnops.c
Log Message:
s/efficent/efficient/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/i386/string/strlen.S
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/x86_64/string/strlen.S
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/include/reentrant.h
cvs rdiff -u -r1.67 -r1.68 src/sys/fs/ptyfs/ptyfs_vnops.c
cvs rdiff -u -r1.219 -r1.220 src/sys/miscfs/procfs/procfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/i386/string/strlen.S
diff -u src/common/lib/libc/arch/i386/string/strlen.S:1.3 src/common/lib/libc/arch/i386/string/strlen.S:1.4
--- src/common/lib/libc/arch/i386/string/strlen.S:1.3 Mon Oct 4 21:02:40 2021
+++ src/common/lib/libc/arch/i386/string/strlen.S Wed Dec 8 20:11:54 2021
@@ -6,7 +6,7 @@
#include
#if defined(LIBC_SCCS)
- RCSID("$NetBSD: strlen.S,v 1.3 2021/10/04 21:02:40 andvar Exp $")
+ RCSID("$NetBSD: strlen.S,v 1.4 2021/12/08 20:11:54 andvar Exp $")
#endif
ENTRY(strlen)
@@ -24,7 +24,7 @@ ENTRY(strlen)
/*
* There are many well known branch-free sequences which are used
* for determining whether a zero-byte is contained within a word.
- * These sequences are generally much more efficent than loading
+ * These sequences are generally much more efficient than loading
* and comparing each byte individually.
*
* The expression [1,2]:
Index: src/common/lib/libc/arch/x86_64/string/strlen.S
diff -u src/common/lib/libc/arch/x86_64/string/strlen.S:1.6 src/common/lib/libc/arch/x86_64/string/strlen.S:1.7
--- src/common/lib/libc/arch/x86_64/string/strlen.S:1.6 Sat Mar 22 19:16:34 2014
+++ src/common/lib/libc/arch/x86_64/string/strlen.S Wed Dec 8 20:11:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: strlen.S,v 1.6 2014/03/22 19:16:34 jakllsch Exp $ */
+/* $NetBSD: strlen.S,v 1.7 2021/12/08 20:11:54 andvar Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -37,13 +37,13 @@
#include
#if defined(LIBC_SCCS)
- RCSID("$NetBSD: strlen.S,v 1.6 2014/03/22 19:16:34 jakllsch Exp $")
+ RCSID("$NetBSD: strlen.S,v 1.7 2021/12/08 20:11:54 andvar Exp $")
#endif
/*
* There are many well known branch-free sequences which are used
* for determining whether a zero-byte is contained within a word.
- * These sequences are generally much more efficent than loading
+ * These sequences are generally much more efficient than loading
* and comparing each byte individually.
*
* The expression [1,2]:
Index: src/lib/libc/include/reentrant.h
diff -u src/lib/libc/include/reentrant.h:1.20 src/lib/libc/include/reentrant.h:1.21
--- src/lib/libc/include/reentrant.h:1.20 Wed Feb 8 18:00:37 2017
+++ src/lib/libc/include/reentrant.h Wed Dec 8 20:11:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: reentrant.h,v 1.20 2017/02/08 18:00:37 christos Exp $ */
+/* $NetBSD: reentrant.h,v 1.21 2021/12/08 20:11:54 andvar Exp $ */
/*-
* Copyright (c) 1997, 1998, 2003 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
* One approach for thread safety is to provide discrete versions of the
* library: one thread safe, the other not. The disadvantage of this is
* that libc is rather large, and two copies of a library which are 99%+
- * identical is not an efficent use of resources.
+ * identical is not an efficient use of resources.
*
* Another approach is to provide a single thread safe library. However,
* it should not add significant run time or code size overhead to non-
Index: src/sys/fs/ptyfs/ptyfs_vnops.c
diff -u src/sys/fs/ptyfs/ptyfs_vnops.c:1.67 src/sys/fs/ptyfs/ptyfs_vnops.c:1.68
--- src/sys/fs/ptyfs/ptyfs_vnops.c:1.67 Wed Oct 20 03:08:17 2021
+++ src/sys/fs/ptyfs/ptyfs_vnops.c Wed Dec 8 20:11:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_vnops.c,v 1.67 2021/10/20 03:08:17 thorpej Exp $ */
+/* $NetBSD: ptyfs_vnops.c,v 1.68 2021/12/08 20:11:54 andvar Exp $ */
/*
* Copyright (c) 1993, 1995
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.67 2021/10/20 03:08:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.68 2021/12/08 20:11:54 andvar Exp $");
#include
#include
@@ -633,7 +633,7 @@ ptyfs_lookup(void *v)
*
* the strategy here with ptyfs is to generate a single
* directory entry at a time (struct dirent) and then
- * copy that out to userland using uiomove. a more efficent
+ * copy that out to userland using uiomove. a more efficient
* though more complex implementation, would try to minimize
* the number of calls to uiomove(). for ptyfs, this is
* hardly worth the added code complexity.
Index:
CVS commit: src
Module Name:src Committed By: andvar Date: Wed Dec 8 20:11:54 UTC 2021 Modified Files: src/common/lib/libc/arch/i386/string: strlen.S src/common/lib/libc/arch/x86_64/string: strlen.S src/lib/libc/include: reentrant.h src/sys/fs/ptyfs: ptyfs_vnops.c src/sys/miscfs/procfs: procfs_vnops.c Log Message: s/efficent/efficient/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/i386/string/strlen.S cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/x86_64/string/strlen.S cvs rdiff -u -r1.20 -r1.21 src/lib/libc/include/reentrant.h cvs rdiff -u -r1.67 -r1.68 src/sys/fs/ptyfs/ptyfs_vnops.c cvs rdiff -u -r1.219 -r1.220 src/sys/miscfs/procfs/procfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netipsec
Module Name:src Committed By: andvar Date: Wed Dec 8 20:03:26 UTC 2021 Modified Files: src/sys/netipsec: ipsec.c Log Message: s/speficication/specification/ To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/netipsec/ipsec.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/netipsec/ipsec.c diff -u src/sys/netipsec/ipsec.c:1.172 src/sys/netipsec/ipsec.c:1.173 --- src/sys/netipsec/ipsec.c:1.172 Fri Aug 28 06:20:44 2020 +++ src/sys/netipsec/ipsec.c Wed Dec 8 20:03:26 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec.c,v 1.172 2020/08/28 06:20:44 ozaki-r Exp $ */ +/* $NetBSD: ipsec.c,v 1.173 2021/12/08 20:03:26 andvar Exp $ */ /* $FreeBSD: ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.172 2020/08/28 06:20:44 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.173 2021/12/08 20:03:26 andvar Exp $"); /* * IPsec controller part. @@ -1849,7 +1849,7 @@ skippolicycheck: * * IPv6 receivers MUST discard UDP packets with a zero checksum. * - * There is more relaxed speficication RFC6935(IPv6 and UDP Checksums for + * There is more relaxed specification RFC6935(IPv6 and UDP Checksums for * Tunneled Packets). The document allows zero checksum. It's too * late to publish, there are a lot of interoperability problems... */
CVS commit: src/sys/netipsec
Module Name:src Committed By: andvar Date: Wed Dec 8 20:03:26 UTC 2021 Modified Files: src/sys/netipsec: ipsec.c Log Message: s/speficication/specification/ To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/netipsec/ipsec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/examples/fstab
Module Name:src Committed By: andvar Date: Wed Dec 8 19:28:30 UTC 2021 Modified Files: src/share/examples/fstab: fstab.sd0.amiga Log Message: s/recomended/recommended/ and s/unknonwn/unknown/ To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/examples/fstab/fstab.sd0.amiga Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/examples/fstab/fstab.sd0.amiga diff -u src/share/examples/fstab/fstab.sd0.amiga:1.4 src/share/examples/fstab/fstab.sd0.amiga:1.5 --- src/share/examples/fstab/fstab.sd0.amiga:1.4 Fri May 6 08:41:00 2005 +++ src/share/examples/fstab/fstab.sd0.amiga Wed Dec 8 19:28:30 2021 @@ -1,4 +1,4 @@ -# $NetBSD: fstab.sd0.amiga,v 1.4 2005/05/06 08:41:00 hubertf Exp $ +# $NetBSD: fstab.sd0.amiga,v 1.5 2021/12/08 19:28:30 andvar Exp $ # # Sample fstab for Amiga. # @@ -12,9 +12,9 @@ # fast file system on /usr (NBU\7) next to lowest scsi disk unit /dev/sd0d /usr ffs rw 1 2 # amigados file system on /amiga (DOS/1) -# It is recomended that you mount it on a dir that matches the +# It is recommended that you mount it on a dir that matches the # volume name and then slinks will resolve correctly. All ados -# unknonwn and NBU type filesystems are addressed in physical +# unknown and NBU type filesystems are addressed in physical # offset (on media) order. So in this example the bsd usr part is # first on the disk followed by the ados. #/dev/sd0e /amiga ados ro
CVS commit: src/share/examples/fstab
Module Name:src Committed By: andvar Date: Wed Dec 8 19:28:30 UTC 2021 Modified Files: src/share/examples/fstab: fstab.sd0.amiga Log Message: s/recomended/recommended/ and s/unknonwn/unknown/ To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/examples/fstab/fstab.sd0.amiga Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/usr.bin/make
Am 08.12.2021 um 02:09 schrieb matthew green: Module Name:src Committed By: rillig Date: Sun Dec 5 14:57:36 UTC 2021 Modified Files: src/usr.bin/make: test-variants.sh src/usr.bin/make/unit-tests: Makefile export.mk opt-file.mk Log Message: tests/make: migrate to jemalloc > 100 note that the build allows choosing jemalloc 100 or 510, and we default to 100 on vax and sun2 currently. The code of usr.bin/make is as platform-independent as possible, therefore my idea was to run the tests with memory debugging on the main development platforms, assuming that if the memory management would be broken, either x86_64 or i386 or sparc would fail first, and these are included in https://releng.netbsd.org/test-results.html. I don't think adding memory management debugging for vax or sun2 provides much additional value. Sure, if you insist, I can add that, but right now I feel it would be redundant. On the plus side, omitting memory debugging on these platforms makes the tests run a bit faster. Roland
CVS commit: src/sys/arch/sparc/dev
Module Name:src Committed By: macallan Date: Wed Dec 8 17:03:38 UTC 2021 Modified Files: src/sys/arch/sparc/dev: sxreg.h Log Message: be more consistent with underscores in instruction names To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sparc/dev/sxreg.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/sparc/dev/sxreg.h diff -u src/sys/arch/sparc/dev/sxreg.h:1.19 src/sys/arch/sparc/dev/sxreg.h:1.20 --- src/sys/arch/sparc/dev/sxreg.h:1.19 Wed Dec 8 16:40:14 2021 +++ src/sys/arch/sparc/dev/sxreg.h Wed Dec 8 17:03:38 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sxreg.h,v 1.19 2021/12/08 16:40:14 macallan Exp $ */ +/* $NetBSD: sxreg.h,v 1.20 2021/12/08 17:03:38 macallan Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -253,18 +253,18 @@ SX_UCHAN_24 | (sreg << 7) | (o)) /* ROP and SELECT instructions */ -#define SX_ROPB (0x0 << 21) /* mask bits apply to bytes */ -#define SX_ROPM (0x1 << 21) /* mask bits apply to each bit */ -#define SX_ROPL (0x2 << 21) /* mask bits apply per register */ -#define SX_SELB (0x4 << 21) /* byte select scalar */ -#define SX_SELV (0x6 << 21) /* register select vector */ -#define SX_SELS (0x7 << 21) /* register select scalar */ +#define SX_ROP_B (0x0 << 21) /* mask bits apply to bytes */ +#define SX_ROP_M (0x1 << 21) /* mask bits apply to each bit */ +#define SX_ROP_L (0x2 << 21) /* mask bits apply per register */ +#define SX_SEL_B (0x4 << 21) /* byte select scalar */ +#define SX_SEL_V (0x6 << 21) /* register select vector */ +#define SX_SEL_S (0x7 << 21) /* register select scalar */ -#define SX_ROP(sa, sb, d, cnt) (0x9000 | ((cnt) << 24) | SX_ROPL | \ +#define SX_ROP(sa, sb, d, cnt) (0x9000 | ((cnt) << 24) | SX_ROP_L | \ ((sa) << 14) | (sb) | ((d) << 7)) -#define SX_ROPB(sa, sb, d, cnt) (0x9000 | ((cnt) << 24) | SX_ROPB | \ +#define SX_ROPB(sa, sb, d, cnt) (0x9000 | ((cnt) << 24) | SX_ROP_B | \ ((sa) << 14) | (sb) | ((d) << 7)) -#define SX_SELECT_S(sa, sb, d, cnt) (0x9000 | ((cnt) << 24) | SX_SELS | \ +#define SX_SELECT_S(sa, sb, d, cnt) (0x9000 | ((cnt) << 24) | SX_SEL_S | \ ((sa) << 14) | (sb) | ((d) << 7)) /* multiply group */ @@ -350,30 +350,30 @@ ((sa) << 14) | ((d) << 7) | (sb)) /* shift group */ -#define SX_SRLV (0 << 21) /* shift right logical, by vector */ -#define SX_SRLI (1 << 21) /* shift right logical, by immediate */ -#define SX_SRAV (2 << 21) /* shift right arithmetic, by vector */ -#define SX_SRAI (3 << 21) /* shift right arithmetic, by immediate */ -#define SX_SLLV (4 << 21) /* shift left logical, by vector */ -#define SX_SLLI (5 << 21) /* shift left logical, by immediate */ -#define SX_SLFS (6 << 21) /* shift left funnel, by SRCB */ -#define SX_SLFI (7 << 21) /* shift left funnel, by immediate */ +#define SX_SRL_V (0 << 21) /* shift right logical, by vector */ +#define SX_SRL_I (1 << 21) /* shift right logical, by immediate */ +#define SX_SRA_V (2 << 21) /* shift right arithmetic, by vector */ +#define SX_SRA_I (3 << 21) /* shift right arithmetic, by immediate */ +#define SX_SLL_V (4 << 21) /* shift left logical, by vector */ +#define SX_SLL_I (5 << 21) /* shift left logical, by immediate */ +#define SX_SLF_S (6 << 21) /* shift left funnel, by SRCB */ +#define SX_SLF_I (7 << 21) /* shift left funnel, by immediate */ -#define SX_SRL_V(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SRLV | \ +#define SX_SRLV(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SRL_V | \ ((sa) << 14) | ((d) << 7) | (sb)) -#define SX_SRL_I(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SRLI | \ +#define SX_SRLI(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SRL_I | \ ((sa) << 14) | ((d) << 7) | (sb)) -#define SX_SRA_V(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SRAV | \ +#define SX_SRAV(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SRA_V | \ ((sa) << 14) | ((d) << 7) | (sb)) -#define SX_SRA_I(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SRAI | \ +#define SX_SRAI(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SRA_I | \ ((sa) << 14) | ((d) << 7) | (sb)) -#define SX_SLL_V(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SLLV | \ +#define SX_SLLV(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SLL_V | \ ((sa) << 14) | ((d) << 7) | (sb)) -#define SX_SLL_I(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SLLI | \ +#define SX_SLLI(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SLL_I | \ ((sa) << 14) | ((d) << 7) | (sb)) -#define SX_FUNNEL_S(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SLFS | \ +#define SX_FUNNEL_S(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SLF_S | \ ((sa) << 14) | ((d) << 7) | (sb)) -#define SX_FUNNEL_I(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SLFI | \ +#define SX_FUNNEL_I(sa, sb, d, cnt) (0xc000 | ((cnt) << 24) | SX_SLF_I | \ ((sa) << 14) | ((d) << 7) |
CVS commit: src/sys/arch/sparc/dev
Module Name:src Committed By: macallan Date: Wed Dec 8 17:03:38 UTC 2021 Modified Files: src/sys/arch/sparc/dev: sxreg.h Log Message: be more consistent with underscores in instruction names To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sparc/dev/sxreg.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/sparc/dev
Module Name:src Committed By: macallan Date: Wed Dec 8 16:40:14 UTC 2021 Modified Files: src/sys/arch/sparc/dev: sxreg.h Log Message: add SX_ROPB instruction To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/dev/sxreg.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/sparc/dev/sxreg.h diff -u src/sys/arch/sparc/dev/sxreg.h:1.18 src/sys/arch/sparc/dev/sxreg.h:1.19 --- src/sys/arch/sparc/dev/sxreg.h:1.18 Fri Dec 3 22:41:18 2021 +++ src/sys/arch/sparc/dev/sxreg.h Wed Dec 8 16:40:14 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sxreg.h,v 1.18 2021/12/03 22:41:18 macallan Exp $ */ +/* $NetBSD: sxreg.h,v 1.19 2021/12/08 16:40:14 macallan Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -262,6 +262,8 @@ #define SX_ROP(sa, sb, d, cnt) (0x9000 | ((cnt) << 24) | SX_ROPL | \ ((sa) << 14) | (sb) | ((d) << 7)) +#define SX_ROPB(sa, sb, d, cnt) (0x9000 | ((cnt) << 24) | SX_ROPB | \ + ((sa) << 14) | (sb) | ((d) << 7)) #define SX_SELECT_S(sa, sb, d, cnt) (0x9000 | ((cnt) << 24) | SX_SELS | \ ((sa) << 14) | (sb) | ((d) << 7))
CVS commit: src/sys/arch/sparc/dev
Module Name:src Committed By: macallan Date: Wed Dec 8 16:40:14 UTC 2021 Modified Files: src/sys/arch/sparc/dev: sxreg.h Log Message: add SX_ROPB instruction To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/dev/sxreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Dec 8 15:58:11 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1720 To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-8.3 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-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.112 src/doc/CHANGES-8.3:1.1.2.113 --- src/doc/CHANGES-8.3:1.1.2.112 Tue Dec 7 12:42:23 2021 +++ src/doc/CHANGES-8.3 Wed Dec 8 15:58:11 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.112 2021/12/07 12:42:23 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.113 2021/12/08 15:58:11 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -2327,3 +2327,23 @@ sys/arch/x86/x86/identcpu.c 1.121 Make a numeric literal unsigned as it is bit-negated. [msaitoh, ticket #1719] +sys/arch/x86/include/specialreg.h 1.146, 1.171, + 1.173-1.178 via patch +sys/arch/x86/x86/identcpu.c 1.106, 1.117, 1.122 via patch +sys/arch/x86/x86/pmap.cpatch +sys/external/bsd/drm2/drm/drm_cache.c 1.14 +usr.sbin/cpuctl/arch/i386.c 1.114-1.117 + + + - Add PT, PKRU, HDC, LA57, PKE, PKS, CET, CET_U, CET_S, HWP, KL, + AVX512_BF16, TME_EN and PCONFIG. + - Rename some macros to match the x86 specification and the other OSes. + - Print CPUID 0x808 %ebx on Intel, too. + - Print CPUID leaf 7 subleaf 1. + - Identify Tiger Lake, 3rd gen Xeon Scalable (Ice Lake), Elkhart Lake + and Jasper Lake. + - Remove a few unused MSRs. + - Add comment. + - KNF. Whitespace fix. + [msaitoh, ticket #1720] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Dec 8 15:58:11 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1720 To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Wed Dec 8 15:56:18 UTC 2021 Modified Files: src/sys/arch/x86/include [netbsd-8]: specialreg.h src/sys/arch/x86/x86 [netbsd-8]: identcpu.c pmap.c src/sys/external/bsd/drm2/drm [netbsd-8]: drm_cache.c src/usr.sbin/cpuctl/arch [netbsd-8]: i386.c Log Message: Pull up the following, requested by msaitoh in ticket #1720: sys/arch/x86/include/specialreg.h 1.146, 1.171, 1.173-1.178 via patch sys/arch/x86/x86/identcpu.c 1.106, 1.117, 1.122 via patch sys/arch/x86/x86/pmap.c patch sys/external/bsd/drm2/drm/drm_cache.c 1.14 usr.sbin/cpuctl/arch/i386.c 1.114-1.117 - Add PT, PKRU, HDC, LA57, PKE, PKS, CET, CET_U, CET_S, HWP, KL, AVX512_BF16, TME_EN and PCONFIG. - Rename some macros to match the x86 specification and the other OSes. - Print CPUID 0x808 %ebx on Intel, too. - Print CPUID leaf 7 subleaf 1. - Identify Tiger Lake, 3rd gen Xeon Scalable (Ice Lake), Elkhart Lake and Jasper Lake. - Remove a few unused MSRs. - Add comment. - KNF. Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.98.2.21 -r1.98.2.22 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.55.2.11 -r1.55.2.12 src/sys/arch/x86/x86/identcpu.c cvs rdiff -u -r1.245.6.6 -r1.245.6.7 src/sys/arch/x86/x86/pmap.c cvs rdiff -u -r1.8 -r1.8.10.1 src/sys/external/bsd/drm2/drm/drm_cache.c cvs rdiff -u -r1.74.6.11 -r1.74.6.12 src/usr.sbin/cpuctl/arch/i386.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/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.98.2.21 src/sys/arch/x86/include/specialreg.h:1.98.2.22 --- src/sys/arch/x86/include/specialreg.h:1.98.2.21 Wed Aug 5 18:26:17 2020 +++ src/sys/arch/x86/include/specialreg.h Wed Dec 8 15:56:17 2021 @@ -1,6 +1,32 @@ -/* $NetBSD: specialreg.h,v 1.98.2.21 2020/08/05 18:26:17 martin Exp $ */ +/* $NetBSD: specialreg.h,v 1.98.2.22 2021/12/08 15:56:17 martin Exp $ */ -/*- +/* + * Copyright (c) 2014-2019 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. + */ + +/* * Copyright (c) 1991 The Regents of the University of California. * All rights reserved. * @@ -32,28 +58,24 @@ */ /* - * Bits in 386 special registers: + * CR0 */ #define CR0_PE 0x0001 /* Protected mode Enable */ #define CR0_MP 0x0002 /* "Math" Present (NPX or NPX emulator) */ #define CR0_EM 0x0004 /* EMulate non-NPX coproc. (trap ESC only) */ #define CR0_TS 0x0008 /* Task Switched (if MP, trap ESC and WAIT) */ #define CR0_ET 0x0010 /* Extension Type (387 (if set) vs 287) */ -#define CR0_PG 0x8000 /* PaGing enable */ - -/* - * Bits in 486 special registers: - */ #define CR0_NE 0x0020 /* Numeric Error enable (EX16 vs IRQ13) */ #define CR0_WP 0x0001 /* Write Protect (honor PG_RW in all modes) */ #define CR0_AM 0x0004 /* Alignment Mask (set to enable AC flag) */ #define CR0_NW 0x2000 /* Not Write-through */ #define CR0_CD 0x4000 /* Cache Disable */ +#define CR0_PG 0x8000 /* PaGing enable */ /* - * Cyrix 486 DLC special registers, accessible as IO ports. + * Cyrix 486 DLC special registers, accessible as IO ports */ -#define CCR0 0xc0 /* configuration control register 0 */ +#define CCR0 0xc0 /* configuration control register 0 */ #define CCR0_NC0 0x01 /* first 64K of each 1M memory region is
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Wed Dec 8 15:56:18 UTC 2021 Modified Files: src/sys/arch/x86/include [netbsd-8]: specialreg.h src/sys/arch/x86/x86 [netbsd-8]: identcpu.c pmap.c src/sys/external/bsd/drm2/drm [netbsd-8]: drm_cache.c src/usr.sbin/cpuctl/arch [netbsd-8]: i386.c Log Message: Pull up the following, requested by msaitoh in ticket #1720: sys/arch/x86/include/specialreg.h 1.146, 1.171, 1.173-1.178 via patch sys/arch/x86/x86/identcpu.c 1.106, 1.117, 1.122 via patch sys/arch/x86/x86/pmap.c patch sys/external/bsd/drm2/drm/drm_cache.c 1.14 usr.sbin/cpuctl/arch/i386.c 1.114-1.117 - Add PT, PKRU, HDC, LA57, PKE, PKS, CET, CET_U, CET_S, HWP, KL, AVX512_BF16, TME_EN and PCONFIG. - Rename some macros to match the x86 specification and the other OSes. - Print CPUID 0x808 %ebx on Intel, too. - Print CPUID leaf 7 subleaf 1. - Identify Tiger Lake, 3rd gen Xeon Scalable (Ice Lake), Elkhart Lake and Jasper Lake. - Remove a few unused MSRs. - Add comment. - KNF. Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.98.2.21 -r1.98.2.22 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.55.2.11 -r1.55.2.12 src/sys/arch/x86/x86/identcpu.c cvs rdiff -u -r1.245.6.6 -r1.245.6.7 src/sys/arch/x86/x86/pmap.c cvs rdiff -u -r1.8 -r1.8.10.1 src/sys/external/bsd/drm2/drm/drm_cache.c cvs rdiff -u -r1.74.6.11 -r1.74.6.12 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Dec 8 15:51:53 UTC 2021 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Tickets #1391 and #1392 To generate a diff of this commit: cvs rdiff -u -r1.1.2.56 -r1.1.2.57 src/doc/CHANGES-9.3 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-9.3 diff -u src/doc/CHANGES-9.3:1.1.2.56 src/doc/CHANGES-9.3:1.1.2.57 --- src/doc/CHANGES-9.3:1.1.2.56 Tue Dec 7 12:43:14 2021 +++ src/doc/CHANGES-9.3 Wed Dec 8 15:51:53 2021 @@ -1,4 +1,4 @@ -29~# $NetBSD: CHANGES-9.3,v 1.1.2.56 2021/12/07 12:43:14 martin Exp $ +29~# $NetBSD: CHANGES-9.3,v 1.1.2.57 2021/12/08 15:51:53 martin Exp $ A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3 release: @@ -1083,3 +1083,26 @@ sys/arch/x86/x86/identcpu.c 1.121 Make a numeric literal unsigned as it is bit-negated. [msaitoh, ticket #1390] +sys/arch/x86/include/specialreg.h 1.171, 1.173-1.178 +sys/arch/x86/x86/identcpu.c 1.106, 1.117, 1.122 via patch +sys/dev/nvmm/x86/nvmm_x86.c 1.18 +sys/external/bsd/drm2/drm/drm_cache.c 1.14 +sys/external/bsd/drm2/include/asm/cpufeature.h 1.5 +usr.sbin/cpuctl/arch/i386.c 1.114-1.117 + + - Add LA57, PKE, PKS, CET, CET_U, CET_S, HWP, KL, AVX512_BF16, TME_EN + and PCONFIG. + - Rename some macros to match the x86 specification and the other OSes. + - Print CPUID 0x808 %ebx on Intel, too. + - Print CPUID leaf 7 subleaf 1. + - Identify Tiger Lake, 3rd gen Xeon Scalable (Ice Lake), Elkhart Lake + and Jasper Lake. + - Add comment. + - KNF. Whitespace fix. + [msaitoh, ticket #1391] + +sys/dev/ipmi.c 1.6-1.9 + + ipmi(4): various stability improvements and fix for PR 56539. + [hauke, ticket #1392] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Dec 8 15:51:53 UTC 2021 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Tickets #1391 and #1392 To generate a diff of this commit: cvs rdiff -u -r1.1.2.56 -r1.1.2.57 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev
Module Name:src
Committed By: martin
Date: Wed Dec 8 15:50:13 UTC 2021
Modified Files:
src/sys/dev [netbsd-9]: ipmi.c
Log Message:
Pull up following revision(s) (requested by hauke in ticket #1392):
sys/dev/ipmi.c: revision 1.6
sys/dev/ipmi.c: revision 1.7
sys/dev/ipmi.c: revision 1.8
sys/dev/ipmi.c: revision 1.9
Fail open when ipmi device was found.
Clear sc_envsys on failure to prevent double-free.
ipmi(4): Use config_pending_incr/decr.
Don't abuse autoconf's private (and incoherent) dv_flags.
ipmi(4): Notify config_pending_decr when ready, not when dying.
Should fix hang at boot.
ipmi(4): Tidy up ipmi_thread a little.
- Join on detach -- don't free anything until thread has exited; thread
may still be using stuff.
- Nix dead error branch -- malloc(M_WAITOK) cannot fail.
- x = malloc(sizeof(x[0]) * n), not x = malloc(sizeof(type_t) * n)
To generate a diff of this commit:
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sys/dev/ipmi.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/ipmi.c
diff -u src/sys/dev/ipmi.c:1.4.4.1 src/sys/dev/ipmi.c:1.4.4.2
--- src/sys/dev/ipmi.c:1.4.4.1 Tue Aug 18 09:36:36 2020
+++ src/sys/dev/ipmi.c Wed Dec 8 15:50:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.4.4.1 2020/08/18 09:36:36 martin Exp $ */
+/* $NetBSD: ipmi.c,v 1.4.4.2 2021/12/08 15:50:13 martin Exp $ */
/*
* Copyright (c) 2019 Michael van Elst
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.4.4.1 2020/08/18 09:36:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.4.4.2 2021/12/08 15:50:13 martin Exp $");
#include
#include
@@ -238,7 +238,6 @@ static int bmc_io_wait(struct ipmi_softc
static int bmc_io_wait_spin(struct ipmi_softc *, int, uint8_t, uint8_t);
static int bmc_io_wait_sleep(struct ipmi_softc *, int, uint8_t, uint8_t);
-static void *bt_buildmsg(struct ipmi_softc *, int, int, int, const void *, int *);
static void *cmn_buildmsg(struct ipmi_softc *, int, int, int, const void *, int *);
static int getbits(uint8_t *, int, int);
@@ -268,6 +267,7 @@ static int kcs_reset(struct ipmi_softc *
static int kcs_sendmsg(struct ipmi_softc *, int, const uint8_t *);
static int kcs_recvmsg(struct ipmi_softc *, int, int *len, uint8_t *);
+static void *bt_buildmsg(struct ipmi_softc *, int, int, int, const void *, int *);
static int bt_probe(struct ipmi_softc *);
static int bt_reset(struct ipmi_softc *);
static int bt_sendmsg(struct ipmi_softc *, int, const uint8_t *);
@@ -1984,13 +1984,8 @@ ipmi_thread(void *cookie)
break;
/* allocate and fill sensor arrays */
- sc->sc_sensor =
- malloc(sizeof(envsys_data_t) * sc->sc_nsensors,
- M_DEVBUF, M_WAITOK | M_ZERO);
- if (sc->sc_sensor == NULL) {
- aprint_error_dev(self, "can't allocate envsys_data_t\n");
- kthread_exit(0);
- }
+ sc->sc_sensor = malloc(sizeof(sc->sc_sensor[0]) * sc->sc_nsensors,
+ M_DEVBUF, M_WAITOK | M_ZERO);
sc->sc_envsys = sysmon_envsys_create();
sc->sc_envsys->sme_cookie = sc;
@@ -2034,6 +2029,7 @@ ipmi_thread(void *cookie)
if (sysmon_envsys_register(sc->sc_envsys)) {
aprint_error_dev(self, "unable to register with sysmon\n");
sysmon_envsys_destroy(sc->sc_envsys);
+ sc->sc_envsys = NULL;
}
/* initialize sensor list for thread */
@@ -2089,6 +2085,8 @@ ipmi_thread(void *cookie)
if (!pmf_device_register(self, ipmi_suspend, NULL))
aprint_error_dev(self, "couldn't establish a power handler\n");
+ config_pending_decr(self);
+
mutex_enter(>sc_poll_mtx);
while (sc->sc_thread_running) {
while (sc->sc_mode == IPMI_MODE_COMMAND)
@@ -2107,7 +2105,6 @@ ipmi_thread(void *cookie)
SENSOR_REFRESH_RATE);
}
mutex_exit(>sc_poll_mtx);
- self->dv_flags &= ~DVF_ATTACH_INPROGRESS;
kthread_exit(0);
}
@@ -2130,11 +2127,11 @@ ipmi_attach(device_t parent, device_t se
cv_init(>sc_poll_cv, "ipmipoll");
cv_init(>sc_mode_cv, "ipmimode");
- if (kthread_create(PRI_NONE, 0, NULL, ipmi_thread, self,
+ if (kthread_create(PRI_NONE, KTHREAD_MUSTJOIN, NULL, ipmi_thread, self,
>sc_kthread, "%s", device_xname(self)) != 0) {
aprint_error_dev(self, "unable to create thread, disabled\n");
} else
- self->dv_flags |= DVF_ATTACH_INPROGRESS;
+ config_pending_incr(self);
}
static int
@@ -2148,6 +2145,8 @@ ipmi_detach(device_t self, int flags)
sc->sc_thread_running = false;
cv_signal(>sc_poll_cv);
mutex_exit(>sc_poll_mtx);
+ if (sc->sc_kthread)
+ (void)kthread_join(sc->sc_kthread);
if ((rc = sysmon_wdog_unregister(>sc_wdog)) != 0) {
if (rc == ERESTART)
@@ -2314,6 +2313,13 @@ ipmi_suspend(device_t dev, const pmf_qua
static int
ipmi_open(dev_t dev, int flag, int fmt, lwp_t *l)
{
+ struct ipmi_softc *sc;
+ int unit;
+
+ unit = IPMIUNIT(dev);
+ if ((sc = device_lookup_private(_cd, unit)) == NULL)
+ return (ENXIO);
+
return 0;
}
CVS commit: [netbsd-9] src/sys/dev
Module Name:src Committed By: martin Date: Wed Dec 8 15:50:13 UTC 2021 Modified Files: src/sys/dev [netbsd-9]: ipmi.c Log Message: Pull up following revision(s) (requested by hauke in ticket #1392): sys/dev/ipmi.c: revision 1.6 sys/dev/ipmi.c: revision 1.7 sys/dev/ipmi.c: revision 1.8 sys/dev/ipmi.c: revision 1.9 Fail open when ipmi device was found. Clear sc_envsys on failure to prevent double-free. ipmi(4): Use config_pending_incr/decr. Don't abuse autoconf's private (and incoherent) dv_flags. ipmi(4): Notify config_pending_decr when ready, not when dying. Should fix hang at boot. ipmi(4): Tidy up ipmi_thread a little. - Join on detach -- don't free anything until thread has exited; thread may still be using stuff. - Nix dead error branch -- malloc(M_WAITOK) cannot fail. - x = malloc(sizeof(x[0]) * n), not x = malloc(sizeof(type_t) * n) To generate a diff of this commit: cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sys/dev/ipmi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Wed Dec 8 15:44:17 UTC 2021 Modified Files: src/sys/arch/x86/include [netbsd-9]: specialreg.h src/sys/arch/x86/x86 [netbsd-9]: identcpu.c src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86.c src/sys/external/bsd/drm2/drm [netbsd-9]: drm_cache.c src/sys/external/bsd/drm2/include/asm [netbsd-9]: cpufeature.h src/usr.sbin/cpuctl/arch [netbsd-9]: i386.c Log Message: Pull up the following revisions, requested by msaitoh in ticket #1391: sys/arch/x86/include/specialreg.h 1.171, 1.173-1.178 sys/arch/x86/x86/identcpu.c 1.106, 1.117, 1.122 via patch sys/dev/nvmm/x86/nvmm_x86.c 1.18 sys/external/bsd/drm2/drm/drm_cache.c 1.14 sys/external/bsd/drm2/include/asm/cpufeature.h 1.5 usr.sbin/cpuctl/arch/i386.c 1.114-1.117 - Add LA57, PKE, PKS, CET, CET_U, CET_S, HWP, KL, AVX512_BF16, TME_EN and PCONFIG. - Rename some macros to match the x86 specification and the other OSes. - Print CPUID 0x808 %ebx on Intel, too. - Print CPUID leaf 7 subleaf 1. - Identify Tiger Lake, 3rd gen Xeon Scalable (Ice Lake), Elkhart Lake and Jasper Lake. - Add comment. - KNF. Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.150.2.8 -r1.150.2.9 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.93.2.3 -r1.93.2.4 src/sys/arch/x86/x86/identcpu.c cvs rdiff -u -r1.7.4.6 -r1.7.4.7 src/sys/dev/nvmm/x86/nvmm_x86.c cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/external/bsd/drm2/drm/drm_cache.c cvs rdiff -u -r1.4 -r1.4.8.1 \ src/sys/external/bsd/drm2/include/asm/cpufeature.h cvs rdiff -u -r1.104.2.7 -r1.104.2.8 src/usr.sbin/cpuctl/arch/i386.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/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.150.2.8 src/sys/arch/x86/include/specialreg.h:1.150.2.9 --- src/sys/arch/x86/include/specialreg.h:1.150.2.8 Fri Sep 4 18:53:43 2020 +++ src/sys/arch/x86/include/specialreg.h Wed Dec 8 15:44:16 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.150.2.8 2020/09/04 18:53:43 martin Exp $ */ +/* $NetBSD: specialreg.h,v 1.150.2.9 2021/12/08 15:44:16 martin Exp $ */ /* * Copyright (c) 2014-2020 The NetBSD Foundation, Inc. @@ -109,6 +109,7 @@ #define CR4_OSFXSR 0x0200 /* enable fxsave/fxrestor and SSE */ #define CR4_OSXMMEXCPT 0x0400 /* enable unmasked SSE exceptions */ #define CR4_UMIP 0x0800 /* user-mode instruction prevention */ +#define CR4_LA57 0x1000 /* 57-bit linear addresses */ #define CR4_VMXE 0x2000 /* enable VMX operations */ #define CR4_SMXE 0x4000 /* enable SMX operations */ #define CR4_FSGSBASE 0x0001 /* enable *FSBASE and *GSBASE instructions */ @@ -116,7 +117,9 @@ #define CR4_OSXSAVE 0x0004 /* enable xsave and xrestore */ #define CR4_SMEP 0x0010 /* enable SMEP support */ #define CR4_SMAP 0x0020 /* enable SMAP support */ -#define CR4_PKE 0x0040 /* protection key enable */ +#define CR4_PKE 0x0040 /* enable Protection Keys for user pages */ +#define CR4_CET 0x0080 /* enable CET */ +#define CR4_PKS 0x0100 /* enable Protection Keys for kern pages */ /* * Extended Control Register XCR0 @@ -131,13 +134,17 @@ #define XCR0_Hi16_ZMM 0x0080 /* AVX-512 512 bits upper registers */ #define XCR0_PT 0x0100 /* Processor Trace state */ #define XCR0_PKRU 0x0200 /* Protection Key state */ +#define XCR0_CET_U 0x0800 /* User CET state */ +#define XCR0_CET_S 0x1000 /* Kern CET state */ #define XCR0_HDC 0x2000 /* Hardware Duty Cycle state */ +#define XCR0_HWP 0x0001 /* Hardware P-states */ #define XCR0_FLAGS1 "\20" \ "\1" "x87" "\2" "SSE" "\3" "AVX" \ "\4" "BNDREGS" "\5" "BNDCSR" "\6" "Opmask" \ "\7" "ZMM_Hi256" "\10" "Hi16_ZMM" "\11" "PT" \ - "\12" "PKRU" "\16" "HDC" + "\12" "PKRU" "\14" "CET_U" "\15" "CET_S" \ + "\16" "HDC" "\21" "HWP" /* * Known FPU bits, only these get enabled. The save area is sized for all the @@ -147,7 +154,7 @@ XCR0_Opmask | XCR0_ZMM_Hi256 | XCR0_Hi16_ZMM) /* - * XSAVE component indices. + * XSAVE component indices, internal to NetBSD. */ #define XSAVE_X87 0 #define XSAVE_SSE 1 @@ -157,9 +164,6 @@ #define XSAVE_Opmask 5 #define XSAVE_ZMM_Hi256 6 #define XSAVE_Hi16_ZMM 7 -#define XSAVE_PT 8 -#define XSAVE_PKRU 9 -#define XSAVE_HDC 10 /* * Highest XSAVE component enabled by XCR0_FPU. @@ -181,7 +185,6 @@ #define CPUID_MCE 0x0080 /* has machine check exception */ #define CPUID_CX8 0x0100 /* has CMPXCHG8B instruction */ #define CPUID_APIC 0x0200 /* has enabled APIC */ -#define CPUID_B10 0x0400 /* reserved, MTRR */ #define CPUID_SEP 0x0800 /* has SYSENTER/SYSEXIT extension */ #define CPUID_MTRR
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Wed Dec 8 15:44:17 UTC 2021 Modified Files: src/sys/arch/x86/include [netbsd-9]: specialreg.h src/sys/arch/x86/x86 [netbsd-9]: identcpu.c src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86.c src/sys/external/bsd/drm2/drm [netbsd-9]: drm_cache.c src/sys/external/bsd/drm2/include/asm [netbsd-9]: cpufeature.h src/usr.sbin/cpuctl/arch [netbsd-9]: i386.c Log Message: Pull up the following revisions, requested by msaitoh in ticket #1391: sys/arch/x86/include/specialreg.h 1.171, 1.173-1.178 sys/arch/x86/x86/identcpu.c 1.106, 1.117, 1.122 via patch sys/dev/nvmm/x86/nvmm_x86.c 1.18 sys/external/bsd/drm2/drm/drm_cache.c 1.14 sys/external/bsd/drm2/include/asm/cpufeature.h 1.5 usr.sbin/cpuctl/arch/i386.c 1.114-1.117 - Add LA57, PKE, PKS, CET, CET_U, CET_S, HWP, KL, AVX512_BF16, TME_EN and PCONFIG. - Rename some macros to match the x86 specification and the other OSes. - Print CPUID 0x808 %ebx on Intel, too. - Print CPUID leaf 7 subleaf 1. - Identify Tiger Lake, 3rd gen Xeon Scalable (Ice Lake), Elkhart Lake and Jasper Lake. - Add comment. - KNF. Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.150.2.8 -r1.150.2.9 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.93.2.3 -r1.93.2.4 src/sys/arch/x86/x86/identcpu.c cvs rdiff -u -r1.7.4.6 -r1.7.4.7 src/sys/dev/nvmm/x86/nvmm_x86.c cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/external/bsd/drm2/drm/drm_cache.c cvs rdiff -u -r1.4 -r1.4.8.1 \ src/sys/external/bsd/drm2/include/asm/cpufeature.h cvs rdiff -u -r1.104.2.7 -r1.104.2.8 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src
Committed By: uwe
Date: Wed Dec 8 13:06:44 UTC 2021
Modified Files:
src/distrib/notes: Makefile.inc
Log Message:
Make .Nx \*V happy for current builds.
I'm not sure why mdoc complains here (not the technical reason, but
the pragmatic purpose). My best guess is that it wants to catch
mistakes like .Fx 1.6.1 (instead of .Nx 1.6.1). I'm not entirely
convinced this doesn't create more problems that it solves.
No objections in the 15 years since this was proposed netbsd-docs.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/distrib/notes/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/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.56 src/distrib/notes/Makefile.inc:1.57
--- src/distrib/notes/Makefile.inc:1.56 Tue Jun 23 06:28:01 2020
+++ src/distrib/notes/Makefile.inc Wed Dec 8 13:06:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.56 2020/06/23 06:28:01 martin Exp $
+# $NetBSD: Makefile.inc,v 1.57 2021/12/08 13:06:44 uwe Exp $
#
# Ross Harvey
@@ -48,6 +48,8 @@ PRESET+= -rFOR_RELEASE=0
.endif
.if (${DISTRIBVER:M*.99.*})
PRESET+= -rRELEASE_BRANCH=0
+# make .Nx \*V happy
+PRESET+= -doperating-system-NetBSD-${DISTRIBVER}=${DISTRIBVER}
.elif (${DISTRIBVER:M*.[0-9]*})
PRESET+= -rRELEASE_BRANCH=1
PRESET+= -rminor=${DISTRIBVER:C/^[0-9]+\.([0-9])+.*$/\1/}
CVS commit: src/distrib/notes
Module Name:src Committed By: uwe Date: Wed Dec 8 13:06:44 UTC 2021 Modified Files: src/distrib/notes: Makefile.inc Log Message: Make .Nx \*V happy for current builds. I'm not sure why mdoc complains here (not the technical reason, but the pragmatic purpose). My best guess is that it wants to catch mistakes like .Fx 1.6.1 (instead of .Nx 1.6.1). I'm not entirely convinced this doesn't create more problems that it solves. No objections in the 15 years since this was proposed netbsd-docs. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/distrib/notes/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/sparc
Module Name:src Committed By: uwe Date: Wed Dec 8 12:54:15 UTC 2021 Modified Files: src/distrib/notes/sparc: install Log Message: Punctuation in macro invocation must be a separate argument. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/distrib/notes/sparc/install Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/sparc
Module Name:src Committed By: uwe Date: Wed Dec 8 12:54:15 UTC 2021 Modified Files: src/distrib/notes/sparc: install Log Message: Punctuation in macro invocation must be a separate argument. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/distrib/notes/sparc/install Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/sparc/install diff -u src/distrib/notes/sparc/install:1.59 src/distrib/notes/sparc/install:1.60 --- src/distrib/notes/sparc/install:1.59 Thu Nov 21 19:23:20 2019 +++ src/distrib/notes/sparc/install Wed Dec 8 12:54:15 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: install,v 1.59 2019/11/21 19:23:20 martin Exp $ +.\" $NetBSD: install,v 1.60 2021/12/08 12:54:15 uwe Exp $ .\" .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -336,7 +336,7 @@ Run the following commands: .disp) .Pp Now you can transfer the -.Nx \*V. +.Nx \*V . distribution sets from .Pq Pa binary/sets to the tape by using a series of additional @@ -476,4 +476,4 @@ instead using the following commands: .Pp .Em Congratulations , you have successfully installed -.Nx \*V. +.Nx \*V .
