Module Name: src
Committed By: thorpej
Date: Wed Dec 27 17:35:37 UTC 2023
Modified Files:
src/sys/arch/amiga/amiga: genassym.cf trap.c
src/sys/arch/atari/atari: genassym.cf
src/sys/arch/cesfic/cesfic: genassym.cf
src/sys/arch/hp300/hp300: genassym.cf
src/sys/arch/hp300/include: cacheops_machdep.h
src/sys/arch/luna68k/luna68k: genassym.cf trap.c
src/sys/arch/m68k/include: cacheops_40.h cacheops_60.h cpu.h
src/sys/arch/mac68k/mac68k: genassym.cf
src/sys/arch/mvme68k/mvme68k: genassym.cf
src/sys/arch/news68k/news68k: genassym.cf
src/sys/arch/next68k/next68k: genassym.cf
src/sys/arch/sun2/sun2: genassym.cf pmap.c trap.c
src/sys/arch/sun3/sun3: cache.c genassym.cf pmap.c trap.c
src/sys/arch/sun3/sun3x: genassym.cf
src/sys/arch/x68k/x68k: genassym.cf
Added Files:
src/sys/arch/amiga/include: fcode.h
src/sys/arch/atari/include: fcode.h
src/sys/arch/cesfic/include: fcode.h
src/sys/arch/hp300/include: fcode.h
src/sys/arch/luna68k/include: fcode.h
src/sys/arch/m68k/include: fcode.h
src/sys/arch/mac68k/include: fcode.h
src/sys/arch/mvme68k/include: fcode.h
src/sys/arch/news68k/include: fcode.h
src/sys/arch/next68k/include: fcode.h
src/sys/arch/sun2/include: fcode.h
src/sys/arch/sun3/include: fcode.h
src/sys/arch/x68k/include: fcode.h
Removed Files:
src/sys/arch/sun2/sun2: fc.h
src/sys/arch/sun3/sun3: fc.h
Log Message:
Re-factor the 680x0 Function Code definitions into their own
separate file (as was done on the sun2/sun3 ports ages ago)
and switch everyone to the common header.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amiga/amiga/genassym.cf
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/amiga/amiga/trap.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/amiga/include/fcode.h
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/atari/atari/genassym.cf
cvs rdiff -u -r0 -r1.1 src/sys/arch/atari/include/fcode.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cesfic/cesfic/genassym.cf
cvs rdiff -u -r0 -r1.1 src/sys/arch/cesfic/include/fcode.h
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/hp300/hp300/genassym.cf
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/include/cacheops_machdep.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/hp300/include/fcode.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/luna68k/include/fcode.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/luna68k/luna68k/genassym.cf
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/luna68k/luna68k/trap.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/m68k/include/cacheops_40.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/m68k/include/cacheops_60.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/m68k/include/cpu.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/m68k/include/fcode.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/mac68k/include/fcode.h
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/mac68k/mac68k/genassym.cf
cvs rdiff -u -r0 -r1.1 src/sys/arch/mvme68k/include/fcode.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/mvme68k/mvme68k/genassym.cf
cvs rdiff -u -r0 -r1.1 src/sys/arch/news68k/include/fcode.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/news68k/news68k/genassym.cf
cvs rdiff -u -r0 -r1.1 src/sys/arch/next68k/include/fcode.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/next68k/next68k/genassym.cf
cvs rdiff -u -r0 -r1.1 src/sys/arch/sun2/include/fcode.h
cvs rdiff -u -r1.4 -r0 src/sys/arch/sun2/sun2/fc.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sun2/sun2/genassym.cf
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sun2/sun2/pmap.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/sun2/sun2/trap.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/sun3/include/fcode.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sun3/sun3/cache.c
cvs rdiff -u -r1.5 -r0 src/sys/arch/sun3/sun3/fc.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sun3/sun3/genassym.cf
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/sun3/sun3/pmap.c
cvs rdiff -u -r1.148 -r1.149 src/sys/arch/sun3/sun3/trap.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sun3/sun3x/genassym.cf
cvs rdiff -u -r0 -r1.1 src/sys/arch/x68k/include/fcode.h
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x68k/x68k/genassym.cf
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/amiga/amiga/genassym.cf
diff -u src/sys/arch/amiga/amiga/genassym.cf:1.34 src/sys/arch/amiga/amiga/genassym.cf:1.35
--- src/sys/arch/amiga/amiga/genassym.cf:1.34 Wed Dec 27 03:03:40 2023
+++ src/sys/arch/amiga/amiga/genassym.cf Wed Dec 27 17:35:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.34 2023/12/27 03:03:40 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.35 2023/12/27 17:35:34 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -41,6 +41,7 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
+include <machine/fcode.h>
include <machine/psl.h>
include <machine/pcb.h>
include <machine/pte.h>
Index: src/sys/arch/amiga/amiga/trap.c
diff -u src/sys/arch/amiga/amiga/trap.c:1.140 src/sys/arch/amiga/amiga/trap.c:1.141
--- src/sys/arch/amiga/amiga/trap.c:1.140 Thu Oct 5 19:41:03 2023
+++ src/sys/arch/amiga/amiga/trap.c Wed Dec 27 17:35:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.140 2023/10/05 19:41:03 ad Exp $ */
+/* $NetBSD: trap.c,v 1.141 2023/12/27 17:35:34 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.140 2023/10/05 19:41:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.141 2023/12/27 17:35:34 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,6 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.1
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/cpu.h>
+#include <machine/fcode.h>
#include <machine/pcb.h>
#include <machine/pte.h>
Index: src/sys/arch/atari/atari/genassym.cf
diff -u src/sys/arch/atari/atari/genassym.cf:1.37 src/sys/arch/atari/atari/genassym.cf:1.38
--- src/sys/arch/atari/atari/genassym.cf:1.37 Wed Dec 27 03:03:41 2023
+++ src/sys/arch/atari/atari/genassym.cf Wed Dec 27 17:35:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.37 2023/12/27 03:03:41 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.38 2023/12/27 17:35:34 thorpej Exp $
#-
# Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -43,6 +43,7 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
include <machine/cpu.h>
+include <machine/fcode.h>
include <machine/trap.h>
include <machine/psl.h>
include <machine/pcb.h>
Index: src/sys/arch/cesfic/cesfic/genassym.cf
diff -u src/sys/arch/cesfic/cesfic/genassym.cf:1.19 src/sys/arch/cesfic/cesfic/genassym.cf:1.20
--- src/sys/arch/cesfic/cesfic/genassym.cf:1.19 Wed Dec 27 16:20:39 2023
+++ src/sys/arch/cesfic/cesfic/genassym.cf Wed Dec 27 17:35:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.19 2023/12/27 16:20:39 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.20 2023/12/27 17:35:34 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -42,6 +42,7 @@ include <sys/device.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>
Index: src/sys/arch/hp300/hp300/genassym.cf
diff -u src/sys/arch/hp300/hp300/genassym.cf:1.49 src/sys/arch/hp300/hp300/genassym.cf:1.50
--- src/sys/arch/hp300/hp300/genassym.cf:1.49 Wed Dec 27 16:20:39 2023
+++ src/sys/arch/hp300/hp300/genassym.cf Wed Dec 27 17:35:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.49 2023/12/27 16:20:39 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.50 2023/12/27 17:35:34 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -42,6 +42,7 @@ include <uvm/uvm.h>
include <machine/hp300spu.h>
include <machine/cpu.h>
+include <machine/fcode.h>
include <machine/frame.h>
include <machine/intr.h>
include <machine/psl.h>
Index: src/sys/arch/hp300/include/cacheops_machdep.h
diff -u src/sys/arch/hp300/include/cacheops_machdep.h:1.7 src/sys/arch/hp300/include/cacheops_machdep.h:1.8
--- src/sys/arch/hp300/include/cacheops_machdep.h:1.7 Thu Feb 16 20:17:13 2006
+++ src/sys/arch/hp300/include/cacheops_machdep.h Wed Dec 27 17:35:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cacheops_machdep.h,v 1.7 2006/02/16 20:17:13 perry Exp $ */
+/* $NetBSD: cacheops_machdep.h,v 1.8 2023/12/27 17:35:34 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -73,6 +73,8 @@
#ifndef _HP300_CACHEOPS_MACHDEP_H_
#define _HP300_CACHEOPS_MACHDEP_H_
+#include <machine/fcode.h>
+
extern vaddr_t MMUbase;
static __inline int __attribute__((__unused__))
Index: src/sys/arch/luna68k/luna68k/genassym.cf
diff -u src/sys/arch/luna68k/luna68k/genassym.cf:1.24 src/sys/arch/luna68k/luna68k/genassym.cf:1.25
--- src/sys/arch/luna68k/luna68k/genassym.cf:1.24 Wed Dec 27 03:03:41 2023
+++ src/sys/arch/luna68k/luna68k/genassym.cf Wed Dec 27 17:35:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.24 2023/12/27 03:03:41 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.25 2023/12/27 17:35:35 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -41,6 +41,7 @@ include <sys/syscall.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>
Index: src/sys/arch/luna68k/luna68k/trap.c
diff -u src/sys/arch/luna68k/luna68k/trap.c:1.78 src/sys/arch/luna68k/luna68k/trap.c:1.79
--- src/sys/arch/luna68k/luna68k/trap.c:1.78 Thu Oct 5 19:41:04 2023
+++ src/sys/arch/luna68k/luna68k/trap.c Wed Dec 27 17:35:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.78 2023/10/05 19:41:04 ad Exp $ */
+/* $NetBSD: trap.c,v 1.79 2023/12/27 17:35:35 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.78 2023/10/05 19:41:04 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.79 2023/12/27 17:35:35 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -63,6 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.7
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/cpu.h>
+#include <machine/fcode.h>
#include <machine/reg.h>
#include <machine/db_machdep.h>
Index: src/sys/arch/m68k/include/cacheops_40.h
diff -u src/sys/arch/m68k/include/cacheops_40.h:1.11 src/sys/arch/m68k/include/cacheops_40.h:1.12
--- src/sys/arch/m68k/include/cacheops_40.h:1.11 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/m68k/include/cacheops_40.h Wed Dec 27 17:35:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cacheops_40.h,v 1.11 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: cacheops_40.h,v 1.12 2023/12/27 17:35:35 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -29,6 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <machine/fcode.h>
+
/*
* Invalidate entire TLB.
*/
Index: src/sys/arch/m68k/include/cacheops_60.h
diff -u src/sys/arch/m68k/include/cacheops_60.h:1.14 src/sys/arch/m68k/include/cacheops_60.h:1.15
--- src/sys/arch/m68k/include/cacheops_60.h:1.14 Tue Sep 26 14:33:55 2023
+++ src/sys/arch/m68k/include/cacheops_60.h Wed Dec 27 17:35:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cacheops_60.h,v 1.14 2023/09/26 14:33:55 tsutsui Exp $ */
+/* $NetBSD: cacheops_60.h,v 1.15 2023/12/27 17:35:35 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -29,6 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <machine/fcode.h>
+
/*
* Invalidate entire TLB.
*/
Index: src/sys/arch/m68k/include/cpu.h
diff -u src/sys/arch/m68k/include/cpu.h:1.17 src/sys/arch/m68k/include/cpu.h:1.18
--- src/sys/arch/m68k/include/cpu.h:1.17 Sun Dec 1 15:34:44 2019
+++ src/sys/arch/m68k/include/cpu.h Wed Dec 27 17:35:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.17 2019/12/01 15:34:44 ad Exp $ */
+/* $NetBSD: cpu.h,v 1.18 2023/12/27 17:35:35 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -103,16 +103,6 @@
#define MMU40_GLB 0x400
#define MMU40_BE 0x800
-/* XXX - Move this stuff into <m68k/fcode.h> maybe? */
-
-/* 680X0 function codes */
-#define FC_USERD 1 /* user data space */
-#define FC_USERP 2 /* user program space */
-#define FC_PURGE 3 /* HPMMU: clear TLB entries */
-#define FC_SUPERD 5 /* supervisor data space */
-#define FC_SUPERP 6 /* supervisor program space */
-#define FC_CPU 7 /* CPU space */
-
/* XXX - Move this stuff into <m68k/cacr.h> maybe? */
/* fields in the 68020 cache control register */
Index: src/sys/arch/mac68k/mac68k/genassym.cf
diff -u src/sys/arch/mac68k/mac68k/genassym.cf:1.42 src/sys/arch/mac68k/mac68k/genassym.cf:1.43
--- src/sys/arch/mac68k/mac68k/genassym.cf:1.42 Wed Dec 27 03:03:41 2023
+++ src/sys/arch/mac68k/mac68k/genassym.cf Wed Dec 27 17:35:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.42 2023/12/27 03:03:41 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.43 2023/12/27 17:35:35 thorpej Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
@@ -41,6 +41,7 @@ include <sys/syscall.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>
Index: src/sys/arch/mvme68k/mvme68k/genassym.cf
diff -u src/sys/arch/mvme68k/mvme68k/genassym.cf:1.39 src/sys/arch/mvme68k/mvme68k/genassym.cf:1.40
--- src/sys/arch/mvme68k/mvme68k/genassym.cf:1.39 Wed Dec 27 03:03:41 2023
+++ src/sys/arch/mvme68k/mvme68k/genassym.cf Wed Dec 27 17:35:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.39 2023/12/27 03:03:41 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.40 2023/12/27 17:35:36 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -42,6 +42,7 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
include <machine/cpu.h>
+include <machine/fcode.h>
include <machine/psl.h>
include <machine/pcb.h>
include <machine/prom.h>
Index: src/sys/arch/news68k/news68k/genassym.cf
diff -u src/sys/arch/news68k/news68k/genassym.cf:1.31 src/sys/arch/news68k/news68k/genassym.cf:1.32
--- src/sys/arch/news68k/news68k/genassym.cf:1.31 Wed Dec 27 03:03:42 2023
+++ src/sys/arch/news68k/news68k/genassym.cf Wed Dec 27 17:35:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.31 2023/12/27 03:03:42 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.32 2023/12/27 17:35:36 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -42,6 +42,7 @@ include <uvm/uvm.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>
Index: src/sys/arch/next68k/next68k/genassym.cf
diff -u src/sys/arch/next68k/next68k/genassym.cf:1.30 src/sys/arch/next68k/next68k/genassym.cf:1.31
--- src/sys/arch/next68k/next68k/genassym.cf:1.30 Wed Dec 27 03:03:42 2023
+++ src/sys/arch/next68k/next68k/genassym.cf Wed Dec 27 17:35:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.30 2023/12/27 03:03:42 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.31 2023/12/27 17:35:36 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -41,6 +41,7 @@ include <sys/syscall.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>
Index: src/sys/arch/sun2/sun2/genassym.cf
diff -u src/sys/arch/sun2/sun2/genassym.cf:1.14 src/sys/arch/sun2/sun2/genassym.cf:1.15
--- src/sys/arch/sun2/sun2/genassym.cf:1.14 Thu Feb 20 08:27:39 2020
+++ src/sys/arch/sun2/sun2/genassym.cf Wed Dec 27 17:35:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.14 2020/02/20 08:27:39 skrll Exp $
+# $NetBSD: genassym.cf,v 1.15 2023/12/27 17:35:36 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -76,6 +76,7 @@ include <uvm/uvm_extern.h>
include <machine/cpu.h>
include <machine/dvma.h>
+include <machine/fcode.h>
include <machine/mon.h>
include <machine/pcb.h>
include <machine/pmap.h>
@@ -85,7 +86,6 @@ include <machine/vmparam.h>
include <sun2/sun2/buserr.h>
include <sun2/sun2/control.h>
-include <sun2/sun2/fc.h>
include <sun2/sun2/enable.h>
include <dev/ic/am9513reg.h>
Index: src/sys/arch/sun2/sun2/pmap.c
diff -u src/sys/arch/sun2/sun2/pmap.c:1.51 src/sys/arch/sun2/sun2/pmap.c:1.52
--- src/sys/arch/sun2/sun2/pmap.c:1.51 Fri Dec 22 19:53:47 2023
+++ src/sys/arch/sun2/sun2/pmap.c Wed Dec 27 17:35:36 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.51 2023/12/22 19:53:47 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.52 2023/12/27 17:35:36 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.51 2023/12/22 19:53:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.52 2023/12/27 17:35:36 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -108,7 +108,6 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.5
#include <machine/vmparam.h>
#include <sun2/sun2/control.h>
-#include <sun2/sun2/fc.h>
#include <sun2/sun2/machdep.h>
#ifdef DDB
Index: src/sys/arch/sun2/sun2/trap.c
diff -u src/sys/arch/sun2/sun2/trap.c:1.47 src/sys/arch/sun2/sun2/trap.c:1.48
--- src/sys/arch/sun2/sun2/trap.c:1.47 Thu Oct 5 19:41:06 2023
+++ src/sys/arch/sun2/sun2/trap.c Wed Dec 27 17:35:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.47 2023/10/05 19:41:06 ad Exp $ */
+/* $NetBSD: trap.c,v 1.48 2023/12/27 17:35:37 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.47 2023/10/05 19:41:06 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.48 2023/12/27 17:35:37 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -106,13 +106,13 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.4
#include <machine/cpu.h>
#include <machine/endian.h>
+#include <machine/fcode.h>
#include <machine/pcb.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/reg.h>
#include <machine/promlib.h>
-#include <sun2/sun2/fc.h>
#include <sun2/sun2/machdep.h>
#ifdef DDB
Index: src/sys/arch/sun3/sun3/cache.c
diff -u src/sys/arch/sun3/sun3/cache.c:1.23 src/sys/arch/sun3/sun3/cache.c:1.24
--- src/sys/arch/sun3/sun3/cache.c:1.23 Wed Dec 20 05:18:00 2023
+++ src/sys/arch/sun3/sun3/cache.c Wed Dec 27 17:35:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.c,v 1.23 2023/12/20 05:18:00 thorpej Exp $ */
+/* $NetBSD: cache.c,v 1.24 2023/12/27 17:35:37 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.23 2023/12/20 05:18:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.24 2023/12/27 17:35:37 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,13 +45,13 @@ __KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
+#include <machine/fcode.h>
#include <machine/pte.h>
#include <machine/vmparam.h>
#include <sun3/sun3/cache.h>
#include <sun3/sun3/control.h>
#include <sun3/sun3/enable.h>
-#include <sun3/sun3/fc.h>
#include <sun3/sun3/machdep.h>
#define CACHE_LINE 16 /* bytes */
Index: src/sys/arch/sun3/sun3/genassym.cf
diff -u src/sys/arch/sun3/sun3/genassym.cf:1.19 src/sys/arch/sun3/sun3/genassym.cf:1.20
--- src/sys/arch/sun3/sun3/genassym.cf:1.19 Mon Aug 10 10:59:34 2020
+++ src/sys/arch/sun3/sun3/genassym.cf Wed Dec 27 17:35:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.19 2020/08/10 10:59:34 rin Exp $
+# $NetBSD: genassym.cf,v 1.20 2023/12/27 17:35:37 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -76,6 +76,7 @@ include <uvm/uvm_extern.h>
include <machine/cpu.h>
include <machine/dvma.h>
+include <machine/fcode.h>
include <machine/mon.h>
include <machine/pcb.h>
include <machine/pmap.h>
@@ -86,7 +87,6 @@ include <machine/vmparam.h>
include <sun3/sun3/buserr.h>
include <sun3/sun3/cache.h>
include <sun3/sun3/control.h>
-include <sun3/sun3/fc.h>
include <sun3/sun3/enable.h>
Index: src/sys/arch/sun3/sun3/pmap.c
diff -u src/sys/arch/sun3/sun3/pmap.c:1.176 src/sys/arch/sun3/sun3/pmap.c:1.177
--- src/sys/arch/sun3/sun3/pmap.c:1.176 Fri Dec 22 19:53:47 2023
+++ src/sys/arch/sun3/sun3/pmap.c Wed Dec 27 17:35:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.176 2023/12/22 19:53:47 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.177 2023/12/27 17:35:37 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.176 2023/12/22 19:53:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.177 2023/12/27 17:35:37 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -98,6 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.1
#include <machine/cpu.h>
#include <machine/dvma.h>
+#include <machine/fcode.h>
#include <machine/idprom.h>
#include <machine/kcore.h>
#include <machine/mon.h>
@@ -108,7 +109,6 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.1
#include <sun3/sun3/cache.h>
#include <sun3/sun3/control.h>
-#include <sun3/sun3/fc.h>
#include <sun3/sun3/machdep.h>
#include <sun3/sun3/obmem.h>
Index: src/sys/arch/sun3/sun3/trap.c
diff -u src/sys/arch/sun3/sun3/trap.c:1.148 src/sys/arch/sun3/sun3/trap.c:1.149
--- src/sys/arch/sun3/sun3/trap.c:1.148 Thu Oct 5 19:41:06 2023
+++ src/sys/arch/sun3/sun3/trap.c Wed Dec 27 17:35:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.148 2023/10/05 19:41:06 ad Exp $ */
+/* $NetBSD: trap.c,v 1.149 2023/12/27 17:35:37 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.148 2023/10/05 19:41:06 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.149 2023/12/27 17:35:37 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -106,13 +106,13 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.1
#include <machine/cpu.h>
#include <machine/endian.h>
+#include <machine/fcode.h>
#include <machine/pcb.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/reg.h>
#include <m68k/cacheops.h>
-#include <sun3/sun3/fc.h>
#include <sun3/sun3/machdep.h>
#ifdef DDB
Index: src/sys/arch/sun3/sun3x/genassym.cf
diff -u src/sys/arch/sun3/sun3x/genassym.cf:1.16 src/sys/arch/sun3/sun3x/genassym.cf:1.17
--- src/sys/arch/sun3/sun3x/genassym.cf:1.16 Thu Feb 20 08:27:40 2020
+++ src/sys/arch/sun3/sun3x/genassym.cf Wed Dec 27 17:35:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.16 2020/02/20 08:27:40 skrll Exp $
+# $NetBSD: genassym.cf,v 1.17 2023/12/27 17:35:37 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -76,6 +76,7 @@ include <uvm/uvm_extern.h>
include <machine/cpu.h>
include <machine/dvma.h>
+include <machine/fcode.h>
include <machine/mon.h>
include <machine/pcb.h>
include <machine/pmap.h>
@@ -85,7 +86,6 @@ include <machine/vmparam.h>
include <sun3/sun3/buserr.h>
include <sun3/sun3/cache.h>
-include <sun3/sun3/fc.h>
include <sun3/sun3x/enable.h>
Index: src/sys/arch/x68k/x68k/genassym.cf
diff -u src/sys/arch/x68k/x68k/genassym.cf:1.38 src/sys/arch/x68k/x68k/genassym.cf:1.39
--- src/sys/arch/x68k/x68k/genassym.cf:1.38 Wed Dec 27 03:03:42 2023
+++ src/sys/arch/x68k/x68k/genassym.cf Wed Dec 27 17:35:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.38 2023/12/27 03:03:42 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.39 2023/12/27 17:35:37 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -41,6 +41,7 @@ include <sys/syscall.h>
include <uvm/uvm.h>
include <machine/cpu.h>
+include <machine/fcode.h>
include <machine/psl.h>
include <machine/pcb.h>
include <machine/pte.h>
Added files:
Index: src/sys/arch/amiga/include/fcode.h
diff -u /dev/null src/sys/arch/amiga/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/amiga/include/fcode.h Wed Dec 27 17:35:34 2023
@@ -0,0 +1,3 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:34 thorpej Exp $ */
+
+#include <m68k/fcode.h>
Index: src/sys/arch/atari/include/fcode.h
diff -u /dev/null src/sys/arch/atari/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/atari/include/fcode.h Wed Dec 27 17:35:34 2023
@@ -0,0 +1,3 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:34 thorpej Exp $ */
+
+#include <m68k/fcode.h>
Index: src/sys/arch/cesfic/include/fcode.h
diff -u /dev/null src/sys/arch/cesfic/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/cesfic/include/fcode.h Wed Dec 27 17:35:34 2023
@@ -0,0 +1,3 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:34 thorpej Exp $ */
+
+#include <m68k/fcode.h>
Index: src/sys/arch/hp300/include/fcode.h
diff -u /dev/null src/sys/arch/hp300/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/hp300/include/fcode.h Wed Dec 27 17:35:34 2023
@@ -0,0 +1,11 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:34 thorpej Exp $ */
+
+#ifndef _HP300_FCODE_H_
+#define _HP300_FCODE_H_
+
+#include <m68k/fcode.h>
+
+/* Function Code 3 is used to invalidate TLB entries in the HP MMU. */
+#define FC_PURGE FC_UNDEF3
+
+#endif /* _HP300_FCODE_H_ */
Index: src/sys/arch/luna68k/include/fcode.h
diff -u /dev/null src/sys/arch/luna68k/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/luna68k/include/fcode.h Wed Dec 27 17:35:35 2023
@@ -0,0 +1,3 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:35 thorpej Exp $ */
+
+#include <m68k/fcode.h>
Index: src/sys/arch/m68k/include/fcode.h
diff -u /dev/null src/sys/arch/m68k/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/m68k/include/fcode.h Wed Dec 27 17:35:35 2023
@@ -0,0 +1,70 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:35 thorpej Exp $ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ * Copyright (c) 1982, 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
+ * 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ * from: Utah $Hdr: cpu.h 1.16 91/03/25$
+ *
+ * @(#)cpu.h 8.4 (Berkeley) 1/5/94
+ */
+
+#ifndef _M68K_FCODE_H_
+#define _M68K_FCODE_H_
+
+/*
+ * 680x0 Function Codes.
+ *
+ * Section 4.2 of the 68030 User's Manual describes the address spaces
+ * selected by the Function Code:
+ *
+ * FC2 FC1 FC0 Address space
+ * -----------------------------------------------------------
+ * 0 0 0 (Undefined, reserved for Motorola)
+ * 0 0 1 User Data space
+ * 0 1 0 User Program space
+ * 0 1 1 (Undefined, reserved for user)
+ * 1 0 0 (Undefined, reserved for Motorola)
+ * 1 0 1 Supervisor Data space
+ * 1 1 0 Supervisor Program space
+ * 1 1 1 CPU space
+ */
+#define FC_UNDEF0 0
+#define FC_USERD 1 /* user data space */
+#define FC_USERP 2 /* user program space */
+#define FC_UNDEF3 3
+#define FC_UNDEF4 4
+#define FC_SUPERD 5 /* supervisor data space */
+#define FC_SUPERP 6 /* supervisor program space */
+#define FC_CPU 7 /* CPU space */
+
+#endif /* _M68K_FCODE_H_ */
Index: src/sys/arch/mac68k/include/fcode.h
diff -u /dev/null src/sys/arch/mac68k/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/mac68k/include/fcode.h Wed Dec 27 17:35:35 2023
@@ -0,0 +1,3 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:35 thorpej Exp $ */
+
+#include <m68k/fcode.h>
Index: src/sys/arch/mvme68k/include/fcode.h
diff -u /dev/null src/sys/arch/mvme68k/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/mvme68k/include/fcode.h Wed Dec 27 17:35:35 2023
@@ -0,0 +1,3 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:35 thorpej Exp $ */
+
+#include <m68k/fcode.h>
Index: src/sys/arch/news68k/include/fcode.h
diff -u /dev/null src/sys/arch/news68k/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/news68k/include/fcode.h Wed Dec 27 17:35:36 2023
@@ -0,0 +1,3 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:36 thorpej Exp $ */
+
+#include <m68k/fcode.h>
Index: src/sys/arch/next68k/include/fcode.h
diff -u /dev/null src/sys/arch/next68k/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/next68k/include/fcode.h Wed Dec 27 17:35:36 2023
@@ -0,0 +1,3 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:36 thorpej Exp $ */
+
+#include <m68k/fcode.h>
Index: src/sys/arch/sun2/include/fcode.h
diff -u /dev/null src/sys/arch/sun2/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/sun2/include/fcode.h Wed Dec 27 17:35:36 2023
@@ -0,0 +1,11 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:36 thorpej Exp $ */
+
+#ifndef _SUN2_FCODE_H_
+#define _SUN2_FCODE_H_
+
+#include <m68k/fcode.h>
+
+/* Function Code 3 is used for control space on the sun2. */
+#define FC_CONTROL FC_UNDEF3
+
+#endif /* _SUN2_FCODE_H_ */
Index: src/sys/arch/sun3/include/fcode.h
diff -u /dev/null src/sys/arch/sun3/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/sun3/include/fcode.h Wed Dec 27 17:35:37 2023
@@ -0,0 +1,18 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:37 thorpej Exp $ */
+
+#ifndef _SUN3_FCODE_H_
+#define _SUN3_FCODE_H_
+
+#include <m68k/fcode.h>
+
+/*
+ * On the sun3, Function Code 3 is control space. On the sun3x, it's
+ * Function Code 4.
+ */
+#ifdef _SUN3X_
+#define FC_CONTROL FC_UNDEF4
+#else
+#define FC_CONTROL FC_UNDEF3
+#endif /* _SUN3X_ */
+
+#endif /* _SUN3_FCODE_H_ */
Index: src/sys/arch/x68k/include/fcode.h
diff -u /dev/null src/sys/arch/x68k/include/fcode.h:1.1
--- /dev/null Wed Dec 27 17:35:38 2023
+++ src/sys/arch/x68k/include/fcode.h Wed Dec 27 17:35:37 2023
@@ -0,0 +1,3 @@
+/* $NetBSD: fcode.h,v 1.1 2023/12/27 17:35:37 thorpej Exp $ */
+
+#include <m68k/fcode.h>
