 @@ -1,14 +1,14 @@
-# $NetBSD: genassym.cf,v 1.28 2021/07/11 01:54:42 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.29 2021/07/11 01:58:41 thorpej Exp $
+#
 # Copyright (c) 1982, 1990, 1993
 #	The Regents of the University of California.  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.
 @@ -56,32 +56,35 @@
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
+#
 #	from: @(#)genassym.c	8.3 (Berkeley) 1/4/94
+#
 quote #define __RWLOCK_PRIVATE
 include <sys/param.h>
 include <sys/buf.h>
 include <sys/proc.h>
 include <sys/sched.h>
 include <sys/mbuf.h>
 include <sys/msgbuf.h>
 include <sys/rwlock.h>
 include <sys/syscall.h>
 include <machine/cpu.h>
 include <machine/reg.h>
 include <machine/frame.h>
 include <machine/rpb.h>
 include <machine/vmparam.h>
 include <uvm/uvm_extern.h>
 # general constants
 define	VM_MAX_ADDRESS		VM_MAX_ADDRESS
 define	ALPHA_PGBYTES		ALPHA_PGBYTES
 @@ -186,13 +189,19 @@ define	ALPHA_KENTRY_UNA	ALPHA_KENTRY_UNA
 define	ENAMETOOLONG		ENAMETOOLONG
 define	EFAULT			EFAULT
 # Syscalls called from sigreturn.
 define	SYS_compat_16___sigreturn14	SYS_compat_16___sigreturn14
 define	SYS_exit		SYS_exit
 # CPU info
 define	CPU_INFO_CURLWP		offsetof(struct cpu_info, ci_curlwp)
 define	CPU_INFO_IDLE_LWP	offsetof(struct cpu_info, ci_data.cpu_idlelwp)
 define	CPU_INFO_SSIR		offsetof(struct cpu_info, ci_ssir)
 define	CPU_INFO_MTX_COUNT	offsetof(struct cpu_info, ci_mtx_count)
 define	CPU_INFO_SIZEOF		sizeof(struct cpu_info)
 # Bits in lock fields
 define	RW_WRITE_WANTED		RW_WRITE_WANTED
 define	RW_WRITE_LOCKED		RW_WRITE_LOCKED
 define	RW_READ_INCR		RW_READ_INCR
 define	RW_READ_COUNT_SHIFT	RW_READ_COUNT_SHIFT

 @@ -1,21 +1,21 @@
-/*	$NetBSD: lock_stubs.s,v 1.4 2020/09/04 02:54:56 thorpej Exp $	*/
+/*	$NetBSD: lock_stubs.s,v 1.5 2021/07/11 01:58:41 thorpej Exp $	*/
 /*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * Copyright (c) 2007, 2021 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
- * by Andrew Doran.
+ * by Andrew Doran, and by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.4 2020/09/04 02:54:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.5 2021/07/11 01:58:41 thorpej Exp $");
 #include "assym.h"
 #if defined(MULTIPROCESSOR)
 #define	MB		mb
 #else
 #define	MB		/* nothing */
 #endif
 /*
  * int	_lock_cas(uintptr_t *ptr, uintptr_t old, uintptr_t new)
  */
 LEAF(_lock_cas, 3)
 @@ -53,61 +53,217 @@ LEAF(_lock_cas, 3)
 	ldq_l	t1, 0(a0)
 	cmpeq	t1, a1, t1
 	beq	t1, 2f
 	stq_c	v0, 0(a0)
 	beq	v0, 3f
 	MB
 	RET
 :
 	mov	zero, v0
 	MB
 	RET
 :
 	br	1b
-END(_lock_cas)
+	END(_lock_cas)
 #if !defined(LOCKDEBUG)
 /*
  * void mutex_enter(kmutex_t *mtx);
  */
 LEAF(mutex_enter, 1)
 	LDGP(pv)
-	GET_CURLWP
+	GET_CURLWP	/* Note: GET_CURLWP clobbers v0, t0, t8...t11. */
 :
 	mov	v0, t1
 	ldq_l	t2, 0(a0)
 	bne	t2, 2f
 	stq_c	t1, 0(a0)
 	beq	t1, 3f
 	MB
 	RET
 :
 	lda	t12, mutex_vector_enter
 	jmp	(t12)
 :
 	br	1b
