Module Name: src
Committed By: thorpej
Date: Wed Jan 17 12:19:07 UTC 2024
Modified Files:
src/sys/arch/amiga/amiga: locore.s
src/sys/arch/atari/atari: locore.s
src/sys/arch/cesfic/cesfic: locore.s
src/sys/arch/hp300/hp300: locore.s
src/sys/arch/luna68k/luna68k: locore.s
src/sys/arch/m68k/conf: files.m68k
src/sys/arch/m68k/m68k: compat_13_sigreturn13.s compat_16_sigreturn14.s
src/sys/arch/mac68k/mac68k: locore.s
src/sys/arch/mvme68k/mvme68k: locore.s
src/sys/arch/news68k/news68k: locore.s
src/sys/arch/next68k/next68k: locore.s
src/sys/arch/sun2/sun2: locore.s
src/sys/arch/sun3/sun3: locore.s
src/sys/arch/sun3/sun3x: locore.s
src/sys/arch/virt68k/virt68k: locore.s
src/sys/arch/x68k/x68k: locore.s
Removed Files:
src/sys/arch/m68k/m68k: sigreturn.s
Log Message:
Make compat_13_sigreturn13.s and compat_16_sigreturn14.s build as their
own stand-alone files and G/C the now-empty sigreturn.s.
To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/sys/arch/amiga/amiga/locore.s
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/atari/atari/locore.s
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/m68k/conf/files.m68k
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/m68k/compat_13_sigreturn13.s
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/m68k/m68k/compat_16_sigreturn14.s
cvs rdiff -u -r1.11 -r0 src/sys/arch/m68k/m68k/sigreturn.s
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/mac68k/mac68k/locore.s
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sun2/sun2/locore.s
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/sun3/sun3/locore.s
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/sun3/sun3x/locore.s
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/virt68k/virt68k/locore.s
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/x68k/x68k/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/amiga/amiga/locore.s
diff -u src/sys/arch/amiga/amiga/locore.s:1.168 src/sys/arch/amiga/amiga/locore.s:1.169
--- src/sys/arch/amiga/amiga/locore.s:1.168 Tue Jan 16 15:38:57 2024
+++ src/sys/arch/amiga/amiga/locore.s Wed Jan 17 12:19:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.168 2024/01/16 15:38:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.169 2024/01/17 12:19:05 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -423,9 +423,6 @@ ENTRY_NOPROFILE(trace)
moveq #T_TRACE,%d0
jra _ASM_LABEL(fault)
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
*
Index: src/sys/arch/atari/atari/locore.s
diff -u src/sys/arch/atari/atari/locore.s:1.124 src/sys/arch/atari/atari/locore.s:1.125
--- src/sys/arch/atari/atari/locore.s:1.124 Tue Jan 16 15:38:57 2024
+++ src/sys/arch/atari/atari/locore.s Wed Jan 17 12:19:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.124 2024/01/16 15:38:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.125 2024/01/17 12:19:05 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -618,9 +618,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
*
Index: src/sys/arch/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.44 src/sys/arch/cesfic/cesfic/locore.s:1.45
--- src/sys/arch/cesfic/cesfic/locore.s:1.44 Tue Jan 16 15:38:57 2024
+++ src/sys/arch/cesfic/cesfic/locore.s Wed Jan 17 12:19:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.44 2024/01/16 15:38:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.45 2024/01/17 12:19:06 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -596,9 +596,6 @@ Lbrkpt2:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
*/
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.182 src/sys/arch/hp300/hp300/locore.s:1.183
--- src/sys/arch/hp300/hp300/locore.s:1.182 Tue Jan 16 15:38:57 2024
+++ src/sys/arch/hp300/hp300/locore.s Wed Jan 17 12:19:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.182 2024/01/16 15:38:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.183 2024/01/17 12:19:06 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -786,9 +786,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
* All device interrupts are auto-vectored. The CPU provides
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.80 src/sys/arch/luna68k/luna68k/locore.s:1.81
--- src/sys/arch/luna68k/luna68k/locore.s:1.80 Tue Jan 16 15:38:57 2024
+++ src/sys/arch/luna68k/luna68k/locore.s Wed Jan 17 12:19:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.80 2024/01/16 15:38:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.81 2024/01/17 12:19:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -547,9 +547,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
*/
Index: src/sys/arch/m68k/conf/files.m68k
diff -u src/sys/arch/m68k/conf/files.m68k:1.52 src/sys/arch/m68k/conf/files.m68k:1.53
--- src/sys/arch/m68k/conf/files.m68k:1.52 Tue Jan 16 15:38:59 2024
+++ src/sys/arch/m68k/conf/files.m68k Wed Jan 17 12:19:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.m68k,v 1.52 2024/01/16 15:38:59 thorpej Exp $
+# $NetBSD: files.m68k,v 1.53 2024/01/17 12:19:07 thorpej Exp $
#
defflag opt_fpsp.h FPSP
@@ -32,6 +32,9 @@ file arch/m68k/m68k/sunos_syscall.c com
file arch/m68k/m68k/linux_syscall.c compat_linux
file arch/m68k/m68k/compat_13_machdep.c compat_13
+file arch/m68k/m68k/compat_13_sigreturn13.s compat_13 | compat_sunos
+
file arch/m68k/m68k/compat_16_machdep.c compat_16
+file arch/m68k/m68k/compat_16_sigreturn14.s compat_16
include "compat/m68k4k/files.m68k4k"
Index: src/sys/arch/m68k/m68k/compat_13_sigreturn13.s
diff -u src/sys/arch/m68k/m68k/compat_13_sigreturn13.s:1.7 src/sys/arch/m68k/m68k/compat_13_sigreturn13.s:1.8
--- src/sys/arch/m68k/m68k/compat_13_sigreturn13.s:1.7 Sat Sep 7 19:06:29 2013
+++ src/sys/arch/m68k/m68k/compat_13_sigreturn13.s Wed Jan 17 12:19:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_sigreturn13.s,v 1.7 2013/09/07 19:06:29 chs Exp $ */
+/* $NetBSD: compat_13_sigreturn13.s,v 1.8 2024/01/17 12:19:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,9 +38,12 @@
* @(#)locore.s 8.6 (Berkeley) 5/27/94
*/
-/*
- * NOTICE: This file is included by <m68k/m68k/sigreturn.s>.
- */
+#include <machine/asm.h>
+
+#include "assym.h"
+
+ .file "compat_13_sigreturn13.s"
+ .text
/*
* The compat_13_sigreturn13() syscall comes here. It requires special
@@ -61,19 +64,19 @@ ENTRY_NOPROFILE(m68k_compat_13_sigreturn
movl FR_SP(%sp),%a0 | grab and restore
movl %a0,%usp | user SP
lea FR_HW(%sp),%a1 | pointer to HW frame
- movw FR_ADJ(%sp),%d0 | do we need to adjust the stack?
- jeq .Lc13sigr1 | no, just continue
+ movw FR_ADJ(%sp),%d0 | do we need to adjust the stack?
+ jeq 2f | no, just continue
moveq #92,%d1 | total size
subw %d0,%d1 | - hole size = frame size
lea 92(%a1),%a0 | destination
addw %d1,%a1 | source
lsrw #1,%d1 | convert to word count
subqw #1,%d1 | minus 1 for dbf
-.Lc13sigrlp:
+1:
movw -(%a1),-(%a0) | copy a word
- dbf %d1,.Lc13sigrlp | continue
+ dbf %d1,1b | continue
movl %a0,%a1 | new HW frame base
-.Lc13sigr1:
+2:
movl %a1,FR_SP(%sp) | new SP value
moveml (%sp)+,#0x7FFF | restore user registers
movl (%sp),%sp | and our SP
Index: src/sys/arch/m68k/m68k/compat_16_sigreturn14.s
diff -u src/sys/arch/m68k/m68k/compat_16_sigreturn14.s:1.5 src/sys/arch/m68k/m68k/compat_16_sigreturn14.s:1.6
--- src/sys/arch/m68k/m68k/compat_16_sigreturn14.s:1.5 Sat Sep 7 19:06:29 2013
+++ src/sys/arch/m68k/m68k/compat_16_sigreturn14.s Wed Jan 17 12:19:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_sigreturn14.s,v 1.5 2013/09/07 19:06:29 chs Exp $ */
+/* $NetBSD: compat_16_sigreturn14.s,v 1.6 2024/01/17 12:19:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,9 +38,12 @@
* @(#)locore.s 8.6 (Berkeley) 5/27/94
*/
-/*
- * NOTICE: This file is included by <m68k/m68k/sigreturn.s>.
- */
+#include <machine/asm.h>
+
+#include "assym.h"
+
+ .file "compat_13_sigreturn13.s"
+ .text
/*
* The compat_16_sigreturn14() syscall comes here. It requires special
@@ -62,18 +65,18 @@ ENTRY_NOPROFILE(m68k_compat_16_sigreturn
movl %a0,%usp | user SP
lea FR_HW(%sp),%a1 | pointer to HW frame
movw FR_ADJ(%sp),%d0 | do we need to adjust the stack?
- jeq .Lsigr1 | no, just continue
+ jeq 2f | no, just continue
moveq #92,%d1 | total size
subw %d0,%d1 | - hole size = frame size
lea 92(%a1),%a0 | destination
addw %d1,%a1 | source
lsrw #1,%d1 | convert to word count
subqw #1,%d1 | minus 1 for dbf
-.Lsigrlp:
+1:
movw -(%a1),-(%a0) | copy a word
- dbf %d1,.Lsigrlp | continue
+ dbf %d1,1b | continue
movl %a0,%a1 | new HW frame base
-.Lsigr1:
+2:
movl %a1,FR_SP(%sp) | new SP value
moveml (%sp)+,#0x7FFF | restore user registers
movl (%sp),%sp | and our SP
Index: src/sys/arch/mac68k/mac68k/locore.s
diff -u src/sys/arch/mac68k/mac68k/locore.s:1.181 src/sys/arch/mac68k/mac68k/locore.s:1.182
--- src/sys/arch/mac68k/mac68k/locore.s:1.181 Tue Jan 16 15:38:57 2024
+++ src/sys/arch/mac68k/mac68k/locore.s Wed Jan 17 12:19:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.181 2024/01/16 15:38:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.182 2024/01/17 12:19:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -705,9 +705,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
*
Index: src/sys/arch/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.128 src/sys/arch/mvme68k/mvme68k/locore.s:1.129
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.128 Tue Jan 16 15:38:57 2024
+++ src/sys/arch/mvme68k/mvme68k/locore.s Wed Jan 17 12:19:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.128 2024/01/16 15:38:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.129 2024/01/17 12:19:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -908,11 +908,6 @@ Lbrkpt3:
rte | all done
/*
- * Use common m68k sigreturn routine.
- */
-#include <m68k/m68k/sigreturn.s>
-
-/*
* Emulation of VAX REI instruction.
*
* This code deals with checking for and servicing ASTs
Index: src/sys/arch/news68k/news68k/locore.s
diff -u src/sys/arch/news68k/news68k/locore.s:1.83 src/sys/arch/news68k/news68k/locore.s:1.84
--- src/sys/arch/news68k/news68k/locore.s:1.83 Tue Jan 16 15:38:57 2024
+++ src/sys/arch/news68k/news68k/locore.s Wed Jan 17 12:19:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.83 2024/01/16 15:38:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.84 2024/01/17 12:19:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -643,11 +643,6 @@ Lbrkpt3:
rte | all done
/*
- * Use common m68k sigreturn routine.
- */
-#include <m68k/m68k/sigreturn.s>
-
-/*
* Interrupt handlers.
*/
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.83 src/sys/arch/next68k/next68k/locore.s:1.84
--- src/sys/arch/next68k/next68k/locore.s:1.83 Tue Jan 16 15:38:58 2024
+++ src/sys/arch/next68k/next68k/locore.s Wed Jan 17 12:19:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.83 2024/01/16 15:38:58 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.84 2024/01/17 12:19:06 thorpej Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -626,9 +626,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
*
Index: src/sys/arch/sun2/sun2/locore.s
diff -u src/sys/arch/sun2/sun2/locore.s:1.36 src/sys/arch/sun2/sun2/locore.s:1.37
--- src/sys/arch/sun2/sun2/locore.s:1.36 Tue Jan 16 15:38:58 2024
+++ src/sys/arch/sun2/sun2/locore.s Wed Jan 17 12:19:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.36 2024/01/16 15:38:58 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.37 2024/01/17 12:19:07 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -389,9 +389,6 @@ Lbrkpt2:
movl %sp@,%sp | ... and sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers. Most are auto-vectored,
* and hard-wired the same way on all sun3 models.
Index: src/sys/arch/sun3/sun3/locore.s
diff -u src/sys/arch/sun3/sun3/locore.s:1.108 src/sys/arch/sun3/sun3/locore.s:1.109
--- src/sys/arch/sun3/sun3/locore.s:1.108 Tue Jan 16 15:38:58 2024
+++ src/sys/arch/sun3/sun3/locore.s Wed Jan 17 12:19:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.108 2024/01/16 15:38:58 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.109 2024/01/17 12:19:07 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -435,9 +435,6 @@ Lbrkpt2:
movl %sp@,%sp | ... and sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers. Most are auto-vectored,
* and hard-wired the same way on all sun3 models.
Index: src/sys/arch/sun3/sun3x/locore.s
diff -u src/sys/arch/sun3/sun3x/locore.s:1.76 src/sys/arch/sun3/sun3x/locore.s:1.77
--- src/sys/arch/sun3/sun3x/locore.s:1.76 Tue Jan 16 15:38:58 2024
+++ src/sys/arch/sun3/sun3x/locore.s Wed Jan 17 12:19:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.76 2024/01/16 15:38:58 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.77 2024/01/17 12:19:07 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -420,9 +420,6 @@ Lbrkpt2:
movl %sp@,%sp | ... and sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers. Most are auto-vectored,
* and hard-wired the same way on all sun3 models.
Index: src/sys/arch/virt68k/virt68k/locore.s
diff -u src/sys/arch/virt68k/virt68k/locore.s:1.11 src/sys/arch/virt68k/virt68k/locore.s:1.12
--- src/sys/arch/virt68k/virt68k/locore.s:1.11 Wed Jan 17 05:22:11 2024
+++ src/sys/arch/virt68k/virt68k/locore.s Wed Jan 17 12:19:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.11 2024/01/17 05:22:11 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.12 2024/01/17 12:19:07 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -483,11 +483,6 @@ Lbrkpt3:
rte | all done
/*
- * Use common m68k sigreturn routine.
- */
-#include <m68k/m68k/sigreturn.s>
-
-/*
* Interrupt handlers.
*
* For auto-vectored interrupts, the CPU provides the
Index: src/sys/arch/x68k/x68k/locore.s
diff -u src/sys/arch/x68k/x68k/locore.s:1.129 src/sys/arch/x68k/x68k/locore.s:1.130
--- src/sys/arch/x68k/x68k/locore.s:1.129 Tue Jan 16 15:38:59 2024
+++ src/sys/arch/x68k/x68k/locore.s Wed Jan 17 12:19:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.129 2024/01/16 15:38:59 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.130 2024/01/17 12:19:07 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -620,9 +620,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Provide a generic interrupt dispatcher, only handle hardclock (int6)
* specially, to improve performance
