Module Name: src
Committed By: thorpej
Date: Mon Jan 15 20:10:34 UTC 2024
Modified Files:
src/sys/arch/luna68k/include: intr.h types.h
src/sys/arch/luna68k/luna68k: genassym.cf locore.s
Log Message:
G/C __HAVE_LEGACY_INTRCNT from luna68k.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/luna68k/include/intr.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/luna68k/include/types.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/luna68k/luna68k/genassym.cf
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/luna68k/luna68k/locore.s
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/luna68k/include/intr.h
diff -u src/sys/arch/luna68k/include/intr.h:1.17 src/sys/arch/luna68k/include/intr.h:1.18
--- src/sys/arch/luna68k/include/intr.h:1.17 Mon Jan 15 02:16:52 2024
+++ src/sys/arch/luna68k/include/intr.h Mon Jan 15 20:10:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.17 2024/01/15 02:16:52 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.18 2024/01/15 20:10:33 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -41,6 +41,9 @@
#define MACHINE_PSL_IPL_VM PSL_IPL4
#define MACHINE_PSL_IPL_SCHED PSL_IPL5
+#define MACHINE_INTREVCNT_NAMES \
+ { "spur", "lev1", "scsi", "network", "lev4", "clock", "serial", "nmi" }
+
#include <m68k/intr.h>
#endif /* _LUNA68K_INTR_H */
Index: src/sys/arch/luna68k/include/types.h
diff -u src/sys/arch/luna68k/include/types.h:1.9 src/sys/arch/luna68k/include/types.h:1.10
--- src/sys/arch/luna68k/include/types.h:1.9 Tue Jul 5 15:37:13 2022
+++ src/sys/arch/luna68k/include/types.h Mon Jan 15 20:10:33 2024
@@ -1,5 +1,3 @@
-/* $NetBSD: types.h,v 1.9 2022/07/05 15:37:13 tsutsui Exp $ */
+/* $NetBSD: types.h,v 1.10 2024/01/15 20:10:33 thorpej Exp $ */
#include <m68k/types.h>
-
-#define __HAVE_LEGACY_INTRCNT
Index: src/sys/arch/luna68k/luna68k/genassym.cf
diff -u src/sys/arch/luna68k/luna68k/genassym.cf:1.27 src/sys/arch/luna68k/luna68k/genassym.cf:1.28
--- src/sys/arch/luna68k/luna68k/genassym.cf:1.27 Tue Jan 9 04:16:25 2024
+++ src/sys/arch/luna68k/luna68k/genassym.cf Mon Jan 15 20:10:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.27 2024/01/09 04:16:25 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.28 2024/01/15 20:10:34 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -110,6 +110,8 @@ define P_VMSPACE offsetof(struct proc,
# interrupt/fault metering
define CI_NINTR offsetof(struct cpu_info, ci_data.cpu_nintr)
+define CLOCK_INTRCNT ((sizeof(struct evcnt)*5) + offsetof(struct evcnt, ev_count32))
+define NMI_INTRCNT ((sizeof(struct evcnt)*7) + offsetof(struct evcnt, ev_count32))
define T_BUSERR T_BUSERR
define T_ADDRERR T_ADDRERR
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.78 src/sys/arch/luna68k/luna68k/locore.s:1.79
--- src/sys/arch/luna68k/luna68k/locore.s:1.78 Mon Jan 15 19:30:15 2024
+++ src/sys/arch/luna68k/luna68k/locore.s Mon Jan 15 20:10:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.78 2024/01/15 19:30:15 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.79 2024/01/15 20:10:34 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -555,7 +555,7 @@ Lbrkpt3:
*/
ENTRY_NOPROFILE(lev7intr) /* Level 7: NMI */
- addql #1,_C_LABEL(intrcnt)+32
+ addql #1,_C_LABEL(m68k_intr_evcnt)+NMI_INTRCNT
clrl %sp@-
moveml #0xFFFF,%sp@- | save registers
movl %usp,%a0 | and save
@@ -580,7 +580,7 @@ ENTRY_NOPROFILE(lev5intr)
movl %a1,%sp@-
jbsr _C_LABEL(hardclock) | hardclock(&frame)
addql #4,%sp
- addql #1,_C_LABEL(intrcnt)+20
+ addql #1,_C_LABEL(m68k_intr_evcnt)+CLOCK_INTRCNT
INTERRUPT_RESTOREREG
1:
subql #1,_C_LABEL(idepth)
@@ -830,19 +830,3 @@ GLOBAL(intiobase_phys)
.long 0 | PA of board's I/O registers
GLOBAL(intiotop_phys)
.long 0 | PA of top of board's I/O registers
-
-GLOBAL(intrnames)
- .asciz "spur"
- .asciz "lev1"
- .asciz "scsi"
- .asciz "network"
- .asciz "lev4"
- .asciz "clock"
- .asciz "serial"
- .asciz "nmi"
- .asciz "statclock"
-GLOBAL(eintrnames)
- .even
-GLOBAL(intrcnt)
- .long 0,0,0,0,0,0,0,0,0
-GLOBAL(eintrcnt)