-END(mutex_enter)
+	END(mutex_enter)
 /*
  * void mutex_exit(kmutex_t *mtx);
  */
 LEAF(mutex_exit, 1)
 	LDGP(pv)
 	MB
-	GET_CURLWP
+	GET_CURLWP	/* Note: GET_CURLWP clobbers v0, t0, t8...t11. */
 	mov	zero, t3
 :
 	ldq_l	t2, 0(a0)
 	cmpeq	v0, t2, t2
 	beq	t2, 2f
 	stq_c	t3, 0(a0)
 	beq	t3, 3f
 	RET
 :
 	lda	t12, mutex_vector_exit
 	jmp	(t12)
 :
 	br	1b
-END(mutex_exit)
+	END(mutex_exit)
 /*
  * void rw_enter(krwlock_t *rwl, krw_t op);
+ *
  * Acquire one hold on a RW lock.
  */
 LEAF(rw_enter, 2)
 	LDGP(pv)
 	/*
 	 * RW_READER == 0 (we have a compile-time assert in machdep.c
 	 * to ensure this).
+	 *
 	 * Acquire for read is the most common case.
 	 */
 	bne	a1, 3f
 	/* Acquiring for read. */
 :	ldq_l	t0, 0(a0)
 	and	t0, (RW_WRITE_LOCKED|RW_WRITE_WANTED), t1
 	addq	t0, RW_READ_INCR, t2
 	bne	t1, 4f		/* contended */
 	stq_c	t2, 0(a0)
 	beq	t2, 2f		/* STQ_C failed; retry */
 	MB
 	RET
 :	br	1b
 :	/* Acquiring for write. */
 	GET_CURLWP	/* Note: GET_CURLWP clobbers v0, t0, t8...t11. */
 	ldq_l	t0, 0(a0)
 	or	v0, RW_WRITE_LOCKED, t2
 	bne	t0, 4f		/* contended */
 	stq_c	t2, 0(a0)
 	beq	t2, 4f		/* STQ_C failed; consider it contended */
 	MB
 	RET
 :	lda	pv, rw_vector_enter
 	jmp	(pv)
 	END(rw_enter)
 /*
  * int rw_tryenter(krwlock_t *rwl, krw_t op);
+ *
  * Try to acquire one hold on a RW lock.
  */
 LEAF(rw_tryenter, 2)
 	LDGP(pv)
 	/* See above. */
 	bne	a1, 3f
 	/* Acquiring for read. */
 :	ldq_l	t0, 0(a0)
 	and	t0, (RW_WRITE_LOCKED|RW_WRITE_WANTED), t1
 	addq	t0, RW_READ_INCR, v0
 	bne	t1, 4f		/* contended */
 	stq_c	v0, 0(a0)
 	beq	v0, 2f		/* STQ_C failed; retry */
 	MB
 	RET			/* v0 contains non-zero LOCK_FLAG from STQ_C */
 :	br	1b
 	/* Acquiring for write. */
 :	GET_CURLWP	/* Note: GET_CURLWP clobbers v0, t0, t8...t11. */
 	ldq_l	t0, 0(a0)
 	or	v0, RW_WRITE_LOCKED, v0
 	bne	t0, 4f		/* contended */
 	stq_c	v0, 0(a0)
 	/*
 	 * v0 now contains the LOCK_FLAG value from STQ_C, which is either
 	 * 0 for failure, or non-zero for success.  In either case, v0's
 	 * value is correct.  Go ahead and perform the memory barrier even
 	 * in the failure case because we expect it to be rare and it saves
 	 * a branch-not-taken instruction in the success case.
 	 */
 	MB
 	RET
 :	mov	zero, v0	/* return 0 (failure) */
 	RET
 	END(rw_tryenter)
 /*
  * void rw_exit(krwlock_t *rwl);
+ *
  * Release one hold on a RW lock.
  */
 LEAF(rw_exit, 1)
 	LDGP(pv)
 	MB
 	/*
 	 * Check for write-lock release, and get the owner/count field
 	 * on its own for sanity-checking against expected values.
 	 */
 	ldq	a1, 0(a0)
 	and	a1, RW_WRITE_LOCKED, t1
 	srl	a1, RW_READ_COUNT_SHIFT, a2
 	bne	t1, 3f
 	/*
 	 * Releasing a read-lock.  Make sure the count is non-zero.
 	 * If it is zero, take the slow path where the juicy diagnostic
 	 * checks are located.
 	 */
 	beq	a2, 4f
 	/*
 	 * We do the following trick to check to see if we're releasing
 	 * the last read-count and there are waiters:
+	 *
 	 *	1. Set v0 to 1.
 	 *	2. Shift the new read count into t1.
 	 *	3. Conditally move t1 to v0 based on low-bit-set of t0
 	 *	   (RW_HAS_WAITERS).  If RW_HAS_WAITERS is not set, then
 	 *	   the move will not take place, and v0 will remain 1.
 	 *	   Otherwise, v0 will contain the updated read count.
 	 *	4. Jump to slow path if v0 == 0.
 	 */
 :	ldq_l	t0, 0(a0)
 	ldiq	v0, 1
 	subq	t0, RW_READ_INCR, t2
 	srl	t2, RW_READ_COUNT_SHIFT, t1
 	cmovlbs	t0, t1, v0
 	beq	v0, 4f
 	stq_c	t2, 0(a0)
 	beq	t2, 2f		/* STQ_C failed; try again */
 	RET
 :	br	1b
 	/*
 	 * Releasing a write-lock.  Make sure the owner field points
 	 * to our LWP.  If it does not, take the slow path where the
 	 * juicy diagnostic checks are located.  a2 contains the owner
 	 * field shifted down.  Shift it back up to compare to curlwp;
 	 * this conveniently discards the bits we don't want to compare.
 	 */
 :	GET_CURLWP	/* Note: GET_CURLWP clobbers v0, t0, t8...t11. */
 	sll	a2, RW_READ_COUNT_SHIFT, a2
 	mov	zero, t2	/* fast-path write-unlock stores NULL */
 	cmpeq	v0, a2, v0	/* v0 = (owner == curlwp) */
 	ldq_l	t0, 0(a0)
 	beq	v0, 4f		/* owner field mismatch; need slow path */
 	blbs	t0, 4f		/* RW_HAS_WAITERS set; need slow-path */
 	stq_c	t2, 0(a0)
 	beq	t2, 4f		/* STQ_C failed; need slow-path */
 	RET
 :	lda	pv, rw_vector_exit
 	jmp	(pv)
 	END(rw_exit)
 #endif	/* !LOCKDEBUG */

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.373 2021/07/04 22:42:35 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.374 2021/07/11 01:58:41 thorpej Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000, 2019, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Chris G. Demetriou.
+ *
  * 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
 @@ -55,29 +55,31 @@
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include "opt_dec_3000_300.h"
 #include "opt_dec_3000_500.h"
 #include "opt_execfmt.h"
 #define	__RWLOCK_PRIVATE
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.373 2021/07/04 22:42:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.374 2021/07/11 01:58:41 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 #include <sys/ras.h>
 #include <sys/sched.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/mman.h>
 @@ -85,26 +87,27 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/exec.h>
 #include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/exec_ecoff.h>
 #include <sys/core.h>
 #include <sys/kcore.h>
 #include <sys/ucontext.h>
 #include <sys/conf.h>
 #include <sys/ksyms.h>
 #include <sys/kauth.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/rwlock.h>
 #include <machine/kcore.h>
 #include <machine/fpu.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <uvm/uvm.h>
 #include <sys/sysctl.h>
 #include <dev/cons.h>
 #include <dev/mm.h>
 @@ -123,26 +126,30 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 #include <ddb/db_interface.h>
 #endif
 #ifdef KGDB
 #include <sys/kgdb.h>
 #endif
 #ifdef DEBUG
 #include <machine/sigdebug.h>
 int sigdebug = 0x0;
 int sigpid = 0;
 #endif
 /* Assert some assumptions made in lock_stubs.s */
 __CTASSERT(RW_READER == 0);
 __CTASSERT(RW_HAS_WAITERS == 1);
 #include <machine/alpha.h>
 #include "ksyms.h"
 struct vm_map *phys_map = NULL;
 void *msgbufaddr;
 int	maxmem;			/* max memory per process */
 int	totalphysmem;		/* total amount of physical memory in system */
 int	resvmem;		/* amount of memory reserved for PROM */
 int	unusedmem;		/* amount of memory for OS that we don't use */