 @@ -1,14 +1,14 @@
-#	$NetBSD: genassym.cf,v 1.21 2024/01/09 04:16:24 thorpej Exp $
+#	$NetBSD: genassym.cf,v 1.22 2024/01/15 19:11:31 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.
 @@ -28,26 +28,27 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
+#
 #	@(#)genassym.c	8.3 (Berkeley) 1/4/94
+#
 include <sys/param.h>
 include <sys/buf.h>
 include <sys/proc.h>
 include <sys/mbuf.h>
 include <sys/msgbuf.h>
 include <sys/syscall.h>
 include <sys/device.h>
 include <sys/intr.h>
 include <uvm/uvm_extern.h>
 include <machine/cpu.h>
 include <machine/fcode.h>
 include <machine/psl.h>
 include <machine/pcb.h>
 include <machine/pte.h>
 # values for mmutype
 define	MMU_68040		MMU_68040
 define	MMU_68030		MMU_68030
 define	MMU_HP			MMU_HP
 @@ -94,28 +95,34 @@ export	MMU51_SRP_BITS
 export	MMU51_CRP_BITS
 export	MMU51_TCR_BITS
 export	MMU40_TCR_BITS
 # lwp & proc fields and values
 define	L_PCB			offsetof(struct lwp, l_addr)
 define	L_PROC			offsetof(struct lwp, l_proc)
 define	L_MD_REGS		offsetof(struct lwp, l_md.md_regs)
 define	L_MD_FLAGS		offsetof(struct lwp, l_md.md_flags)
 define	P_FLAG			offsetof(struct proc, p_flag)
 define	P_RASLIST		offsetof(struct proc, p_raslist)
 define	P_VMSPACE		offsetof(struct proc, p_vmspace)
 # event counter
 define	EVCNT_COUNT		offsetof(struct evcnt, ev_count)
 # interrupt/fault metering
 define	CI_NINTR		offsetof(struct cpu_info, ci_data.cpu_nintr)
 define	SPUR_INTRCNT		((sizeof(struct evcnt)*0) + offsetof(struct evcnt, ev_count32))
 define	CLOCK_INTRCNT		((sizeof(struct evcnt)*6) + offsetof(struct evcnt, ev_count32))
 define	NMI_INTRCNT		((sizeof(struct evcnt)*7) + offsetof(struct evcnt, ev_count32))
 # PSL values (should just include psl.h?)
 define	PSL_S			PSL_S
 define	PSL_IPL7		PSL_IPL7
 define	PSL_LOWIPL		PSL_LOWIPL
 define	PSL_HIGHIPL		PSL_HIGHIPL
 define	PSL_USER		PSL_USER
 define	PSL_TS			PSL_T | PSL_S
 define	SPL1			PSL_S | PSL_IPL1
 define	SPL2			PSL_S | PSL_IPL2
 define	SPL3			PSL_S | PSL_IPL3
 define	SPL4			PSL_S | PSL_IPL4
 define	SPL5			PSL_S | PSL_IPL5
 @@ -165,16 +172,13 @@ define	FPF_REGS		offsetof(struct fpframe
 define	FPF_FPCR		offsetof(struct fpframe, fpf_fpcr)
 define	FPF_FPSR		offsetof(struct fpframe, fpf_fpsr)
 define	FPF_FPI			offsetof(struct fpframe, fpf_fpiar)
 # system calls
 define	SYS_exit		SYS_exit
 define	SYS_execve		SYS_execve
 define	SYS_compat_16___sigreturn14	SYS_compat_16___sigreturn14
 define	SYS_compat_13_sigreturn13 SYS_compat_13_sigreturn13
 # errno
 define	EFAULT			EFAULT
 define	ENAMETOOLONG		ENAMETOOLONG
 # event counter
 define	EVCNT_COUNT		offsetof(struct evcnt, ev_count)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.41 2024/01/15 03:07:14 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.42 2024/01/15 19:11:31 thorpej Exp $	*/
 /*
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -597,56 +597,56 @@ Lbrkpt2:
 	rte				| all done
 /* Use common m68k sigreturn */
 #include <m68k/m68k/sigreturn.s>
 /*
  * Interrupt handlers.
  * All device interrupts are auto-vectored.  The CPU provides
  * the vector 0x18+level.  Note we count spurious interrupts, but
  * we don't do anything else with them.
  */
 ENTRY_NOPROFILE(spurintr)	/* level 0 */
-	addql	#1,_C_LABEL(intrcnt)+0
+	addql	#1,_C_LABEL(m68k_intr_evcnt)+SPUR_INTRCNT
 	INTERRUPT_SAVEREG
 	CPUINFO_INCREMENT(CI_NINTR)
 	INTERRUPT_RESTOREREG
 	jra	_ASM_LABEL(rei)
 ENTRY_NOPROFILE(lev6intr)	/* Level 6: clock */
 	INTERRUPT_SAVEREG
 	/* XXX */
 	movl _C_LABEL(clockbase), %a0
 	movl %a0@, %d0
 	movl %d0, %a0@
 	btst #2, %d0
 	jeq 1f
-	addql	#1,_C_LABEL(intrcnt)+24
+	addql	#1,_C_LABEL(m68k_intr_evcnt)+CLOCK_INTRCNT
 	lea	%sp@(0), %a1		| a1 = &clockframe
 	movl	%a1, %sp@-
 	jbsr	_C_LABEL(hardclock)	| hardclock(&frame)
 	addql	#4, %sp
 	jra 2f
 :
 	movl	%d0, %sp@-
 	jbsr	_C_LABEL(otherclock)
 	addql	#4, %sp
 :
 	INTERRUPT_RESTOREREG
 	jra	_ASM_LABEL(rei)		| all done
 ENTRY_NOPROFILE(lev7intr)	/* level 7: parity errors, reset key */
-	addql	#1,_C_LABEL(intrcnt)+28
+	addql	#1,_C_LABEL(m68k_intr_evcnt)+NMI_INTRCNT
 	clrl	%sp@-
 	moveml	#0xFFFF,%sp@-		| save registers
 	movl	%usp,%a0			| and save
 	movl	%a0,%sp@(FR_SP)		|   the user stack pointer
 	jbsr	_C_LABEL(nmihand)	| call handler
 	movl	%sp@(FR_SP),%a0		| restore
 	movl	%a0,%usp			|   user SP
 	moveml	%sp@+,#0x7FFF		| and remaining registers
 	addql	#8,%sp			| pop SP and stack adjust
 	jra	_ASM_LABEL(rei)		| all done
 /*
  * Emulation of VAX REI instruction.
 @@ -834,29 +834,13 @@ GLOBAL(cputype)
 	.long	CPU_68020	| default to 68020 CPU
 GLOBAL(fputype)
 	.long	FPU_68881	| default to 68881 FPU
 GLOBAL(prototc)
 	.long	0		| prototype translation control
 #ifdef DEBUG
 	.globl	fulltflush, fullcflush
 fulltflush:
 	.long	0
 fullcflush:
 	.long	0
 #endif
 /* interrupt counters */
 GLOBAL(intrnames)
 	.asciz	"spur"
 	.asciz	"lev1"
 	.asciz	"lev2"
 	.asciz	"lev3"
 	.asciz	"lev4"
 	.asciz	"lev5"
 	.asciz	"clock"
 	.asciz	"nmi"
 GLOBAL(eintrnames)
 	.even
 GLOBAL(intrcnt)
 	.long	0,0,0,0,0,0,0,0
 GLOBAL(eintrcnt)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intr.h,v 1.16 2024/01/15 03:07:14 thorpej Exp $	*/
+/*	$NetBSD: intr.h,v 1.17 2024/01/15 19:11:31 thorpej Exp $	*/
 /*-
  * Copyright (c) 2024 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * 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.
 @@ -31,16 +31,19 @@
 #ifndef _LUNA68K_INTR_H_
 #define _LUNA68K_INTR_H_
 #include <m68k/psl.h>
 #define	MACHINE_PSL_IPL_SOFTCLOCK	PSL_IPL1
 #define	MACHINE_PSL_IPL_SOFTBIO		PSL_IPL1
 #define	MACHINE_PSL_IPL_SOFTNET		PSL_IPL1
 #define	MACHINE_PSL_IPL_SOFTSERIAL	PSL_IPL1
 #define	MACHINE_PSL_IPL_VM		PSL_IPL4
 #define	MACHINE_PSL_IPL_SCHED		PSL_IPL6
 #define	MACHINE_INTREVCNT_NAMES						\
 	{ "spur", "lev1", "lev2", "lev3", "lev4", "lev5", "clock", "nmi" }
 #include <m68k/intr.h>
 #endif	/* _LUNA68K_INTR_H */

 @@ -1,5 +1,3 @@
-/* $NetBSD: types.h,v 1.7 2021/04/01 04:43:00 simonb Exp $ */
+/* $NetBSD: types.h,v 1.8 2024/01/15 19:11:31 thorpej Exp $ */
 #include <m68k/types.h>
 #define	__HAVE_LEGACY_INTRCNT