Module Name: src
Committed By: thorpej
Date: Mon Jan 15 02:40:52 UTC 2024
Modified Files:
src/sys/arch/cesfic/cesfic: locore.s
src/sys/arch/cesfic/conf: files.cesfic
Added Files:
src/sys/arch/cesfic/include: vectors.h
Removed Files:
src/sys/arch/cesfic/cesfic: vectors.s
Log Message:
Switch cesfic over to the common vector table.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.4 -r0 src/sys/arch/cesfic/cesfic/vectors.s
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cesfic/conf/files.cesfic
cvs rdiff -u -r0 -r1.1 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/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.39 src/sys/arch/cesfic/cesfic/locore.s:1.40
--- src/sys/arch/cesfic/cesfic/locore.s:1.39 Tue Jan 9 07:28:25 2024
+++ src/sys/arch/cesfic/cesfic/locore.s Mon Jan 15 02:40:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.39 2024/01/09 07:28:25 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.40 2024/01/15 02:40:52 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -107,10 +107,7 @@ GLOBAL(kernel_text)
.space PAGE_SIZE
ASLOCAL(tmpstk)
-#include <cesfic/cesfic/vectors.s>
-
.text
-
/*
* Macro to relocate a symbol, used before MMU is enabled.
*/
@@ -323,15 +320,14 @@ Lenab1:
nop
nop
nop
- movl #_C_LABEL(vectab),%d0 | set Vector Base Register
- movc %d0,%vbr
moveq #0,%d0 | ensure TT regs are disabled
.long 0x4e7b0004 | movc d0,itt0
.long 0x4e7b0005 | movc d0,itt1
.long 0x4e7b0006 | movc d0,dtt0
.long 0x4e7b0007 | movc d0,dtt1
- lea _ASM_LABEL(tmpstk),%sp | temporary stack
+ lea _ASM_LABEL(tmpstk),%sp | re-load temporary stack
+ jbsr _C_LABEL(vec_init) | initialize vector table
/* call final pmap setup */
jbsr _C_LABEL(pmap_bootstrap_finalize)
/* set kernel stack, user SP */
Index: src/sys/arch/cesfic/conf/files.cesfic
diff -u src/sys/arch/cesfic/conf/files.cesfic:1.19 src/sys/arch/cesfic/conf/files.cesfic:1.20
--- src/sys/arch/cesfic/conf/files.cesfic:1.19 Tue Jan 9 04:16:24 2024
+++ src/sys/arch/cesfic/conf/files.cesfic Mon Jan 15 02:40:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.cesfic,v 1.19 2024/01/09 04:16:24 thorpej Exp $
+# $NetBSD: files.cesfic,v 1.20 2024/01/15 02:40:52 thorpej Exp $
#
# cesfic-specific configuration info
@@ -63,6 +63,7 @@ file arch/m68k/m68k/mmu_subr.s
file arch/m68k/m68k/pmap_motorola.c
file arch/m68k/m68k/procfs_machdep.c procfs
file arch/m68k/m68k/sys_machdep.c
+file arch/m68k/m68k/vectors.c
file arch/m68k/m68k/vm_machdep.c
file dev/cons.c
Added files:
Index: src/sys/arch/cesfic/include/vectors.h
diff -u /dev/null src/sys/arch/cesfic/include/vectors.h:1.1
--- /dev/null Mon Jan 15 02:40:52 2024
+++ src/sys/arch/cesfic/include/vectors.h Mon Jan 15 02:40:52 2024
@@ -0,0 +1,50 @@
+/* $NetBSD: vectors.h,v 1.1 2024/01/15 02:40:52 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.
+ * 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
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION 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.
+ */
+
+#ifndef _CESFIC_VECTORS_H_
+#define _CESFIC_VECTORS_H_
+
+#ifdef _KERNEL
+
+#include <m68k/vectors.h>
+
+#define MACHINE_AV0_HANDLER spurintr
+#define MACHINE_AV1_HANDLER intrhand
+#define MACHINE_AV2_HANDLER intrhand
+#define MACHINE_AV3_HANDLER intrhand
+#define MACHINE_AV4_HANDLER intrhand
+#define MACHINE_AV5_HANDLER intrhand
+#define MACHINE_AV6_HANDLER lev6intr
+#define MACHINE_AV7_HANDLER lev7intr
+
+#endif /* _KERNEL */
+
+#endif /* _CESFIC_VECTORS_H_ */
