CVS commit: src/sys/dev/pci
Module Name:src
Committed By: skrll
Date: Fri Dec 10 05:55:07 UTC 2021
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Simplify. Same code before and after.
To generate a diff of this commit:
cvs rdiff -u -r1.720 -r1.721 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.720 src/sys/dev/pci/if_wm.c:1.721
--- src/sys/dev/pci/if_wm.c:1.720 Fri Dec 10 05:39:22 2021
+++ src/sys/dev/pci/if_wm.c Fri Dec 10 05:55:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.720 2021/12/10 05:39:22 skrll Exp $ */
+/* $NetBSD: if_wm.c,v 1.721 2021/12/10 05:55:06 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.720 2021/12/10 05:39:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.721 2021/12/10 05:55:06 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1762,11 +1762,8 @@ wm_82575_write_8bit_ctlr_reg(struct wm_s
static inline void
wm_set_dma_addr(volatile wiseman_addr_t *wa, bus_addr_t v)
{
- wa->wa_low = htole32(v & 0xU);
- if (sizeof(bus_addr_t) == 8)
- wa->wa_high = htole32((uint64_t) v >> 32);
- else
- wa->wa_high = 0;
+ wa->wa_low = htole32(BUS_ADDR_LO32(v));
+ wa->wa_high = htole32(BUS_ADDR_HI32(v));
}
/*
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Fri Dec 10 05:55:07 UTC 2021 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Simplify. Same code before and after. To generate a diff of this commit: cvs rdiff -u -r1.720 -r1.721 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Fri Dec 10 05:39:22 UTC 2021 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.719 -r1.720 src/sys/dev/pci/if_wm.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/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.719 src/sys/dev/pci/if_wm.c:1.720 --- src/sys/dev/pci/if_wm.c:1.719 Sun Dec 5 04:32:36 2021 +++ src/sys/dev/pci/if_wm.c Fri Dec 10 05:39:22 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.719 2021/12/05 04:32:36 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.720 2021/12/10 05:39:22 skrll Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -39,21 +39,21 @@ Copyright (c) 2001-2005, Intel Corporation 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. - + 3. Neither the name of the Intel Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 @@ -82,7 +82,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.719 2021/12/05 04:32:36 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.720 2021/12/10 05:39:22 skrll Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -17158,7 +17158,7 @@ wm_sysctl_tdh_handler(SYSCTLFN_ARGS) struct sysctlnode node = *rnode; struct wm_txqueue *txq = (struct wm_txqueue *)node.sysctl_data; struct wm_queue *wmq = container_of(txq, struct wm_queue, wmq_txq); - struct wm_softc *sc = txq->txq_sc; + struct wm_softc *sc = txq->txq_sc; uint32_t reg; reg = CSR_READ(sc, WMREG_TDH(wmq->wmq_id)); @@ -17172,7 +17172,7 @@ wm_sysctl_tdt_handler(SYSCTLFN_ARGS) struct sysctlnode node = *rnode; struct wm_txqueue *txq = (struct wm_txqueue *)node.sysctl_data; struct wm_queue *wmq = container_of(txq, struct wm_queue, wmq_txq); - struct wm_softc *sc = txq->txq_sc; + struct wm_softc *sc = txq->txq_sc; uint32_t reg; reg = CSR_READ(sc, WMREG_TDT(wmq->wmq_id));
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Fri Dec 10 05:39:22 UTC 2021 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.719 -r1.720 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: msaitoh Date: Fri Dec 10 01:18:29 UTC 2021 Modified Files: src/sys/net: if_ethersubr.c Log Message: Add comment to clarify. To generate a diff of this commit: cvs rdiff -u -r1.306 -r1.307 src/sys/net/if_ethersubr.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/net/if_ethersubr.c diff -u src/sys/net/if_ethersubr.c:1.306 src/sys/net/if_ethersubr.c:1.307 --- src/sys/net/if_ethersubr.c:1.306 Tue Nov 30 01:17:02 2021 +++ src/sys/net/if_ethersubr.c Fri Dec 10 01:18:29 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ethersubr.c,v 1.306 2021/11/30 01:17:02 yamaguchi Exp $ */ +/* $NetBSD: if_ethersubr.c,v 1.307 2021/12/10 01:18:29 msaitoh Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.306 2021/11/30 01:17:02 yamaguchi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.307 2021/12/10 01:18:29 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -901,6 +901,7 @@ ether_input(struct ifnet *ifp, struct mb ether_input_llc(ifp, m, eh); return; #else + /* ethertype of 0-1500 is regarded as noproto */ goto noproto; #endif }
CVS commit: src/sys/net
Module Name:src Committed By: msaitoh Date: Fri Dec 10 01:18:29 UTC 2021 Modified Files: src/sys/net: if_ethersubr.c Log Message: Add comment to clarify. To generate a diff of this commit: cvs rdiff -u -r1.306 -r1.307 src/sys/net/if_ethersubr.c 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
Date:Fri, 10 Dec 2021 01:36:10 +0100 (GMT+01:00) From:Roland Illig Message-ID: | I guess there's really no way around running the whole build before each | commit, to reach a build success rate of 99.9 %. What I tend to do, where possible, is make a bunch of changes during the day starting from a known buildable HEAD (in my case, day does not necessarily, or even often, match daylight very closely at all, but that's irrelevant), related changes or just plain random ones, then do a release build while I sleep. If it works, then after I am properly awake, go about doing all the appropriate commits, fairly close together. Then if no-one else left the build in a broken state, cvs update everything, and start another build, just to verify it still all builds cleanly. While that happens, I can be doing whatever else needs doing, more changes for the next set, or just walking the dog... If I go for a while not making any changes, I do the cvs update and build cycle again before starting back working on the code. This handles all the "change broke everything" issues (including set list issues) but not always the "change broke my port" problems, so you also need to watch the releng buildbot stats, and if some ports stop building, go look at the logs to see if my change might have caused tha The b5 i386 build broke e-mail helps, but i386 is just one alt port. Do remember that there is very rarely and pressing urgency for changes you are making to get committed. A delay of a few days from change complete to change committed generally hurts no-one. kre ps changes to things that cannot break the build, like man page sources, TODO, CHANGES,.. and often comments, if you are fairly convinced that nothing else will care are not much helped by build testing, so that can often be ommitted. Tests however are not in that category ... not working properly can be ok, not building is not.
Re: CVS commit: src/usr.bin/make
10.12.2021 01:07:22 Robert Elz : > Date: Thu, 9 Dec 2021 22:25:58 + > From: "Roland Illig" > Message-ID: <20211209222558.cdf22f...@cvs.netbsd.org> > | No functional change. > > That obviously wasn't true. That means that you just guessed at that, I cannot defend against this argument. Indeed, I guessed, but that guess was backed up by several hundred lines of test code, essentially all cond-*.mk and especially cond-short.mk. These tests made me reasonably sure that the behavior of the code wouldn't change. The behavior did change though, and the change went unnoticed due to my lack of testing. So even 100 % code coverage does not prevent all possible bugs. I guess there's really no way around running the whole build before each commit, to reach a build success rate of 99.9 %. Roland
Re: CVS commit: src/usr.bin/make/unit-tests
Date:Thu, 9 Dec 2021 23:57:19 +
From:"Roland Illig"
Message-ID: <20211209235719.cde20f...@cvs.netbsd.org>
| Log Message:
| tests/make: prevent the bug from cond.c 1.283 from happening again
This new test (while OK of itself) would not have done that.
I suspect this test would have passed with that broken version.
The actual condition that failed was (effectively)
.if 1 && (defined(VAR) || ${VAR} != "string")
not .if 0
In that, the "i &&" part is largely irrelevant, you didn't
touch && parsing in the change that broke things, just ||
parsing, so implementing a test that tests short circuit
eval of && will not help (this one, it could help others).
This is actually not a good text of short circuit eval of
&& though, it is complicated by the complex (and breakable,
as seen) condition on the rhs, better would be
.if defined(VAR) && ${VAR} == "yes"
or something simple like that.
With simple tests for basic short circuit eval, you can then add
tests for more complex cases
.if 1 && 1 && defined(VAR) && ${VAR} == "yes"
(and similar for ||), and after those pass, tests for various complicated
combinations of || and && (all with something relying on short circuit eval
to verify that things are not tested which should not be).
kre
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Thu Dec 9 23:57:19 UTC 2021
Modified Files:
src/usr.bin/make/unit-tests: cond-op-or.exp cond-op-or.mk
Log Message:
tests/make: prevent the bug from cond.c 1.283 from happening again
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/cond-op-or.exp
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/cond-op-or.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/cond-op-or.exp
diff -u src/usr.bin/make/unit-tests/cond-op-or.exp:1.2 src/usr.bin/make/unit-tests/cond-op-or.exp:1.3
--- src/usr.bin/make/unit-tests/cond-op-or.exp:1.2 Thu Sep 10 22:44:08 2020
+++ src/usr.bin/make/unit-tests/cond-op-or.exp Thu Dec 9 23:57:19 2021
@@ -1,4 +1,4 @@
-make: "cond-op-or.mk" line 43: Malformed conditional (0 ||| 0)
+make: "cond-op-or.mk" line 51: Malformed conditional (0 ||| 0)
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/cond-op-or.mk
diff -u src/usr.bin/make/unit-tests/cond-op-or.mk:1.6 src/usr.bin/make/unit-tests/cond-op-or.mk:1.7
--- src/usr.bin/make/unit-tests/cond-op-or.mk:1.6 Sat Oct 24 08:46:08 2020
+++ src/usr.bin/make/unit-tests/cond-op-or.mk Thu Dec 9 23:57:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: cond-op-or.mk,v 1.6 2020/10/24 08:46:08 rillig Exp $
+# $NetBSD: cond-op-or.mk,v 1.7 2021/12/09 23:57:19 rillig Exp $
#
# Tests for the || operator in .if conditions.
@@ -18,11 +18,19 @@
. error
.endif
+
# The right-hand side is not evaluated since the left-hand side is already
# true.
.if 1 || ${UNDEF}
.endif
+# When an outer condition makes the '||' expression irrelevant, neither of its
+# operands must be evaluated. This had been wrong in cond.c 1.283 from
+# 2021-12-09 and was reverted in cond.c 1.284 an hour later.
+.if 0 && (!defined(UNDEF) || ${UNDEF})
+.endif
+
+
# The || operator may be abbreviated as |. This is not widely known though
# and is also not documented in the manual page.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Thu Dec 9 23:57:19 UTC 2021 Modified Files: src/usr.bin/make/unit-tests: cond-op-or.exp cond-op-or.mk Log Message: tests/make: prevent the bug from cond.c 1.283 from happening again To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/cond-op-or.exp cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/cond-op-or.mk 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
Date:Thu, 9 Dec 2021 22:25:58 + From:"Roland Illig" Message-ID: <20211209222558.cdf22f...@cvs.netbsd.org> | make: avoid recursion in CondParser_Or | | Previously, a long chain of '1 || 1 || 1 || 1 || ...' led to a deep | recursion. Furhermore, the code didn't match the grammar on superficial | reading: the grammar said "or || and", the code said "and || or". | | No functional change. That obviously wasn't true. That means that you just guessed at that, so the comment should have been "No functional change intended" instead, but more importantly, for changes this significant you should *always* be doing a test release build before committing. I know that you have reverted this now, which is fine, but for the record the problem was that your change broke short circuit evaluation. Once an || test returns true, you don't do any more of them, the answer is already known. The expression that failed depended upon that, as is allowed. kre
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Dec 9 23:02:46 UTC 2021
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make: revert previous commit to CondParser_Or
Even though the unit tests for make cover a lot of cases, they don't
cover all cases. After the previous commit, the NetBSD build failed
with:
bsd.sys.mk line 247: \
Malformed conditional (!defined(NOPIE) && \
(!defined(LDSTATIC) || ${LDSTATIC} != "-static"))
To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 src/usr.bin/make/cond.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.283 src/usr.bin/make/cond.c:1.284
--- src/usr.bin/make/cond.c:1.283 Thu Dec 9 22:25:58 2021
+++ src/usr.bin/make/cond.c Thu Dec 9 23:02:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.283 2021/12/09 22:25:58 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.284 2021/12/09 23:02:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,11 +95,12 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.283 2021/12/09 22:25:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.284 2021/12/09 23:02:46 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
- * Or -> And ('||' And)*
+ * Or -> And
+ * Or -> Or '||' And
* And -> Term
* And -> And '&&' Term
* Term -> Function '(' Argument ')'
@@ -1001,22 +1002,26 @@ CondParser_And(CondParser *par, bool doE
}
/*
- * Or -> And ('||' And)*
+ * Or -> And
+ * Or -> Or '||' And
*/
static CondResult
CondParser_Or(CondParser *par, bool doEval)
{
- CondResult res, r;
+ CondResult res;
Token op;
- if ((res = CondParser_And(par, doEval)) == CR_ERROR)
+ res = CondParser_And(par, doEval);
+ if (res == CR_ERROR)
return CR_ERROR;
- while ((op = CondParser_Token(par, res == CR_FALSE)) == TOK_OR) {
- if ((r = CondParser_And(par, res == CR_FALSE)) == CR_ERROR)
+ op = CondParser_Token(par, doEval);
+ if (op == TOK_OR) {
+ if (res == CR_FALSE)
+ return CondParser_Or(par, doEval);
+ if (CondParser_Or(par, false) == CR_ERROR)
return CR_ERROR;
- if (r == CR_TRUE)
- res = CR_TRUE;
+ return res;
}
CondParser_PushBack(par, op);
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Dec 9 23:02:46 UTC 2021
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make: revert previous commit to CondParser_Or
Even though the unit tests for make cover a lot of cases, they don't
cover all cases. After the previous commit, the NetBSD build failed
with:
bsd.sys.mk line 247: \
Malformed conditional (!defined(NOPIE) && \
(!defined(LDSTATIC) || ${LDSTATIC} != "-static"))
To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 src/usr.bin/make/cond.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Dec 9 22:25:58 UTC 2021
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make: avoid recursion in CondParser_Or
Previously, a long chain of '1 || 1 || 1 || 1 || ...' led to a deep
recursion. Furhermore, the code didn't match the grammar on superficial
reading: the grammar said "or || and", the code said "and || or".
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 src/usr.bin/make/cond.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.282 src/usr.bin/make/cond.c:1.283
--- src/usr.bin/make/cond.c:1.282 Thu Dec 9 20:13:09 2021
+++ src/usr.bin/make/cond.c Thu Dec 9 22:25:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.282 2021/12/09 20:13:09 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.283 2021/12/09 22:25:58 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,12 +95,11 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.282 2021/12/09 20:13:09 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.283 2021/12/09 22:25:58 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
- * Or -> And
- * Or -> Or '||' And
+ * Or -> And ('||' And)*
* And -> Term
* And -> And '&&' Term
* Term -> Function '(' Argument ')'
@@ -1002,26 +1001,22 @@ CondParser_And(CondParser *par, bool doE
}
/*
- * Or -> And
- * Or -> Or '||' And
+ * Or -> And ('||' And)*
*/
static CondResult
CondParser_Or(CondParser *par, bool doEval)
{
- CondResult res;
+ CondResult res, r;
Token op;
- res = CondParser_And(par, doEval);
- if (res == CR_ERROR)
+ if ((res = CondParser_And(par, doEval)) == CR_ERROR)
return CR_ERROR;
- op = CondParser_Token(par, doEval);
- if (op == TOK_OR) {
- if (res == CR_FALSE)
- return CondParser_Or(par, doEval);
- if (CondParser_Or(par, false) == CR_ERROR)
+ while ((op = CondParser_Token(par, res == CR_FALSE)) == TOK_OR) {
+ if ((r = CondParser_And(par, res == CR_FALSE)) == CR_ERROR)
return CR_ERROR;
- return res;
+ if (r == CR_TRUE)
+ res = CR_TRUE;
}
CondParser_PushBack(par, op);
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Dec 9 22:25:58 UTC 2021 Modified Files: src/usr.bin/make: cond.c Log Message: make: avoid recursion in CondParser_Or Previously, a long chain of '1 || 1 || 1 || 1 || ...' led to a deep recursion. Furhermore, the code didn't match the grammar on superficial reading: the grammar said "or || and", the code said "and || or". No functional change. To generate a diff of this commit: cvs rdiff -u -r1.282 -r1.283 src/usr.bin/make/cond.c 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
Roland Illig writes: > Am 09.12.2021 um 21:01 schrieb matthew green: > > i'm not asking that you make sun2 or vax stuff work, but > > some of us choose to use jemalloc 100 on all builds and > > since this is a supported option, i wanted to make sure > > you were aware of it. > > I added back the support for jemalloc 100, the few extra lines didn't > hurt as much as I had thought. :) > > Thank you for suggesting and explaining it. thanks! .mrg.
CVS commit: src/share/doc/psd/05.sysman
Module Name:src Committed By: andvar Date: Thu Dec 9 21:14:50 UTC 2021 Modified Files: src/share/doc/psd/05.sysman: 2.2.t Log Message: s/refernce/reference/ To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/doc/psd/05.sysman/2.2.t Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/doc/psd/05.sysman
Module Name:src Committed By: andvar Date: Thu Dec 9 21:14:50 UTC 2021 Modified Files: src/share/doc/psd/05.sysman: 2.2.t Log Message: s/refernce/reference/ To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/doc/psd/05.sysman/2.2.t Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/doc/psd/05.sysman/2.2.t diff -u src/share/doc/psd/05.sysman/2.2.t:1.5 src/share/doc/psd/05.sysman/2.2.t:1.6 --- src/share/doc/psd/05.sysman/2.2.t:1.5 Sun Oct 6 05:45:19 2013 +++ src/share/doc/psd/05.sysman/2.2.t Thu Dec 9 21:14:50 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: 2.2.t,v 1.5 2013/10/06 05:45:19 dholland Exp $ +.\" $NetBSD: 2.2.t,v 1.6 2021/12/09 21:14:50 andvar Exp $ .\" .\" Copyright (c) 1983, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -311,7 +311,7 @@ properties. A hard link ensures that th file will always be accessible, even after its original directory entry is removed; no such guarantee exists for a symbolic link. Unlike hard links, -symbolic links can refernce directories and span filesystems boundaries. +symbolic links can reference directories and span filesystems boundaries. An .Fn lstat (see section
CVS commit: src/sys/arch/alpha/alpha
Module Name:src Committed By: andvar Date: Thu Dec 9 21:13:18 UTC 2021 Modified Files: src/sys/arch/alpha/alpha: pmap.c Log Message: Few typos slipped in the last review, fixing them. To generate a diff of this commit: cvs rdiff -u -r1.303 -r1.304 src/sys/arch/alpha/alpha/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/alpha
Module Name:src Committed By: andvar Date: Thu Dec 9 21:13:18 UTC 2021 Modified Files: src/sys/arch/alpha/alpha: pmap.c Log Message: Few typos slipped in the last review, fixing them. To generate a diff of this commit: cvs rdiff -u -r1.303 -r1.304 src/sys/arch/alpha/alpha/pmap.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/alpha/alpha/pmap.c diff -u src/sys/arch/alpha/alpha/pmap.c:1.303 src/sys/arch/alpha/alpha/pmap.c:1.304 --- src/sys/arch/alpha/alpha/pmap.c:1.303 Sun Sep 19 20:43:46 2021 +++ src/sys/arch/alpha/alpha/pmap.c Thu Dec 9 21:13:18 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.303 2021/09/19 20:43:46 andvar Exp $ */ +/* $NetBSD: pmap.c,v 1.304 2021/12/09 21:13:18 andvar Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008, 2020 @@ -135,7 +135,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.303 2021/09/19 20:43:46 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.304 2021/12/09 21:13:18 andvar Exp $"); #include #include @@ -2106,7 +2106,7 @@ pmap_enter_l2pt_delref(pmap_t const pmap /* * PALcode may have tried to service a TLB miss with * this L2 PTE, so we need to make sure we don't actually - * free the PT page untl we've shot down any TLB entries + * free the PT page until we've shot down any TLB entries * for this VPT index. */ @@ -3810,7 +3810,7 @@ pmap_l2pt_delref(pmap_t pmap, pt_entry_t "0x%lx\n", pmap_pte_pa(l1pte)); #endif /* - * You can pass NULL if you know the last refrence won't + * You can pass NULL if you know the last reference won't * be dropped. */ KASSERT(tlbctx != NULL); @@ -3870,7 +3870,7 @@ pmap_asn_alloc(pmap_t const pmap, struct KASSERT(pmap->pm_percpu[ci->ci_cpuid].pmc_lev1map != kernel_lev1map); KASSERT(kpreempt_disabled()); - /* No work to do if the the CPU does not implement ASNs. */ + /* No work to do if the CPU does not implement ASNs. */ if (pmap_max_asn == 0) return 0;
Re: CVS commit: src/usr.bin/make
Am 09.12.2021 um 21:01 schrieb matthew green: i'm not asking that you make sun2 or vax stuff work, but some of us choose to use jemalloc 100 on all builds and since this is a supported option, i wanted to make sure you were aware of it. I added back the support for jemalloc 100, the few extra lines didn't hurt as much as I had thought. :) Thank you for suggesting and explaining it. Roland
CVS commit: src/sys/dev/pci
Module Name:src Committed By: andvar Date: Thu Dec 9 20:49:26 UTC 2021 Modified Files: src/sys/dev/pci: if_casreg.h Log Message: s/atached/attached/ and removing double s in state. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/if_casreg.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/dev/pci/if_casreg.h diff -u src/sys/dev/pci/if_casreg.h:1.4 src/sys/dev/pci/if_casreg.h:1.5 --- src/sys/dev/pci/if_casreg.h:1.4 Tue Aug 17 22:00:31 2021 +++ src/sys/dev/pci/if_casreg.h Thu Dec 9 20:49:26 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_casreg.h,v 1.4 2021/08/17 22:00:31 andvar Exp $ */ +/* $NetBSD: if_casreg.h,v 1.5 2021/12/09 20:49:26 andvar Exp $ */ /* $OpenBSD: if_casreg.h,v 1.10 2008/05/31 22:49:03 kettenis Exp $ */ /* @@ -339,7 +339,7 @@ #define CAS_MAC_RX_CRC_ERR_CNT 0x61c4 #define CAS_MAC_RX_CODE_VIOL 0x61c8 #define CAS_MAC_RANDOM_SEED 0x61cc -#define CAS_MAC_MAC_STATE 0x61d0 /* MAC sstate machine reg */ +#define CAS_MAC_MAC_STATE 0x61d0 /* MAC state machine reg */ /* CAS_MAC_SEND_PAUSE_CMD register bits */ #define CAS_MAC_PAUSE_CMD_TIME 0x @@ -448,8 +448,8 @@ #define CAS_MIF_CONFIG_POLL_ENA 0x0002 /* poll enable */ #define CAS_MIF_CONFIG_BB_ENA 0x0004 /* bit bang enable */ #define CAS_MIF_CONFIG_REG_ADR 0x00f8 /* poll register address */ -#define CAS_MIF_CONFIG_MDI0 0x0100 /* MDIO_0 Data/MDIO_0 atached */ -#define CAS_MIF_CONFIG_MDI1 0x0200 /* MDIO_1 Data/MDIO_1 atached */ +#define CAS_MIF_CONFIG_MDI0 0x0100 /* MDIO_0 Data/MDIO_0 attached */ +#define CAS_MIF_CONFIG_MDI1 0x0200 /* MDIO_1 Data/MDIO_1 attached */ #define CAS_MIF_CONFIG_PHY_ADR 0x7c00 /* poll PHY address */ /* MDI0 is onboard transceiver MID1 is external, PHYAD for both is 0 */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: andvar Date: Thu Dec 9 20:49:26 UTC 2021 Modified Files: src/sys/dev/pci: if_casreg.h Log Message: s/atached/attached/ and removing double s in state. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/if_casreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Dec 9 20:47:33 UTC 2021
Modified Files:
src/usr.bin/make: test-variants.sh
src/usr.bin/make/unit-tests: Makefile opt-file.mk
Log Message:
make: add back support for jemalloc 100
The ports sun2 and vax default to jemalloc 100, as opposed to the rest
of the ports, which use jemalloc 510. Some developers choose to use
jemalloc 100, so let them run the tests with memory debugging as well.
Suggested by mrg on source-changes-d.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/test-variants.sh
cvs rdiff -u -r1.286 -r1.287 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/opt-file.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/test-variants.sh
diff -u src/usr.bin/make/test-variants.sh:1.13 src/usr.bin/make/test-variants.sh:1.14
--- src/usr.bin/make/test-variants.sh:1.13 Sun Dec 5 14:57:36 2021
+++ src/usr.bin/make/test-variants.sh Thu Dec 9 20:47:33 2021
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: test-variants.sh,v 1.13 2021/12/05 14:57:36 rillig Exp $
+# $NetBSD: test-variants.sh,v 1.14 2021/12/09 20:47:33 rillig Exp $
#
# Build several variants of make and run the tests on them.
#
@@ -30,9 +30,13 @@ testcase() {
&& env -i PATH="$PATH" USETOOLS="no" "$@" \
sh -ce "make -ks -j6 dependall" \
&& size *.o make \
- && env -i PATH="$PATH" USETOOLS="no" MALLOC_CONF="junk:true" \
- _MKMSG_TEST=":" "$@" \
- sh -ce "make -s test" \
+ && env -i \
+ PATH="$PATH" \
+ USETOOLS="no" \
+ MALLOC_OPTIONS="JA" \
+ MALLOC_CONF="junk:true" \
+ _MKMSG_TEST=":" "$@" \
+ sh -ce "make -s test" \
|| fail
}
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.286 src/usr.bin/make/unit-tests/Makefile:1.287
--- src/usr.bin/make/unit-tests/Makefile:1.286 Sun Dec 5 15:20:13 2021
+++ src/usr.bin/make/unit-tests/Makefile Thu Dec 9 20:47:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.286 2021/12/05 15:20:13 rillig Exp $
+# $NetBSD: Makefile,v 1.287 2021/12/09 20:47:33 rillig Exp $
#
# Unit tests for make(1)
#
@@ -652,7 +652,8 @@ TMPDIR:= /tmp/uid${.MAKE.UID}
x!= echo; mkdir -p ${TMPDIR}
.endif
-MAKE_TEST_ENV?= MALLOC_CONF="junk:true" # for jemalloc
+MAKE_TEST_ENV= MALLOC_OPTIONS="JA" # for jemalloc 100
+MAKE_TEST_ENV+= MALLOC_CONF="junk:true" # for jemalloc 510
MAKE_TEST_ENV+= TMPDIR=${TMPDIR}
.if ${.MAKE.OS} == "NetBSD"
Index: src/usr.bin/make/unit-tests/opt-file.mk
diff -u src/usr.bin/make/unit-tests/opt-file.mk:1.13 src/usr.bin/make/unit-tests/opt-file.mk:1.14
--- src/usr.bin/make/unit-tests/opt-file.mk:1.13 Sun Dec 5 14:57:36 2021
+++ src/usr.bin/make/unit-tests/opt-file.mk Thu Dec 9 20:47:33 2021
@@ -1,6 +1,7 @@
-# $NetBSD: opt-file.mk,v 1.13 2021/12/05 14:57:36 rillig Exp $
+# $NetBSD: opt-file.mk,v 1.14 2021/12/09 20:47:33 rillig Exp $
#
-# Tests for the -f command line option.
+# Tests for the -f command line option, which adds a makefile to the list of
+# files that are parsed.
# TODO: Implementation
@@ -10,7 +11,8 @@ all: file-ending-in-backslash-mmap
all: line-with-trailing-whitespace
all: file-containing-null-byte
-# Passing '-' as the filename reads from stdin. This is unusual but possible.
+# When the filename is '-', the input comes from stdin. This is unusual but
+# possible.
#
# In the unlikely case where a file ends in a backslash instead of a newline,
# that backslash is trimmed. See ParseGetLine.
@@ -19,7 +21,9 @@ all: file-containing-null-byte
# outside of the file buffer.
#
# printf '%s' 'VAR=value\' \
-# | MALLOC_CONF="junk:true" make-2014.01.01.00.00.00 -r -f - -V VAR -dA 2>&1 \
+# | MALLOC_OPTIONS="JA" \
+# MALLOC_CONF="junk:true" \
+# make-2014.01.01.00.00.00 -r -f - -V VAR -dA 2>&1 \
# | less
#
# The debug output shows how make happily uses freshly allocated memory (the
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Dec 9 20:47:33 UTC 2021 Modified Files: src/usr.bin/make: test-variants.sh src/usr.bin/make/unit-tests: Makefile opt-file.mk Log Message: make: add back support for jemalloc 100 The ports sun2 and vax default to jemalloc 100, as opposed to the rest of the ports, which use jemalloc 510. Some developers choose to use jemalloc 100, so let them run the tests with memory debugging as well. Suggested by mrg on source-changes-d. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/test-variants.sh cvs rdiff -u -r1.286 -r1.287 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/opt-file.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Dec 9 20:27:01 UTC 2021
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: var-eval-short.exp varmod-gmtime.exp
varmod-localtime.exp varmod-to-separator.exp
Log Message:
make: in parse errors, mark whitespace more clearly
This prevents any trailing whitespace from going unnoticed. It also
marks leading whitespace more clearly, as in the examples with the time
value " 1".
To generate a diff of this commit:
cvs rdiff -u -r1.969 -r1.970 src/usr.bin/make/var.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/var-eval-short.exp
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/varmod-gmtime.exp
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/varmod-localtime.exp
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/varmod-to-separator.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.969 src/usr.bin/make/var.c:1.970
--- src/usr.bin/make/var.c:1.969 Thu Dec 9 20:13:10 2021
+++ src/usr.bin/make/var.c Thu Dec 9 20:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.969 2021/12/09 20:13:10 rillig Exp $ */
+/* $NetBSD: var.c,v 1.970 2021/12/09 20:27:01 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.969 2021/12/09 20:13:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.970 2021/12/09 20:27:01 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -2587,7 +2587,7 @@ ApplyModifier_Gmtime(const char **pp, Mo
const char *p = mod + 7;
if (!TryParseTime(, )) {
Parse_Error(PARSE_FATAL,
- "Invalid time value: %s", mod + 7);
+ "Invalid time value at \"%s\"", mod + 7);
return AMR_CLEANUP;
}
*pp = p;
@@ -2619,7 +2619,7 @@ ApplyModifier_Localtime(const char **pp,
const char *p = mod + 10;
if (!TryParseTime(, )) {
Parse_Error(PARSE_FATAL,
- "Invalid time value: %s", mod + 10);
+ "Invalid time value at \"%s\"", mod + 10);
return AMR_CLEANUP;
}
*pp = p;
@@ -3092,7 +3092,7 @@ ApplyModifier_ToSep(const char **pp, Mod
if (!TryParseChar(, base, >sep)) {
Parse_Error(PARSE_FATAL,
- "Invalid character number: %s", p);
+ "Invalid character number at \"%s\"", p);
return AMR_CLEANUP;
}
if (!IsDelimiter(*p, ch)) {
Index: src/usr.bin/make/unit-tests/var-eval-short.exp
diff -u src/usr.bin/make/unit-tests/var-eval-short.exp:1.15 src/usr.bin/make/unit-tests/var-eval-short.exp:1.16
--- src/usr.bin/make/unit-tests/var-eval-short.exp:1.15 Thu Dec 9 20:13:10 2021
+++ src/usr.bin/make/unit-tests/var-eval-short.exp Thu Dec 9 20:27:01 2021
@@ -1,8 +1,8 @@
make: "var-eval-short.mk" line 41: In the :@ modifier of "", the variable name "${FAIL}" must not contain a dollar
make: "var-eval-short.mk" line 41: Malformed conditional (0 && ${:Uword:@${FAIL}@expr@})
-make: "var-eval-short.mk" line 81: Invalid time value: ${FAIL}}
+make: "var-eval-short.mk" line 81: Invalid time value at "${FAIL}}"
make: "var-eval-short.mk" line 81: Malformed conditional (0 && ${:Uword:gmtime=${FAIL}})
-make: "var-eval-short.mk" line 95: Invalid time value: ${FAIL}}
+make: "var-eval-short.mk" line 95: Invalid time value at "${FAIL}}"
make: "var-eval-short.mk" line 95: Malformed conditional (0 && ${:Uword:localtime=${FAIL}})
CondParser_Eval: 0 && ${0:?${FAIL}then:${FAIL}else}
Var_Parse: ${0:?${FAIL}then:${FAIL}else} (parse-only)
Index: src/usr.bin/make/unit-tests/varmod-gmtime.exp
diff -u src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.11 src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.12
--- src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.11 Tue Jan 19 05:26:34 2021
+++ src/usr.bin/make/unit-tests/varmod-gmtime.exp Thu Dec 9 20:27:01 2021
@@ -1,12 +1,12 @@
-make: "varmod-gmtime.mk" line 57: Invalid time value: ${:U1593536400}} != "mtime=11593536400}"
+make: "varmod-gmtime.mk" line 57: Invalid time value at "${:U1593536400}} != "mtime=11593536400}""
make: "varmod-gmtime.mk" line 57: Malformed conditional (${%Y:L:gmtime=${:U1593536400}} != "mtime=11593536400}")
-make: "varmod-gmtime.mk" line 67: Invalid time value: -1} != ""
+make: "varmod-gmtime.mk" line 67: Invalid time value at "-1} != """
make: "varmod-gmtime.mk" line 67: Malformed conditional (${:L:gmtime=-1} != "")
-make: "varmod-gmtime.mk" line 76: Invalid time value: 1} != ""
+make: "varmod-gmtime.mk" line 76: Invalid time value at " 1} != """
make: "varmod-gmtime.mk" line 76: Malformed conditional (${:L:gmtime= 1} != "")
-make: "varmod-gmtime.mk" line 119: Invalid time value: 1000} != ""
+make: "varmod-gmtime.mk" line 119: Invalid time value at "1000} != """
make: "varmod-gmtime.mk" line 119: Malformed
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Dec 9 20:27:01 UTC 2021 Modified Files: src/usr.bin/make: var.c src/usr.bin/make/unit-tests: var-eval-short.exp varmod-gmtime.exp varmod-localtime.exp varmod-to-separator.exp Log Message: make: in parse errors, mark whitespace more clearly This prevents any trailing whitespace from going unnoticed. It also marks leading whitespace more clearly, as in the examples with the time value " 1". To generate a diff of this commit: cvs rdiff -u -r1.969 -r1.970 src/usr.bin/make/var.c cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/var-eval-short.exp cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/varmod-gmtime.exp cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/varmod-localtime.exp cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/varmod-to-separator.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Dec 9 20:13:10 UTC 2021 Modified Files: src/usr.bin/make: cond.c parse.c suff.c var.c src/usr.bin/make/unit-tests: directive-else.exp directive-endif.exp directive-for-null.exp lint.exp var-eval-short.exp varmod-loop-delete.exp varmod-loop-varname.exp Log Message: make: remove period from end of error messages and warnings The majority of the existing error messages and warnings does not include a period at the end. Follow this style consistently. To generate a diff of this commit: cvs rdiff -u -r1.281 -r1.282 src/usr.bin/make/cond.c cvs rdiff -u -r1.571 -r1.572 src/usr.bin/make/parse.c cvs rdiff -u -r1.355 -r1.356 src/usr.bin/make/suff.c cvs rdiff -u -r1.968 -r1.969 src/usr.bin/make/var.c cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/directive-else.exp \ src/usr.bin/make/unit-tests/varmod-loop-varname.exp cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/directive-endif.exp cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/directive-for-null.exp \ src/usr.bin/make/unit-tests/varmod-loop-delete.exp cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/lint.exp cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/var-eval-short.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Dec 9 20:13:10 UTC 2021
Modified Files:
src/usr.bin/make: cond.c parse.c suff.c var.c
src/usr.bin/make/unit-tests: directive-else.exp directive-endif.exp
directive-for-null.exp lint.exp var-eval-short.exp
varmod-loop-delete.exp varmod-loop-varname.exp
Log Message:
make: remove period from end of error messages and warnings
The majority of the existing error messages and warnings does not
include a period at the end. Follow this style consistently.
To generate a diff of this commit:
cvs rdiff -u -r1.281 -r1.282 src/usr.bin/make/cond.c
cvs rdiff -u -r1.571 -r1.572 src/usr.bin/make/parse.c
cvs rdiff -u -r1.355 -r1.356 src/usr.bin/make/suff.c
cvs rdiff -u -r1.968 -r1.969 src/usr.bin/make/var.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/directive-else.exp \
src/usr.bin/make/unit-tests/varmod-loop-varname.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/directive-endif.exp
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/directive-for-null.exp \
src/usr.bin/make/unit-tests/varmod-loop-delete.exp
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/lint.exp
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/var-eval-short.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.281 src/usr.bin/make/cond.c:1.282
--- src/usr.bin/make/cond.c:1.281 Sun Dec 5 10:11:31 2021
+++ src/usr.bin/make/cond.c Thu Dec 9 20:13:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.281 2021/12/05 10:11:31 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.282 2021/12/09 20:13:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.281 2021/12/05 10:11:31 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.282 2021/12/09 20:13:09 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -1211,7 +1211,7 @@ Cond_EvalLine(const char *line)
if (IsEndif(p)) { /* It is an '.endif'. */
if (p[5] != '\0') {
Parse_Error(PARSE_FATAL,
- "The .endif directive does not take arguments.");
+ "The .endif directive does not take arguments");
}
if (cond_depth == cond_min_depth) {
@@ -1242,8 +1242,8 @@ Cond_EvalLine(const char *line)
if (p[2] != '\0')
Parse_Error(PARSE_FATAL,
- "The .else directive "
- "does not take arguments.");
+"The .else directive "
+"does not take arguments");
if (cond_depth == cond_min_depth) {
Parse_Error(PARSE_FATAL, "if-less else");
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.571 src/usr.bin/make/parse.c:1.572
--- src/usr.bin/make/parse.c:1.571 Tue Dec 7 23:56:06 2021
+++ src/usr.bin/make/parse.c Thu Dec 9 20:13:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.571 2021/12/07 23:56:06 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.572 2021/12/09 20:13:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.571 2021/12/07 23:56:06 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.572 2021/12/09 20:13:09 rillig Exp $");
/* types and constants */
@@ -2895,7 +2895,7 @@ ParseForLoop(const char *line)
line = ParseGetLine(GLM_FOR_BODY);
if (line == NULL) {
Parse_Error(PARSE_FATAL,
- "Unexpected end of file in for loop.");
+ "Unexpected end of file in .for loop");
break;
}
} while (For_Accum(line));
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.355 src/usr.bin/make/suff.c:1.356
--- src/usr.bin/make/suff.c:1.355 Sun Nov 28 22:48:06 2021
+++ src/usr.bin/make/suff.c Thu Dec 9 20:13:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.355 2021/11/28 22:48:06 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.356 2021/12/09 20:13:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -115,7 +115,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.355 2021/11/28 22:48:06 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.356 2021/12/09 20:13:09 rillig Exp $");
typedef List SuffixList;
typedef ListNode SuffixListNode;
@@ -2072,7 +2072,7 @@ Suff_SetNull(const char *name)
Suffix *suff = FindSuffixByName(name);
if (suff == NULL) {
Parse_Error(PARSE_WARNING,
- "Desired null suffix %s not defined.",
+ "Desired null suffix %s not defined",
name);
return;
}
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.968 src/usr.bin/make/var.c:1.969
--- src/usr.bin/make/var.c:1.968 Tue Dec 7 21:47:21 2021
+++ src/usr.bin/make/var.c Thu Dec 9 20:13:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.968 2021/12/07 21:47:21
re: CVS commit: src/usr.bin/make
Roland Illig writes: > 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. i'm not asking that you make sun2 or vax stuff work, but some of us choose to use jemalloc 100 on all builds and since this is a supported option, i wanted to make sure you were aware of it. thanks. .mrg.
CVS commit: xsrc/external/mit/xf86-video-suncg14/dist/src
Module Name:xsrc Committed By: christos Date: Thu Dec 9 17:29:14 UTC 2021 Modified Files: xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_accel.c Log Message: Pixel == unsigned long, fix format. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 \ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.20 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.21 --- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.20 Fri Dec 3 14:53:23 2021 +++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c Thu Dec 9 12:29:14 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cg14_accel.c,v 1.20 2021/12/03 19:53:23 macallan Exp $ */ +/* $NetBSD: cg14_accel.c,v 1.21 2021/12/09 17:29:14 christos Exp $ */ /* * Copyright (c) 2013 Michael Lorenz * All rights reserved. @@ -596,7 +596,7 @@ CG14PrepareSolid(PixmapPtr pPixmap, int Cg14Ptr p = GET_CG14_FROM_SCRN(pScrn); ENTER; - DPRINTF(X_ERROR, "bits per pixel: %d %08x\n", + DPRINTF(X_ERROR, "bits per pixel: %d %08lx\n", pPixmap->drawable.bitsPerPixel, fg); /*
CVS commit: xsrc/external/mit/xf86-video-suncg14/dist/src
Module Name:xsrc Committed By: christos Date: Thu Dec 9 17:29:14 UTC 2021 Modified Files: xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_accel.c Log Message: Pixel == unsigned long, fix format. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 \ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Thu Dec 9 14:33:19 UTC 2021 Modified Files: src/sys/arch/x86/include: cacheinfo.h Log Message: Print TLB message consistently to improve readability. Example: cpu0: L2 cache: 256KB 64B/line 4-way cpu0: L3 cache: 4MB 64B/line 16-way cpu0: 64B prefetching -cpu0: ITLB: 64 4KB entries 8-way, 2M/4M: 8 entries +cpu0: ITLB: 64 4KB entries 8-way, 8 2M/4M entries cpu0: DTLB: 64 4KB entries 4-way, 4 1GB entries 4-way cpu0: L2 STLB: 1536 4KB entries 6-way cpu0: Initial APIC ID 0 To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/x86/include/cacheinfo.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/x86/include/cacheinfo.h diff -u src/sys/arch/x86/include/cacheinfo.h:1.30 src/sys/arch/x86/include/cacheinfo.h:1.31 --- src/sys/arch/x86/include/cacheinfo.h:1.30 Thu Oct 7 13:04:18 2021 +++ src/sys/arch/x86/include/cacheinfo.h Thu Dec 9 14:33:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cacheinfo.h,v 1.30 2021/10/07 13:04:18 msaitoh Exp $ */ +/* $NetBSD: cacheinfo.h,v 1.31 2021/12/09 14:33:19 msaitoh Exp $ */ #ifndef _X86_CACHEINFO_H_ #define _X86_CACHEINFO_H_ @@ -224,39 +224,39 @@ __CI_TBL(CAI_DTLB2,0x04,4, 8, 4 __CI_TBL(CAI_DTLB2,0x05,4, 32, 4 * 1024 * 1024, NULL), \ __CI_TBL(CAI_ITLB2,0x0b,4, 4, 4 * 1024 * 1024, NULL), \ __CI_TBL(CAI_ITLB, 0x4f, 0xff, 32,4 * 1024, NULL), \ -__CI_TBL(CAI_ITLB, 0x50, 0xff, 64,4 * 1024, "4K/4M: 64 entries"), \ -__CI_TBL(CAI_ITLB, 0x51, 0xff, 64,4 * 1024, "4K/4M: 128 entries"),\ -__CI_TBL(CAI_ITLB, 0x52, 0xff, 64,4 * 1024, "4K/4M: 256 entries"),\ -__CI_TBL(CAI_ITLB2,0x55, 0xff, 64,4 * 1024, "2M/4M: 7 entries"), \ +__CI_TBL(CAI_ITLB, 0x50, 0xff, 64,4 * 1024, "64 4K/4M entries"), \ +__CI_TBL(CAI_ITLB, 0x51, 0xff, 64,4 * 1024, "128 4K/4M entries"),\ +__CI_TBL(CAI_ITLB, 0x52, 0xff, 64,4 * 1024, "256 4K/4M entries"),\ +__CI_TBL(CAI_ITLB2,0x55, 0xff, 64,4 * 1024, "7 2M/4M entries"), \ __CI_TBL(CAI_DTLB2,0x56,4, 16, 4 * 1024 * 1024, NULL), \ __CI_TBL(CAI_DTLB, 0x57,4, 16,4 * 1024, NULL), \ __CI_TBL(CAI_DTLB, 0x59, 0xff, 16,4 * 1024, NULL), \ -__CI_TBL(CAI_DTLB2,0x5a, 0xff, 64,4 * 1024, "2M/4M: 32 entries (L0)"), \ -__CI_TBL(CAI_DTLB, 0x5b, 0xff, 64,4 * 1024, "4K/4M: 64 entries"), \ -__CI_TBL(CAI_DTLB, 0x5c, 0xff, 64,4 * 1024, "4K/4M: 128 entries"),\ -__CI_TBL(CAI_DTLB, 0x5d, 0xff, 64,4 * 1024, "4K/4M: 256 entries"),\ +__CI_TBL(CAI_DTLB2,0x5a, 0xff, 64,4 * 1024, "32 2M/4M entries (L0)"), \ +__CI_TBL(CAI_DTLB, 0x5b, 0xff, 64,4 * 1024, "64 4K/4M entries"), \ +__CI_TBL(CAI_DTLB, 0x5c, 0xff, 64,4 * 1024, "128 4K/4M entries"),\ +__CI_TBL(CAI_DTLB, 0x5d, 0xff, 64,4 * 1024, "256 4K/4M entries"),\ __CI_TBL(CAI_ITLB, 0x61, 0xff, 48,4 * 1024, NULL), \ __CI_TBL(CAI_L1_1GBDTLB,0x63, 4, 4,1024*1024 * 1024, NULL), \ __CI_TBL(CAI_DTLB, 0x64,4,512,4 * 1024, NULL), \ __CI_TBL(CAI_ITLB, 0x6a,8, 64,4 * 1024, NULL), \ __CI_TBL(CAI_DTLB, 0x6b,8,256,4 * 1024, NULL), \ -__CI_TBL(CAI_L2_DTLB2, 0x6c,8,128, 0, "2M/4M: 128 entries"),\ +__CI_TBL(CAI_L2_DTLB2, 0x6c,8,128, 0, "128 2M/4M entries"),\ __CI_TBL(CAI_L1_1GBDTLB,0x6d,0xff, 16,1024*1024 * 1024, NULL), \ -__CI_TBL(CAI_ITLB2,0x76, 0xff, 8, 4 * 1024 * 1024, "2M/4M: 8 entries"), \ +__CI_TBL(CAI_ITLB2,0x76, 0xff, 8, 4 * 1024 * 1024, "8 2M/4M entries"), \ __CI_TBL(CAI_DTLB, 0xa0, 0xff, 32,4 * 1024, NULL), \ __CI_TBL(CAI_ITLB, 0xb0,4,128,4 * 1024, NULL), \ -__CI_TBL(CAI_ITLB2,0xb1,4, 64, 0, "8 2M/4 4M entries"), \ +__CI_TBL(CAI_ITLB2,0xb1,4, 64, 0, "8 2M & 4 4M entries"), \ __CI_TBL(CAI_ITLB, 0xb2,4, 64,4 * 1024, NULL), \ __CI_TBL(CAI_DTLB, 0xb3,4,128,4 * 1024, NULL), \ __CI_TBL(CAI_DTLB, 0xb4,4,256,4 * 1024, NULL), \ __CI_TBL(CAI_ITLB, 0xb5,8, 64,4 * 1024, NULL), \ __CI_TBL(CAI_ITLB, 0xb6,8,128,4 * 1024, NULL), \ __CI_TBL(CAI_DTLB, 0xba,4, 64,4 * 1024, NULL), \ -__CI_TBL(CAI_DTLB2,0xc0,4, 8,4 * 1024, "4K/4M: 8 entries"), \ -__CI_TBL(CAI_L2_STLB2, 0xc1,8,1024, 4 * 1024, "4K/2M: 1024 entries"), \ -__CI_TBL(CAI_DTLB2,0xc2,4, 16,4 * 1024, "4K/2M: 16 entries"), \ +__CI_TBL(CAI_DTLB2,0xc0,4, 8,4 * 1024, "8 4K/4M entries"), \ +__CI_TBL(CAI_L2_STLB2, 0xc1,8,1024, 4 * 1024, "1024 4K/2M entries"), \ +__CI_TBL(CAI_DTLB2,0xc2,4, 16,4 * 1024, "16 4K/2M entries"), \ __CI_TBL(CAI_L2_STLB, 0xc3,6,1536, 4 * 1024, NULL), \
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Thu Dec 9 14:33:19 UTC 2021 Modified Files: src/sys/arch/x86/include: cacheinfo.h Log Message: Print TLB message consistently to improve readability. Example: cpu0: L2 cache: 256KB 64B/line 4-way cpu0: L3 cache: 4MB 64B/line 16-way cpu0: 64B prefetching -cpu0: ITLB: 64 4KB entries 8-way, 2M/4M: 8 entries +cpu0: ITLB: 64 4KB entries 8-way, 8 2M/4M entries cpu0: DTLB: 64 4KB entries 4-way, 4 1GB entries 4-way cpu0: L2 STLB: 1536 4KB entries 6-way cpu0: Initial APIC ID 0 To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/x86/include/cacheinfo.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: msaitoh
Date: Thu Dec 9 14:23:06 UTC 2021
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Print 1GB TLB entry at the same leve's line.
Example:
before:
cpu0: ITLB: 128 4KB entries 8-way, 2M/4M: 8 entries
cpu0: DTLB: 64 4KB entries 4-way
cpu0: L2 STLB: 4K/2M: 1024 entries
cpu0: L1 1GB page DTLB: 4 1GB entries 4-way
after:
cpu0: ITLB: 128 4KB entries 8-way, 2M/4M: 8 entries
cpu0: DTLB: 64 4KB entries 4-way, 4 1GB entries 4-way
cpu0: L2 STLB: 4K/2M: 1024 entries
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 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/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.123 src/usr.sbin/cpuctl/arch/i386.c:1.124
--- src/usr.sbin/cpuctl/arch/i386.c:1.123 Wed Oct 27 04:15:42 2021
+++ src/usr.sbin/cpuctl/arch/i386.c Thu Dec 9 14:23:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.123 2021/10/27 04:15:42 mrg Exp $ */
+/* $NetBSD: i386.c,v 1.124 2021/12/09 14:23:06 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.123 2021/10/27 04:15:42 mrg Exp $");
+__RCSID("$NetBSD: i386.c,v 1.124 2021/12/09 14:23:06 msaitoh Exp $");
#endif /* not lint */
#include
@@ -2420,11 +2420,13 @@ x86_print_cache_and_tlb_info(struct cpu_
sep = print_tlb_config(ci, CAI_ITLB, "ITLB:", NULL);
sep = print_tlb_config(ci, CAI_ITLB2, "ITLB:", sep);
+ sep = print_tlb_config(ci, CAI_L1_1GBITLB, "ITLB:", sep);
if (sep != NULL)
aprint_verbose("\n");
sep = print_tlb_config(ci, CAI_DTLB, "DTLB:", NULL);
sep = print_tlb_config(ci, CAI_DTLB2, "DTLB:", sep);
+ sep = print_tlb_config(ci, CAI_L1_1GBDTLB, "DTLB:", sep);
if (sep != NULL)
aprint_verbose("\n");
@@ -2438,11 +2440,13 @@ x86_print_cache_and_tlb_info(struct cpu_
sep = print_tlb_config(ci, CAI_L2_ITLB, "L2 ITLB:", NULL);
sep = print_tlb_config(ci, CAI_L2_ITLB2, "L2 ITLB:", sep);
+ sep = print_tlb_config(ci, CAI_L2_1GBITLB, "L2 ITLB:", sep);
if (sep != NULL)
aprint_verbose("\n");
sep = print_tlb_config(ci, CAI_L2_DTLB, "L2 DTLB:", NULL);
sep = print_tlb_config(ci, CAI_L2_DTLB2, "L2 DTLB:", sep);
+ sep = print_tlb_config(ci, CAI_L2_1GBDTLB, "L2 DTLB:", sep);
if (sep != NULL)
aprint_verbose("\n");
@@ -2451,22 +2455,6 @@ x86_print_cache_and_tlb_info(struct cpu_
sep = print_tlb_config(ci, CAI_L2_STLB3, "L2 STLB:", sep);
if (sep != NULL)
aprint_verbose("\n");
-
- sep = print_tlb_config(ci, CAI_L1_1GBITLB, "L1 1GB page ITLB:", NULL);
- if (sep != NULL)
- aprint_verbose("\n");
-
- sep = print_tlb_config(ci, CAI_L1_1GBDTLB, "L1 1GB page DTLB:", NULL);
- if (sep != NULL)
- aprint_verbose("\n");
-
- sep = print_tlb_config(ci, CAI_L2_1GBITLB, "L2 1GB page ITLB:", NULL);
- if (sep != NULL)
- aprint_verbose("\n");
-
- sep = print_tlb_config(ci, CAI_L2_1GBDTLB, "L2 1GB page DTLB:", NULL);
- if (sep != NULL)
- aprint_verbose("\n");
}
static void
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: msaitoh Date: Thu Dec 9 14:23:06 UTC 2021 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: Print 1GB TLB entry at the same leve's line. Example: before: cpu0: ITLB: 128 4KB entries 8-way, 2M/4M: 8 entries cpu0: DTLB: 64 4KB entries 4-way cpu0: L2 STLB: 4K/2M: 1024 entries cpu0: L1 1GB page DTLB: 4 1GB entries 4-way after: cpu0: ITLB: 128 4KB entries 8-way, 2M/4M: 8 entries cpu0: DTLB: 64 4KB entries 4-way, 4 1GB entries 4-way cpu0: L2 STLB: 4K/2M: 1024 entries To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 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.
