CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Sun Jun 19 04:47:12 UTC 2022 Modified Files: src/sys/arch/macppc/conf: POWERMAC_G5 Log Message: we also need WSDISPLAY_COMPAT_PCVT and _SYSCONS To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/macppc/conf/POWERMAC_G5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Sun Jun 19 04:47:12 UTC 2022 Modified Files: src/sys/arch/macppc/conf: POWERMAC_G5 Log Message: we also need WSDISPLAY_COMPAT_PCVT and _SYSCONS To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/macppc/conf/POWERMAC_G5 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/macppc/conf/POWERMAC_G5 diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.53 src/sys/arch/macppc/conf/POWERMAC_G5:1.54 --- src/sys/arch/macppc/conf/POWERMAC_G5:1.53 Wed Jun 15 18:19:42 2022 +++ src/sys/arch/macppc/conf/POWERMAC_G5 Sun Jun 19 04:47:12 2022 @@ -102,6 +102,8 @@ options INET6 # IPV6 # wscons options #options WSEMUL_SUN # sun terminal emulation options WSEMUL_VT100 # VT100 / VT220 emulation +options WSDISPLAY_COMPAT_PCVT # emulate some ioctls +options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls options WSDISPLAY_COMPAT_USL # wsconscfg VT handling #options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes options WS_DEFAULT_FG=WSCOL_BLACK
CVS commit: src/sys
Module Name:src
Committed By: andvar
Date: Sat Jun 18 22:11:01 UTC 2022
Modified Files:
src/sys/arch/evbarm/gumstix: gxiic.c
src/sys/arch/hpcarm/dev: nbpiic.c
src/sys/arch/i386/eisa: eisa_machdep.c
src/sys/arch/mips/alchemy/dev: ausmbus_psc.c
src/sys/arch/prep/eisa: eisa_machdep.c
src/sys/arch/x86/include: pmap.h
src/sys/dev/pci: virtio.c
src/sys/kern: init_main.c
Log Message:
fix typos in word "functions" in comments, mainly s/fuctions/functions/.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/gumstix/gxiic.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcarm/dev/nbpiic.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/i386/eisa/eisa_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mips/alchemy/dev/ausmbus_psc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/prep/eisa/eisa_machdep.c
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/virtio.c
cvs rdiff -u -r1.538 -r1.539 src/sys/kern/init_main.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/evbarm/gumstix/gxiic.c
diff -u src/sys/arch/evbarm/gumstix/gxiic.c:1.11 src/sys/arch/evbarm/gumstix/gxiic.c:1.12
--- src/sys/arch/evbarm/gumstix/gxiic.c:1.11 Sat Aug 7 16:18:49 2021
+++ src/sys/arch/evbarm/gumstix/gxiic.c Sat Jun 18 22:11:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gxiic.c,v 1.11 2021/08/07 16:18:49 thorpej Exp $ */
+/* $NetBSD: gxiic.c,v 1.12 2022/06/18 22:11:00 andvar Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gxiic.c,v 1.11 2021/08/07 16:18:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxiic.c,v 1.12 2022/06/18 22:11:00 andvar Exp $");
#include
#include
@@ -50,7 +50,7 @@ struct gxiic_softc {
static int gxiicmatch(device_t, cfdata_t, void *);
static void gxiicattach(device_t, device_t, void *);
-/* fuctions for i2c_controller */
+/* functions for i2c_controller */
static int gxiic_acquire_bus(void *, int);
static void gxiic_release_bus(void *, int);
static int gxiic_exec(void *cookie, i2c_op_t, i2c_addr_t, const void *, size_t,
Index: src/sys/arch/hpcarm/dev/nbpiic.c
diff -u src/sys/arch/hpcarm/dev/nbpiic.c:1.5 src/sys/arch/hpcarm/dev/nbpiic.c:1.6
--- src/sys/arch/hpcarm/dev/nbpiic.c:1.5 Sat Aug 7 16:18:53 2021
+++ src/sys/arch/hpcarm/dev/nbpiic.c Sat Jun 18 22:11:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nbpiic.c,v 1.5 2021/08/07 16:18:53 thorpej Exp $ */
+/* $NetBSD: nbpiic.c,v 1.6 2022/06/18 22:11:00 andvar Exp $ */
/*
* Copyright (c) 2011 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nbpiic.c,v 1.5 2021/08/07 16:18:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nbpiic.c,v 1.6 2022/06/18 22:11:00 andvar Exp $");
#include
#include
@@ -63,7 +63,7 @@ static void pxaiic_attach(device_t, devi
static int nbpiic_intr(void *);
int nbpiic_poll(void *, int, char *);
-/* fuctions for i2c_controller */
+/* functions for i2c_controller */
static int nbpiic_exec(void *cookie, i2c_op_t, i2c_addr_t, const void *, size_t,
void *, size_t, int);
Index: src/sys/arch/i386/eisa/eisa_machdep.c
diff -u src/sys/arch/i386/eisa/eisa_machdep.c:1.40 src/sys/arch/i386/eisa/eisa_machdep.c:1.41
--- src/sys/arch/i386/eisa/eisa_machdep.c:1.40 Mon Apr 27 08:30:10 2015
+++ src/sys/arch/i386/eisa/eisa_machdep.c Sat Jun 18 22:11:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa_machdep.c,v 1.40 2015/04/27 08:30:10 knakahara Exp $ */
+/* $NetBSD: eisa_machdep.c,v 1.41 2022/06/18 22:11:00 andvar Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.40 2015/04/27 08:30:10 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.41 2022/06/18 22:11:00 andvar Exp $");
#include "ioapic.h"
@@ -90,7 +90,7 @@ __KERNEL_RCSID(0, "$NetBSD: eisa_machdep
/*
* EISA doesn't have any special needs; just use the generic versions
- * of these funcions.
+ * of these functions.
*
* XXX really doesn't use bounce buffers? --dyoung
*/
Index: src/sys/arch/mips/alchemy/dev/ausmbus_psc.c
diff -u src/sys/arch/mips/alchemy/dev/ausmbus_psc.c:1.15 src/sys/arch/mips/alchemy/dev/ausmbus_psc.c:1.16
--- src/sys/arch/mips/alchemy/dev/ausmbus_psc.c:1.15 Sat Aug 7 16:18:58 2021
+++ src/sys/arch/mips/alchemy/dev/ausmbus_psc.c Sat Jun 18 22:11:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ausmbus_psc.c,v 1.15 2021/08/07 16:18:58 thorpej Exp $ */
+/* $NetBSD: ausmbus_psc.c,v 1.16 2022/06/18 22:11:00 andvar Exp $ */
/*-
* Copyright (c) 2006 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ausmbus_psc.c,v 1.15 2021/08/07 16:18:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aus
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Sat Jun 18 22:11:01 UTC 2022 Modified Files: src/sys/arch/evbarm/gumstix: gxiic.c src/sys/arch/hpcarm/dev: nbpiic.c src/sys/arch/i386/eisa: eisa_machdep.c src/sys/arch/mips/alchemy/dev: ausmbus_psc.c src/sys/arch/prep/eisa: eisa_machdep.c src/sys/arch/x86/include: pmap.h src/sys/dev/pci: virtio.c src/sys/kern: init_main.c Log Message: fix typos in word "functions" in comments, mainly s/fuctions/functions/. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/gumstix/gxiic.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcarm/dev/nbpiic.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/i386/eisa/eisa_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mips/alchemy/dev/ausmbus_psc.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/prep/eisa/eisa_machdep.c cvs rdiff -u -r1.127 -r1.128 src/sys/arch/x86/include/pmap.h cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/virtio.c cvs rdiff -u -r1.538 -r1.539 src/sys/kern/init_main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sbin/raidctl
Date:Sat, 18 Jun 2022 14:45:12 - (UTC) From:chris...@astron.com (Christos Zoulas) Message-ID: | Nevertheless why don't we make the char one unsigned char? I wondered about that possibility, but it was a bigger change than I wanted to make at the time - I didn't want to have to even consider the potential flow on cleanup changes that come from switching from signed to unsigned. It would be cleaner however - a quick skim of the source suggested to me that anything <= 0 is treated as 1 in any case, so (if that is correct) there's certainly no point in allowing negative values. kre ps: my raid5 is working fine with its -56 queue length! Component label for /dev/dk21: Row: 0, Column: 0, Num Rows: 1, Num Columns: 3 Version: 2, Serial Number: 19591006, Mod Counter: 1772 Clean: No, Status: 0 sectPerSU: 32, SUsPerPU: 1, SUsPerRU: 1 Queue size: -56, blocksize: 512, numBlocks: 27344762880 RAID Level: 5
Re: CVS commit: src/sbin/raidctl
In article <20220614080613.b4570f...@cvs.netbsd.org>,
Robert Elz wrote:
>-=-=-=-=-=-
>
>Module Name: src
>Committed By: kre
>Date: Tue Jun 14 08:06:13 UTC 2022
>
>Modified Files:
> src/sbin/raidctl: rf_configure.c
>
>Log Message:
>Fix some config file parsing.
>
>First, and what got me started on this set of cleanups, the queue
>length in the "queue" section (START queue) is limited to what will
>fit in a char without losing accuracy (I tried setting it to 200,
>rather than the more common (universal?) 100 and found that the
>value configured into the array was -56 instead.
>
>Why the value needs to be passed through a char variable I have no
>idea (it is an int in the filesystem raidframe headers) - but that's
>the way it is done, and changing it would be an ABI change I believe
>(and so need versioning to alter) and that isn't worth it for this
>(or not now, IMO).
>
>Instead check that the value in the char is the same value as was
>read from the config file, and complain if not. Those of you with
>unsigned chars will be able to have queue lengths up to 255, the
>rest of us are limited to 127.
>
>While looking at that, I noticed some code that obviously fails to
>understand that scanf("%s") will never return a string containing
>spaces, and proceeded to attempt to remove trailing spaces from the
>result ... amusingly, after having used the result for its intended
>purpose (non existent trailing spaces unremoved), after which that
>buffer was never used again. That code is now gone (but for now,
>just #if 0'd rather than actually deleted - it should be cleaned up
>sometime).
>
>Then I saw some other issues with how the config was parsed - a
>simple (unbounded) scanf("%s") into a buffer, which hypothetically
>might not be large enough (not a security issue really, raidctl has
>no special privs, and it isn't likely that root could easily be
>tricked into running it on a bogus config file - or not without
>looking first anyway, and a huge long string would rather stand
>out). Bound the string length to something reasonable, and
>assert() that the buffer is big enough to contain it.
>
>Lastly, in the event of one particular detected error in the
>config file, the code would write a warning, but then just go
>ahead and use the bad data (or nothing perhaps) anyway - a
>failure of logic flow (unlikely to have ever happened, everyone
>seems to simply copy the sample config from the man page, and
>make minor adjustments as needed).
>
>If any of these changes make any difference to anyone (except
>me with my attempt to make longer queues - for no particularly
>well thought out reason), I'd be very surprised.
There is really no type consistency
raidframevar.h: charmaxOutstandingDiskReqs; /* # concurrent reqs to be sent
to a
raidframevar.h: int maxOutstanding; /* maxOutstanding disk requests */
rf_diskqueue.h: longmaxOutstanding; /* max # of I/Os that can be
outstanding on a
rf_raid.h: int maxOutstanding;
Nevertheless why don't we make the char one unsigned char? It will not
be an ABI change and it will make it 255 for everyone.
christos
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sat Jun 18 13:56:42 UTC 2022 Modified Files: src/usr.sbin/sysinst: disklabel.c Log Message: An unused partition may not be the install target To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/sysinst/disklabel.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/sysinst/disklabel.c diff -u src/usr.sbin/sysinst/disklabel.c:1.44 src/usr.sbin/sysinst/disklabel.c:1.45 --- src/usr.sbin/sysinst/disklabel.c:1.44 Sun Aug 8 21:50:10 2021 +++ src/usr.sbin/sysinst/disklabel.c Sat Jun 18 13:56:41 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.c,v 1.44 2021/08/08 21:50:10 andvar Exp $ */ +/* $NetBSD: disklabel.c,v 1.45 2022/06/18 13:56:41 martin Exp $ */ /* * Copyright 2018 The NetBSD Foundation, Inc. @@ -780,7 +780,8 @@ disklabel_get_part_info(const struct dis parts->l.d_partitions[part].p_fstype == FS_UNUSED) info->flags |= PTI_PSCHEME_INTERNAL|PTI_RAW_PART; - if (info->start == parts->install_target) + if (info->start == parts->install_target && + parts->l.d_partitions[part].p_fstype != FS_UNUSED) info->flags |= PTI_INSTALL_TARGET; #if RAW_PART == 3 if (part == (RAW_PART-1) && parts->dp.parent != NULL &&
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sat Jun 18 13:56:42 UTC 2022 Modified Files: src/usr.sbin/sysinst: disklabel.c Log Message: An unused partition may not be the install target To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/sysinst/disklabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sat Jun 18 13:52:42 UTC 2022 Modified Files: src/usr.sbin/sysinst: label.c Log Message: Typo in comment To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/sysinst/label.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sat Jun 18 13:52:42 UTC 2022
Modified Files:
src/usr.sbin/sysinst: label.c
Log Message:
Typo in comment
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/sysinst/label.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/sysinst/label.c
diff -u src/usr.sbin/sysinst/label.c:1.36 src/usr.sbin/sysinst/label.c:1.37
--- src/usr.sbin/sysinst/label.c:1.36 Sat Jun 11 18:27:22 2022
+++ src/usr.sbin/sysinst/label.c Sat Jun 18 13:52:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.36 2022/06/11 18:27:22 martin Exp $ */
+/* $NetBSD: label.c,v 1.37 2022/06/18 13:52:42 martin Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.36 2022/06/11 18:27:22 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.37 2022/06/18 13:52:42 martin Exp $");
#endif
#include
@@ -532,7 +532,7 @@ static const uint edit_fs_common_types[]
/*
* Functions for uncommon file system types - we offer the full list,
- * but put FFSv2 and FFSv1 at the front and duplicat FS_MSDOS as
+ * but put FFSv2 and FFSv1 at the front and duplicate FS_MSDOS as
* EFI system partition.
*/
static void
CVS commit: src/usr.bin/man
Module Name:src
Committed By: uwe
Date: Sat Jun 18 13:41:12 UTC 2022
Modified Files:
src/usr.bin/man: man.conf.5
Log Message:
man.conf(5): Tweak formatting for prettier PS output.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/man/man.conf.5
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/man/man.conf.5
diff -u src/usr.bin/man/man.conf.5:1.28 src/usr.bin/man/man.conf.5:1.29
--- src/usr.bin/man/man.conf.5:1.28 Sat Jun 18 02:19:07 2022
+++ src/usr.bin/man/man.conf.5 Sat Jun 18 13:41:12 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: man.conf.5,v 1.28 2022/06/18 02:19:07 gutteridge Exp $
+.\" $NetBSD: man.conf.5,v 1.29 2022/06/18 13:41:12 uwe Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -64,14 +64,14 @@ section subdirectory contains unformatte
and
.Xr mdoc 7 ) .
Formatted manual pages are normally named with a trailing
-.Dq \.0
+.Ql \&.0
suffix.
.Pp
The
.Nm
file contains comment and configuration lines.
Comment lines start with the
-.Dq #
+.Ql #
character.
Blank lines are also treated as comment lines.
Configuration lines consist of a configuration keyword followed by a
@@ -79,31 +79,37 @@ configuration string.
There are two types of configuration keywords: control keywords and
section keywords.
Control keywords must start with the
-.Dq _
+.Ql _
character.
The following control keywords are currently defined:
-.Bl -tag -width XXmachineX
-.It _build
+.Bl -tag -width Ic
+.It Ic _build
Identifies the set of suffixes used for manual pages that must be
formatted for display and the command that should be used to format
them.
Manual file names, regardless of their format, are expected to end in a
-.Dq \.*
+.Dq \&.*
pattern, i.e. a
-.Dq \&\.
+.Ql \&.
followed by some suffix.
-The first field of a _build line contains a man page suffix specification.
+The first field of a
+.Ic _build
+line contains a man page suffix specification.
The suffix specification may contain the normal shell globbing characters
-(NOT including curly braces
-.Pq Dq {} ) .
-The rest of the _build line is a shell command line whose standard
+.Po
+.Em not
+including csh-style curly braces
+.Pc .
+The rest of the
+.Ic _build
+line is a shell command line whose standard
output is a formatted manual page that can be directly displayed to
the user.
There should be exactly one occurrence of the string
-.Dq %s
+.Ql %s
in the shell command line, and it will
be replaced by the name of the file which is being formatted.
-.It _crunch
+.It Ic _crunch
Used by
.Xr catman 8
to determine how to crunch formatted pages
@@ -113,29 +119,27 @@ used to compress the man page.
The rest of the line must be a shell command line, used to compress the
formatted pages.
There should be exactly one occurrence of the string
-.Dq %s
+.Ql %s
in the shell command line, and it will
be replaced by the name of the output file.
-.It _default
+.It Ic _default
Contains the system-wide default man path used to search for man pages.
-.It _mandb
+.It Ic _mandb
Defines the full pathname (not just a directory path) for a database to
-be used
-by the
+be used by the
.Xr apropos 1
and
.Xr whatis 1
commands.
The pathname may contain the normal shell globbing characters,
-including curly braces
-.Pq Dq {} ;
+including csh-style curly braces;
to escape a shell globbing character,
precede it with a backslash
-.Pq Dq \e .
-.It _subdir
+.Pq Ql \e .
+.It Ic _subdir
Contains the list (in search order) of section subdirectories which will
be searched in any man path directory named with a trailing slash
-.Pq Dq /
+.Pq Ql /
character.
This list is also used, even if there is no trailing slash character,
when a path is specified to the
@@ -147,28 +151,29 @@ environment variable, or by the
and
.Fl m
options.
-.It _suffix
+.It Ic _suffix
identifies the set of suffixes used for formatted man pages
(the
-.Dq \.0
+.Ql \&.0
suffix is normally used here).
Formatted man pages can be directly displayed to the user.
-Each suffix may contain the normal shell globbing characters (NOT
-including curly braces
-.Pq Dq {} ) .
-.It _version
+Each suffix may contain the normal shell globbing characters
+.Po
+.Em not
+including csh-style curly braces
+.Pc .
+.It Ic _version
Contains the version of the configuration file.
-.It _ Ns Aq machine
+.It Ic _ Ns Aq Ar machine
Defines additional paths to be searched for the particular
-.Dv machine
+.Ar machine
hardware name whose literal value is taken from
.Xr uname 1
.Fl m .
-For example on an
-.Dv amd64 ,
-.Dv _amd64
-is used, where
-.Dq x86
+For example on an amd64,
+.Ic _amd64
+control keyword is used, where
+.Ql x86
is commonly supplied as an alternate machine path to also search.
.El
.Pp
@@ -178,13 +183,12 @@ consist of a section keyword naming the
string that defines the directory or subdi
CVS commit: src/usr.bin/man
Module Name:src Committed By: uwe Date: Sat Jun 18 13:41:12 UTC 2022 Modified Files: src/usr.bin/man: man.conf.5 Log Message: man.conf(5): Tweak formatting for prettier PS output. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.bin/man/man.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/iostat
Module Name:src Committed By: kre Date: Sat Jun 18 11:33:13 UTC 2022 Modified Files: src/usr.sbin/iostat: iostat.8 iostat.c Log Message: Significant changes to output layout methods - except for -x and -y which have not (yet) been touched (-xD needs *serious* improvements). While this still has no run-time configurability, it is now easy to adjust the column widths in the source and recompile. Dynamic (auto) column width sizing is probably out of the question (requires predicting the future) but options to allow the widths to be set isn't out of the question. The columns are now (mostly) considerably wider than they were before, hence wider windows are needed to view the same info. In an 80 column window the default display (with tty & cpu included) displays just 2 drives. 160 columns will fit 7 (but with -I, just 4). One new option added (-z) suppresses output which is true 0 (but still prints 0 for values rounded down to 0) for everything except tty stats. For drive output, the drive must have done nothing during the interval to get its output data blanked. Also options -H h -W w to set the output size (page height & width), the former used to decide when to print headers, and the latter to calculate the number of drives to print when no drive names were given. Env vars LINES and COLUMNS are used if the options are not given, with fallback to the terminal size (if output is to a terminal, and its sizes are known), and if all else fails, 20 lines, 80 columns. Specifying 0 means unlimited (infinite). So "iostat -W 0" will show all of the drives, across one (often very) long line. Wedges count as drives. When drives are specified, the output will now appear in the order they were given on the command line, rather than the order the system discovered them during auto-configuration. If specified as an fnmatch(3) pattern, drives that match will appear in auto-conf order, but that's generally what is wanted. When none are specified, you still get the first N (however many fits based upon the options selected) in auto-conf order (usually useless, more so now given that less will fit). Lastly, for those who looked at the patch I sent to current-users@ and were horrified at how kludgey it was, rest assured, that was just a quick hack to demonstrate what the output format changes would look like. This version (I hope) is not nearly so disgusting. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/iostat/iostat.8 cvs rdiff -u -r1.68 -r1.69 src/usr.sbin/iostat/iostat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/iostat
Module Name:src Committed By: kre Date: Sat Jun 18 11:33:13 UTC 2022 Modified Files: src/usr.sbin/iostat: iostat.8 iostat.c Log Message: Significant changes to output layout methods - except for -x and -y which have not (yet) been touched (-xD needs *serious* improvements). While this still has no run-time configurability, it is now easy to adjust the column widths in the source and recompile. Dynamic (auto) column width sizing is probably out of the question (requires predicting the future) but options to allow the widths to be set isn't out of the question. The columns are now (mostly) considerably wider than they were before, hence wider windows are needed to view the same info. In an 80 column window the default display (with tty & cpu included) displays just 2 drives. 160 columns will fit 7 (but with -I, just 4). One new option added (-z) suppresses output which is true 0 (but still prints 0 for values rounded down to 0) for everything except tty stats. For drive output, the drive must have done nothing during the interval to get its output data blanked. Also options -H h -W w to set the output size (page height & width), the former used to decide when to print headers, and the latter to calculate the number of drives to print when no drive names were given. Env vars LINES and COLUMNS are used if the options are not given, with fallback to the terminal size (if output is to a terminal, and its sizes are known), and if all else fails, 20 lines, 80 columns. Specifying 0 means unlimited (infinite). So "iostat -W 0" will show all of the drives, across one (often very) long line. Wedges count as drives. When drives are specified, the output will now appear in the order they were given on the command line, rather than the order the system discovered them during auto-configuration. If specified as an fnmatch(3) pattern, drives that match will appear in auto-conf order, but that's generally what is wanted. When none are specified, you still get the first N (however many fits based upon the options selected) in auto-conf order (usually useless, more so now given that less will fit). Lastly, for those who looked at the patch I sent to current-users@ and were horrified at how kludgey it was, rest assured, that was just a quick hack to demonstrate what the output format changes would look like. This version (I hope) is not nearly so disgusting. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/iostat/iostat.8 cvs rdiff -u -r1.68 -r1.69 src/usr.sbin/iostat/iostat.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/iostat/iostat.8 diff -u src/usr.sbin/iostat/iostat.8:1.27 src/usr.sbin/iostat/iostat.8:1.28 --- src/usr.sbin/iostat/iostat.8:1.27 Sun Jul 29 21:17:43 2018 +++ src/usr.sbin/iostat/iostat.8 Sat Jun 18 11:33:13 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: iostat.8,v 1.27 2018/07/29 21:17:43 wiz Exp $ +.\" $NetBSD: iostat.8,v 1.28 2022/06/18 11:33:13 kre Exp $ .\" .\" Copyright (c) 1985, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)iostat.8 8.1 (Berkeley) 6/6/93 .\" -.Dd July 29, 2018 +.Dd June 18, 2022 .Dt IOSTAT 8 .Os .Sh NAME @@ -37,8 +37,10 @@ .Nd report I/O statistics .Sh SYNOPSIS .Nm -.Op Fl CdDITxy +.Op Fl CdDITxyz .Op Fl c Ar count +.Op Fl H Ar height +.Op Fl W Ar width .Op Fl w Ar wait .Op Ar drives .Sh DESCRIPTION @@ -49,6 +51,8 @@ By default, displays one line of statistics averaged over the machine's run time. The use of .Fl c +or +.Fl w presents successive lines averaged over the .Ar wait period. @@ -56,13 +60,14 @@ The .Fl I option causes .Nm -to print raw, unaveraged values. +to print raw, unaveraged values (totals). .Pp Only the last disk option specified .Fl ( d , .Fl D , +.Fl x , or -.Fl x ) +.Fl y ) is used. .Pp The options are as follows: @@ -80,34 +85,86 @@ If no interval is specified, the default is 1 second. .It Fl C Show CPU statistics. -This is enabled by default unless the +This is enabled by default unless any of the .Fl d , .Fl D , .Fl T , +.Fl x , or -.Fl x +.Fl y flags are used. .It Fl d Show disk statistics. This is the default. -Displays kilobytes per -transfer, number of transfers, and megabytes transferred. -Use of this flag disables display of CPU and tty statistics. +Displays +number of transfers per second, +kilobytes per transfer, +and +megabytes transferred per second. +Use of this flag disables the default display of CPU and tty statistics. .It Fl D Show alternative disk statistics. -Displays kilobytes transferred, number of -transfers, and time spent in transfers. +Displays +number of transfers, +kilobytes transferred, +and +time spent in transfers, +during the +.Ar wait +period (or since boot with +.Fl I ) . Use of this flag disables the default display. +.It Fl H Ar height +Set the page siz
Re: CVS commit: src/usr.sbin/sysinst/arch
On Sat, Jun 18, 2022 at 12:22:44AM +0200, Joerg Sonnenberger wrote: > > - ramdiskbin with CHECK_ENTROPY requires extra 7000 bytes, at least on > > m68k, so poor tier-II ports that have size restrictions on install media > > or use slow floppies rather prefer smaller binaries > > Hm. It shouldn't be anywhere as heavy. Can you check where that size > comes from? 1KB I can understand, but 7KB feels too large and something > is going wrong. E.g. it could be pulling in more SHA2 code that hasn't > been used before and there might be cheaper options in terms of code > size. Many of that is from additional messages and menus, not code size: Default build for atari: textdata bss dec hex filename 315441 20296 30948 366685 5985d sysinst -rw-r--r-- 1 root wheel 37109 Jun 18 11:55 sysinstmsgs.de CHECK_ENTROPY=no: textdata bss dec hex filename 305976 18084 29924 353984 566c0 sysinst -rw-r--r-- 1 root wheel 34651 Jun 18 11:58 sysinstmsgs.de ... which seems to mostly cover the crunched difference already, so likely no (or not many) library/dependends effects in there. Similar to what abs@ suggested, I have a long term plan to have multiple (optional) sysinst phases, and we could move all late/configure stuff to a separate phase and maybe actually reuse the new installed system binaries for that. Other phases that will be needed are "update kernel and modules" vs. "update everything else after reboot with new kernel". But this is not going to happen for 10. Martin
Re: CVS commit: src/usr.bin/man
On Sat, Jun 18, 2022 at 02:19:07 +, David H. Gutteridge wrote: > Module Name: src > Committed By: gutteridge > Date: Sat Jun 18 02:19:07 UTC 2022 > > Modified Files: > src/usr.bin/man: man.conf.5 > > Log Message: > man.conf.5: add details about the machine line and search order > > Also, tweak some grammar, style, and markup while here. > > > To generate a diff of this commit: > cvs rdiff -u -r1.27 -r1.28 src/usr.bin/man/man.conf.5 Please, could you rephrase the bit about the _ keyword. It is not quite clear on the first reading which is the keyword and which is the value (epecially in text output where formatting (wrong anyway :) doesn't provide a hint). Using "value" to talk about the keyword doesn't help too. Also, "commonly" in the added phrase is misleading I'd say. Commonly implies "not always", which is false - we suppply x86 as an extra subdir in the default man.conf. I know that passage was not very clear to begin with, but you touch it you buy it :). Not being a native speaker I don't dare touching it, I'm afraid to make more mess. TIA! -uwe
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: skrll
Date: Sat Jun 18 08:22:11 UTC 2022
Modified Files:
src/sys/dev/sdmmc: if_bwfm_sdio.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/sdmmc/if_bwfm_sdio.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/sdmmc/if_bwfm_sdio.c
diff -u src/sys/dev/sdmmc/if_bwfm_sdio.c:1.28 src/sys/dev/sdmmc/if_bwfm_sdio.c:1.29
--- src/sys/dev/sdmmc/if_bwfm_sdio.c:1.28 Mon Mar 14 06:40:12 2022
+++ src/sys/dev/sdmmc/if_bwfm_sdio.c Sat Jun 18 08:22:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bwfm_sdio.c,v 1.28 2022/03/14 06:40:12 mlelstv Exp $ */
+/* $NetBSD: if_bwfm_sdio.c,v 1.29 2022/06/18 08:22:10 skrll Exp $ */
/* $OpenBSD: if_bwfm_sdio.c,v 1.1 2017/10/11 17:19:50 patrick Exp $ */
/*
* Copyright (c) 2010-2016 Broadcom Corporation
@@ -182,9 +182,9 @@ static void bwfm_sdio_rx_frames(struct b
static void bwfm_sdio_rx_glom(struct bwfm_sdio_softc *,
uint16_t *, int, uint16_t *);
-#ifdef BWFM_DEBUG
+#ifdef BWFM_DEBUG
static void bwfm_sdio_debug_console(struct bwfm_sdio_softc *);
-#endif
+#endif
static const struct bwfm_firmware_selector bwfm_sdio_fwtab[] = {
BWFM_FW_ENTRY(BRCM_CC_43143_CHIP_ID,
@@ -233,7 +233,7 @@ static const struct bwfm_firmware_select
BWFM_FW_ENTRY(BRCM_CC_4354_CHIP_ID,
BWFM_FWSEL_ALLREVS, "brcmfmac4354-sdio"),
-
+
BWFM_FW_ENTRY(BRCM_CC_4356_CHIP_ID,
BWFM_FWSEL_ALLREVS, "brcmfmac4356-sdio"),
@@ -274,32 +274,32 @@ static const struct bwfm_sdio_product {
} bwfm_sdio_products[] = {
{
SDMMC_VENDOR_BROADCOM,
- SDMMC_PRODUCT_BROADCOM_BCM4330,
+ SDMMC_PRODUCT_BROADCOM_BCM4330,
SDMMC_CIS_BROADCOM_BCM4330
},
{
SDMMC_VENDOR_BROADCOM,
- SDMMC_PRODUCT_BROADCOM_BCM4334,
+ SDMMC_PRODUCT_BROADCOM_BCM4334,
SDMMC_CIS_BROADCOM_BCM4334
},
{
SDMMC_VENDOR_BROADCOM,
- SDMMC_PRODUCT_BROADCOM_BCM43143,
+ SDMMC_PRODUCT_BROADCOM_BCM43143,
SDMMC_CIS_BROADCOM_BCM43143
},
{
SDMMC_VENDOR_BROADCOM,
- SDMMC_PRODUCT_BROADCOM_BCM43430,
+ SDMMC_PRODUCT_BROADCOM_BCM43430,
SDMMC_CIS_BROADCOM_BCM43430
},
{
SDMMC_VENDOR_BROADCOM,
- SDMMC_PRODUCT_BROADCOM_BCM43455,
+ SDMMC_PRODUCT_BROADCOM_BCM43455,
SDMMC_CIS_BROADCOM_BCM43455
},
{
SDMMC_VENDOR_BROADCOM,
- SDMMC_PRODUCT_BROADCOM_BCM43362,
+ SDMMC_PRODUCT_BROADCOM_BCM43362,
SDMMC_CIS_BROADCOM_BCM43362
},
};
@@ -379,7 +379,7 @@ bwfm_sdio_attach(device_t parent, device
sc->sc_sf[sf->number] = sf;
}
- sdmmc_io_set_blocklen(sc->sc_sf[1], 64);
+ sdmmc_io_set_blocklen(sc->sc_sf[1], 64);
sdmmc_io_set_blocklen(sc->sc_sf[2], 512);
/* Enable Function 1. */
@@ -1308,9 +1308,9 @@ static struct bwfm_sdio_dstab pmu11_1v8[
{1, 0x1},
{0, 0x0}
}, pmu17_1v8[] = {
- {3, 0x3},
- {2, 0x2},
- {1, 0x1},
+ {3, 0x3},
+ {2, 0x2},
+ {1, 0x1},
{0, 0x0}
}, pmu17_3v3[] = {
{16, 0x7},
@@ -1536,7 +1536,7 @@ bwfm_sdio_tx_ok(struct bwfm_sdio_softc *
((uint8_t)(sc->sc_tx_max_seq - sc->sc_tx_seq) & 0x80) == 0;
}
-static void
+static void
bwfm_sdio_tx_frames(struct bwfm_sdio_softc *sc)
{
struct mbuf *m;
@@ -1556,7 +1556,7 @@ bwfm_sdio_tx_frames(struct bwfm_sdio_sof
if (m->m_type == MT_CONTROL)
bwfm_sdio_tx_ctrlframe(sc, m);
else {
- bwfm_sdio_tx_dataframe(sc, m);
+ bwfm_sdio_tx_dataframe(sc, m);
if_statinc(ifp, if_opackets);
ifstart = true;
}
@@ -1576,7 +1576,7 @@ bwfm_sdio_tx_ctrlframe(struct bwfm_sdio_
struct bwfm_sdio_hwhdr *hwhdr;
struct bwfm_sdio_swhdr *swhdr;
size_t len, roundto;
-
+
len = sizeof(*hwhdr) + sizeof(*swhdr) + m->m_len;
/* Zero-pad to either block-size or 4-byte alignment. */
@@ -1586,24 +1586,24 @@ bwfm_sdio_tx_ctrlframe(struct bwfm_sdio_
roundto = 4;
KASSERT(roundup(len, roundto) <= sc->sc_bounce_size);
-
+
hwhdr = (void *)sc->sc_bounce_buf;
hwhdr->frmlen = htole16(len);
hwhdr->cksum = htole16(~len);
-
+
swhdr = (void *)&hwhdr[1];
swhdr->seqnr = sc->sc_tx_seq++;
swhdr->chanflag = BWFM_SDIO_SWHDR_CHANNEL_CONTROL;
swhdr->nextlen = 0;
swhdr->dataoff = sizeof(*hwhdr) + sizeof(*swhdr);
swhdr->maxseqnr = 0;
-
+
m_copydata(m, 0, m->m_len, &swhdr[1]);
-
+
if (roundup(len, roundto) != len)
memset(sc->sc_bounce_buf + len, 0,
roundup(len, roundto) - len);
-
+
bwfm_sdio_frame_read_write(sc, sc->sc_bounce_buf,
roundup(len, roundto), 1);
}
@@ -1688,11 +1688,11 @@ bwfm_sdio_rxctl(struct bwfm_softc *bwfm,
static void
bwfm_sdio_rx_frames(struct bwfm_sdio_softc *sc)
-{
+{
struct bwfm_sdio_hwhdr *hwhdr;
struct bwfm_sdio_swhdr *swhdr;
struct bwfm_proto_bcdc_hdr *bcdc;
- uint16_t *sublen, nextlen = 0;
+ uint16_t *sublen, nextlen = 0;
struct mbuf *m;
size_t flen, off, hoff;
char *data;
@@ -1702,7 +1702,7 @@ bwfm_sdio_rx_frames(struct bwfm_sdio_sof
hwhdr = (struct bwfm_sdio_hwhdr *)sc->sc_bounce_buf;
swhdr = (struct bw
CVS commit: src/sys/dev/sdmmc
Module Name:src Committed By: skrll Date: Sat Jun 18 08:22:11 UTC 2022 Modified Files: src/sys/dev/sdmmc: if_bwfm_sdio.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/sdmmc/if_bwfm_sdio.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/ixgbe
Module Name:src Committed By: skrll Date: Sat Jun 18 08:20:57 UTC 2022 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: aprintf_normal -> aprint_normal To generate a diff of this commit: cvs rdiff -u -r1.321 -r1.322 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe
Module Name:src
Committed By: skrll
Date: Sat Jun 18 08:20:57 UTC 2022
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
aprintf_normal -> aprint_normal
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.321 src/sys/dev/pci/ixgbe/ixgbe.c:1.322
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.321 Thu Jun 2 17:20:21 2022
+++ src/sys/dev/pci/ixgbe/ixgbe.c Sat Jun 18 08:20:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.321 2022/06/02 17:20:21 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.322 2022/06/18 08:20:56 skrll Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.321 2022/06/02 17:20:21 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.322 2022/06/18 08:20:56 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -6923,7 +6923,7 @@ ixgbe_allocate_msix(struct adapter *adap
if (error == 0) {
#if 1 /* def IXGBE_DEBUG */
#ifdef RSS
- aprintf_normal(", bound RSS bucket %d to CPU %d", i,
+ aprint_normal(", bound RSS bucket %d to CPU %d", i,
cpu_id % ncpu);
#else
aprint_normal(", bound queue %d to cpu %d", i,
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sat Jun 18 08:13:44 UTC 2022 Modified Files: src/sys/arch/arm/arm: efi_runtime.c Log Message: Simplify (imo) #ifdefs a little. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/efi_runtime.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/arm/arm
Module Name:src
Committed By: skrll
Date: Sat Jun 18 08:13:44 UTC 2022
Modified Files:
src/sys/arch/arm/arm: efi_runtime.c
Log Message:
Simplify (imo) #ifdefs a little.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/efi_runtime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/efi_runtime.c
diff -u src/sys/arch/arm/arm/efi_runtime.c:1.8 src/sys/arch/arm/arm/efi_runtime.c:1.9
--- src/sys/arch/arm/arm/efi_runtime.c:1.8 Sun Apr 3 09:49:36 2022
+++ src/sys/arch/arm/arm/efi_runtime.c Sat Jun 18 08:13:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_runtime.c,v 1.8 2022/04/03 09:49:36 martin Exp $ */
+/* $NetBSD: efi_runtime.c,v 1.9 2022/06/18 08:13:44 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "efi.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.8 2022/04/03 09:49:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.9 2022/06/18 08:13:44 skrll Exp $");
#include
#include
@@ -57,9 +57,8 @@ static kmutex_t efi_lock;
static struct efi_rt *RT;
#if BYTE_ORDER == LITTLE_ENDIAN
static struct efi_rt efi_rtcopy;
-#endif
-#if NEFI > 0 && BYTE_ORDER == LITTLE_ENDIAN
+#if NEFI > 0
static struct efi_ops arm_efi_ops = {
.efi_gettime = arm_efirt_gettime,
.efi_settime = arm_efirt_settime,
@@ -68,6 +67,7 @@ static struct efi_ops arm_efi_ops = {
.efi_nextvar = arm_efirt_nextvar,
};
#endif
+#endif
int
arm_efirt_init(paddr_t efi_system_table)
CVS commit: src/common/lib/libc/arch/aarch64/atomic
Module Name:src Committed By: skrll Date: Sat Jun 18 08:01:56 UTC 2022 Modified Files: src/common/lib/libc/arch/aarch64/atomic: __aarch64_lse.S Log Message: be consistent about comparing loaded value against expected old value register ordering To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S 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/aarch64/atomic/__aarch64_lse.S diff -u src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S:1.4 src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S:1.5 --- src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S:1.4 Sat Jun 18 07:55:19 2022 +++ src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S Sat Jun 18 08:01:56 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: __aarch64_lse.S,v 1.4 2022/06/18 07:55:19 skrll Exp $ */ +/* $NetBSD: __aarch64_lse.S,v 1.5 2022/06/18 08:01:56 skrll Exp $ */ /*- * Copyright (c) 2021 The NetBSD Foundation, Inc. @@ -177,9 +177,9 @@ ENTRY_NP(CASP_FUNC) mov x5, x0 /* need x0 for return value */ mov x6, x1 /* need x1 for return value */ 1: LDXP x0, x1, [x4] /* load old value */ - cmp x5, x0 /* compare */ + cmp x0, x5 /* compare */ b.ne 2f /* not equal? return */ - cmp x6, x1 + cmp x1, x6 b.ne 2f /* not equal? return */ STXP w7, x2, x3, [x4] /* store new value */ cbnz w7, 3f /* succeed? nope, try again. */
CVS commit: src/common/lib/libc/arch/aarch64/atomic
Module Name:src Committed By: skrll Date: Sat Jun 18 08:01:56 UTC 2022 Modified Files: src/common/lib/libc/arch/aarch64/atomic: __aarch64_lse.S Log Message: be consistent about comparing loaded value against expected old value register ordering To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/aarch64/atomic
Module Name:src Committed By: skrll Date: Sat Jun 18 07:55:19 UTC 2022 Modified Files: src/common/lib/libc/arch/aarch64/atomic: __aarch64_lse.S Log Message: Fix some register usage To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S 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/aarch64/atomic/__aarch64_lse.S diff -u src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S:1.3 src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S:1.4 --- src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S:1.3 Thu Jun 16 08:21:57 2022 +++ src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S Sat Jun 18 07:55:19 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: __aarch64_lse.S,v 1.3 2022/06/16 08:21:57 skrll Exp $ */ +/* $NetBSD: __aarch64_lse.S,v 1.4 2022/06/18 07:55:19 skrll Exp $ */ /*- * Copyright (c) 2021 The NetBSD Foundation, Inc. @@ -174,8 +174,9 @@ ENTRY_NP(CASP_FUNC) ret 99: #endif - mov x4, x0 /* need x0 for return value */ -1: LDXP x5, x6, [x4] /* load old value */ + mov x5, x0 /* need x0 for return value */ + mov x6, x1 /* need x1 for return value */ +1: LDXP x0, x1, [x4] /* load old value */ cmp x5, x0 /* compare */ b.ne 2f /* not equal? return */ cmp x6, x1
CVS commit: src/common/lib/libc/arch/aarch64/atomic
Module Name:src Committed By: skrll Date: Sat Jun 18 07:55:19 UTC 2022 Modified Files: src/common/lib/libc/arch/aarch64/atomic: __aarch64_lse.S Log Message: Fix some register usage To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_lse.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
