Module Name: src
Committed By: thorpej
Date: Mon Jan 15 19:28:06 UTC 2024
Modified Files:
src/sys/arch/cesfic/cesfic: genassym.cf locore.s
src/sys/arch/cesfic/include: vectors.h
Log Message:
No need for our own spurious interrupt handler now that m68k_intr.c
handles them for us.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/cesfic/cesfic/genassym.cf
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/cesfic/include/vectors.h
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/cesfic/cesfic/genassym.cf
diff -u src/sys/arch/cesfic/cesfic/genassym.cf:1.22 src/sys/arch/cesfic/cesfic/genassym.cf:1.23
--- src/sys/arch/cesfic/cesfic/genassym.cf:1.22 Mon Jan 15 19:11:31 2024
+++ src/sys/arch/cesfic/cesfic/genassym.cf Mon Jan 15 19:28:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.22 2024/01/15 19:11:31 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.23 2024/01/15 19:28:06 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -110,7 +110,6 @@ define EVCNT_COUNT offsetof(struct evcn
# 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))
Index: src/sys/arch/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.42 src/sys/arch/cesfic/cesfic/locore.s:1.43
--- src/sys/arch/cesfic/cesfic/locore.s:1.42 Mon Jan 15 19:11:31 2024
+++ src/sys/arch/cesfic/cesfic/locore.s Mon Jan 15 19:28:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.42 2024/01/15 19:11:31 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.43 2024/01/15 19:28:06 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -601,18 +601,8 @@ Lbrkpt2:
/*
* 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(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 */
Index: src/sys/arch/cesfic/include/vectors.h
diff -u src/sys/arch/cesfic/include/vectors.h:1.2 src/sys/arch/cesfic/include/vectors.h:1.3
--- src/sys/arch/cesfic/include/vectors.h:1.2 Mon Jan 15 03:07:14 2024
+++ src/sys/arch/cesfic/include/vectors.h Mon Jan 15 19:28:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vectors.h,v 1.2 2024/01/15 03:07:14 thorpej Exp $ */
+/* $NetBSD: vectors.h,v 1.3 2024/01/15 19:28:06 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <m68k/vectors.h>
-#define MACHINE_AV0_HANDLER spurintr
+#define MACHINE_AV0_HANDLER intrstub_autovec
#define MACHINE_AV1_HANDLER intrstub_autovec
#define MACHINE_AV2_HANDLER intrstub_autovec
#define MACHINE_AV3_HANDLER intrstub_autovec
