 @@ -1,14 +1,14 @@
-# $NetBSD: genassym.cf,v 1.22 2020/02/20 08:27:38 skrll Exp $
+# $NetBSD: genassym.cf,v 1.23 2020/09/03 04:18:30 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.
 @@ -177,16 +177,15 @@ define	ALPHA_KENTRY_MM		ALPHA_KENTRY_MM
 define	ALPHA_KENTRY_IF		ALPHA_KENTRY_IF
 define	ALPHA_KENTRY_UNA	ALPHA_KENTRY_UNA
 # errno values
 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_CURPCB		offsetof(struct cpu_info, ci_curpcb)
 define	CPU_INFO_IDLE_LWP	offsetof(struct cpu_info, ci_data.cpu_idlelwp)
 define	CPU_INFO_SIZEOF		sizeof(struct cpu_info)

 @@ -1,14 +1,14 @@
-/* $NetBSD: locore.s,v 1.126 2020/09/03 02:09:09 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.127 2020/09/03 04:18:30 thorpej Exp $ */
 /*-
  * Copyright (c) 1999, 2000, 2019 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.
+ *
  * 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
 @@ -57,41 +57,37 @@
  * rights to redistribute these changes.
  */
 .stabs	__FILE__,100,0,0,kernel_text
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #include "opt_compat_netbsd.h"
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.126 2020/09/03 02:09:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.127 2020/09/03 04:18:30 thorpej Exp $");
 #include "assym.h"
 .stabs	__FILE__,132,0,0,kernel_text
 /*
  * Perform actions necessary to switch to a new context.  The
  * hwpcb should be in a0.  Clobbers v0, t0, t8..t11, a0.
  */
 #define	SWITCH_CONTEXT							\
 	/* Make a note of the context we're running on. */		\
 	GET_CURPCB						;	\
 	stq	a0, 0(v0)					;	\
 	/* Swap in the new context. */					\
 	call_pal PAL_OSF1_swpctx
 	/* don't reorder instructions; paranoia. */
 	.set noreorder
 	.text
 	.macro	bfalse	reg, dst
 	beq	\reg, \dst
 	.endm
 	.macro	btrue	reg, dst

 @@ -1,14 +1,14 @@
-/* $NetBSD: prom.c,v 1.54 2020/09/03 02:09:09 thorpej Exp $ */
+/* $NetBSD: prom.c,v 1.55 2020/09/03 04:18:30 thorpej Exp $ */
 /*
  * Copyright (c) 1992, 1994, 1995, 1996 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
 @@ -17,27 +17,27 @@
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.54 2020/09/03 02:09:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.55 2020/09/03 04:18:30 thorpej Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <machine/rpb.h>
 #include <machine/alpha.h>
 #define	ENABLEPROM
 @@ -67,27 +67,28 @@ static kmutex_t	prom_lock;
 #ifdef _PROM_MAY_USE_PROM_CONSOLE
 pt_entry_t	prom_pte, saved_pte[1];	/* XXX */
 static pt_entry_t *
 prom_lev1map(void)
+{
 	struct alpha_pcb *apcb;
 	/*
 	 * Find the level 1 map that we're currently running on.
 	 */
-	apcb = (struct alpha_pcb *)ALPHA_PHYS_TO_K0SEG(curpcb);
+	apcb = (struct alpha_pcb *))
 	    ALPHA_PHYS_TO_K0SEG((paddr_t)curlwp->l_md.md_pcbpaddr);
 	return ((pt_entry_t *)ALPHA_PHYS_TO_K0SEG(apcb->apcb_ptbr << PGSHIFT));
+}
 #endif /* _PROM_MAY_USE_PROM_CONSOLE */
 bool
 prom_uses_prom_console(void)
+{
 #ifdef _PROM_MAY_USE_PROM_CONSOLE
 	return (cputype == ST_DEC_21000);
 #else
 	return false;
 #endif
 @@ -176,50 +177,50 @@ static void prom_cache_sync(void);
 void
 prom_enter(void)
+{
 	mutex_enter(&prom_lock);
 #ifdef _PROM_MAY_USE_PROM_CONSOLE
 	/*
 	 * If we have not yet switched out of the PROM's context
 	 * (i.e. the first one after alpha_init()), then the PROM
 	 * is still mapped, regardless of the `prom_mapped' setting.
 	 */
-	if (prom_mapped == 0 && curpcb != 0) {
+	if (! prom_mapped) {
 		if (!prom_uses_prom_console())
 			panic("prom_enter");
+		{
 			pt_entry_t *lev1map;
 			lev1map = prom_lev1map();	/* XXX */
 			saved_pte[0] = lev1map[0];	/* XXX */
 			lev1map[0] = prom_pte;		/* XXX */
+		}
 		prom_cache_sync();			/* XXX */
+	}
 #endif
+}
 void
 prom_leave(void)
+{
 #ifdef _PROM_MAY_USE_PROM_CONSOLE
 	/*
 	 * See comment above.
 	 */
-	if (prom_mapped == 0 && curpcb != 0) {
+	if (! prom_mapped) {
 		if (!prom_uses_prom_console())
 			panic("prom_leave");
+		{
 			pt_entry_t *lev1map;
 			lev1map = prom_lev1map();	/* XXX */
 			lev1map[0] = saved_pte[0];	/* XXX */
+		}
 		prom_cache_sync();			/* XXX */
+	}
 #endif
 	mutex_exit(&prom_lock);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: asm.h,v 1.39 2020/08/29 22:50:27 thorpej Exp $ */
+/* $NetBSD: asm.h,v 1.40 2020/09/03 04:18:30 thorpej Exp $ */
 /*
  * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
 @@ -665,33 +665,27 @@ label:	ASCIZ msg;						\
+ *
  * All return values are in v0.
  */
 #define	GET_CPUINFO		call_pal PAL_OSF1_rdval
 #define	GET_CURLWP							\
 	call_pal PAL_OSF1_rdval					;	\
 	addq	v0, CPU_INFO_CURLWP, v0
 #define	GET_FPCURLWP							\
 	call_pal PAL_OSF1_rdval					;	\
 	addq	v0, CPU_INFO_FPCURLWP, v0
 #define	GET_CURPCB							\
 	call_pal PAL_OSF1_rdval					;	\
 	addq	v0, CPU_INFO_CURPCB, v0
 #else	/* if not MULTIPROCESSOR... */
 IMPORT(cpu_info_primary, CPU_INFO_SIZEOF)
 #define	GET_CPUINFO		lda v0, cpu_info_primary
 #define	GET_CURLWP		lda v0, cpu_info_primary + CPU_INFO_CURLWP
 #define	GET_FPCURLWP		lda v0, cpu_info_primary + CPU_INFO_FPCURLWP
 #define	GET_CURPCB		lda v0, cpu_info_primary + CPU_INFO_CURPCB
 #endif /* MULTIPROCESSOR */
 #else
 #define	RCSID(_s)		__SECTIONSTRING(.ident, _s)
 #endif /* _KERNEL */