Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch split m68k SunOS and SVR4-specific sigcode.s code t...
details: https://anonhg.NetBSD.org/src/rev/fe0ae6c6b2e0
branches: trunk
changeset: 499668:fe0ae6c6b2e0
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Sun Nov 26 11:47:23 2000 +0000
description:
split m68k SunOS and SVR4-specific sigcode.s code to sunos_sigcode.s
and svr4_sigcode.s respectively
adjust individual m68k port's locore.s to include new sigcode files if
appropriate
diffstat:
sys/arch/amiga/amiga/locore.s | 8 +++-
sys/arch/atari/atari/locore.s | 8 +++-
sys/arch/hp300/hp300/locore.s | 8 +++-
sys/arch/luna68k/luna68k/locore.s | 8 +++-
sys/arch/m68k/m68k/sigcode.s | 37 +-------------------
sys/arch/m68k/m68k/sunos_sigcode.s | 65 +++++++++++++++++++++++++++++++++++
sys/arch/m68k/m68k/svr4_sigcode.s | 70 ++++++++++++++++++++++++++++++++++++++
sys/arch/mac68k/mac68k/locore.s | 8 +++-
sys/arch/mvme68k/mvme68k/locore.s | 8 +++-
sys/arch/news68k/news68k/locore.s | 8 +++-
sys/arch/next68k/next68k/locore.s | 8 +++-
sys/arch/sun3/sun3/locore.s | 8 +++-
sys/arch/sun3/sun3x/locore.s | 8 +++-
sys/arch/x68k/x68k/locore.s | 8 +++-
14 files changed, 213 insertions(+), 47 deletions(-)
diffs (truncated from 433 to 300 lines):
diff -r 6634c7c4bbcd -r fe0ae6c6b2e0 sys/arch/amiga/amiga/locore.s
--- a/sys/arch/amiga/amiga/locore.s Sun Nov 26 11:18:20 2000 +0000
+++ b/sys/arch/amiga/amiga/locore.s Sun Nov 26 11:47:23 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.119 2000/11/21 13:54:13 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.120 2000/11/26 11:47:23 jdolecek Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -1031,6 +1031,12 @@
* Use common m68k sigcode.
*/
#include <m68k/m68k/sigcode.s>
+#ifdef COMPAT_SUNOS
+#include <m68k/m68k/sunos_sigcode.s>
+#endif
+#ifdef COMPAT_SVR4
+#include <m68k/m68k/svr4_sigcode.s>
+#endif
/*
* Primitives
diff -r 6634c7c4bbcd -r fe0ae6c6b2e0 sys/arch/atari/atari/locore.s
--- a/sys/arch/atari/atari/locore.s Sun Nov 26 11:18:20 2000 +0000
+++ b/sys/arch/atari/atari/locore.s Sun Nov 26 11:47:23 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.74 2000/11/21 13:54:14 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.75 2000/11/26 11:47:24 jdolecek Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -974,6 +974,12 @@
* Use common m68k sigcode.
*/
#include <m68k/m68k/sigcode.s>
+#ifdef COMPAT_SUNOS
+#include <m68k/m68k/sunos_sigcode.s>
+#endif
+#ifdef COMPAT_SVR4
+#include <m68k/m68k/svr4_sigcode.s>
+#endif
/*
* Primitives
diff -r 6634c7c4bbcd -r fe0ae6c6b2e0 sys/arch/hp300/hp300/locore.s
--- a/sys/arch/hp300/hp300/locore.s Sun Nov 26 11:18:20 2000 +0000
+++ b/sys/arch/hp300/hp300/locore.s Sun Nov 26 11:47:23 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.111 2000/11/21 13:54:14 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.112 2000/11/26 11:47:24 jdolecek Exp $ */
/*
* Copyright (c) 1994, 1995 Gordon W. Ross
@@ -1167,6 +1167,12 @@
* Use common m68k sigcode.
*/
#include <m68k/m68k/sigcode.s>
+#ifdef COMPAT_SUNOS
+#include <m68k/m68k/sunos_sigcode.s>
+#endif
+#ifdef COMPAT_SVR4
+#include <m68k/m68k/svr4_sigcode.s>
+#endif
/*
* Primitives
diff -r 6634c7c4bbcd -r fe0ae6c6b2e0 sys/arch/luna68k/luna68k/locore.s
--- a/sys/arch/luna68k/luna68k/locore.s Sun Nov 26 11:18:20 2000 +0000
+++ b/sys/arch/luna68k/luna68k/locore.s Sun Nov 26 11:47:23 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.10 2000/11/21 13:54:14 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.11 2000/11/26 11:47:24 jdolecek Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -913,6 +913,12 @@
* Use common m68k sigcode.
*/
#include <m68k/m68k/sigcode.s>
+#ifdef COMPAT_SUNOS
+#include <m68k/m68k/sunos_sigcode.s>
+#endif
+#ifdef COMPAT_SVR4
+#include <m68k/m68k/svr4_sigcode.s>
+#endif
/*
* Primitives
diff -r 6634c7c4bbcd -r fe0ae6c6b2e0 sys/arch/m68k/m68k/sigcode.s
--- a/sys/arch/m68k/m68k/sigcode.s Sun Nov 26 11:18:20 2000 +0000
+++ b/sys/arch/m68k/m68k/sigcode.s Sun Nov 26 11:47:23 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sigcode.s,v 1.9 1999/11/10 00:01:32 thorpej Exp $ */
+/* $NetBSD: sigcode.s,v 1.10 2000/11/26 11:47:25 jdolecek Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -77,38 +77,3 @@
trap #0 | exit(errno) (2 bytes)
.align 2
GLOBAL(esigcode)
-
-#ifdef COMPAT_SUNOS
- .data
- .align 2
-GLOBAL(sunos_sigcode)
- movl %sp@(12),%a0 | signal handler addr (4 bytes)
- jsr %a0@ | call signal handler (2 bytes)
- addql #4,%sp | pop signal number (2 bytes)
- trap #1 | special syscall entry (2 bytes)
- movl %d0,%sp@(4) | save errno (4 bytes)
- moveq #1,%d0 | syscall == exit (2 bytes)
- trap #0 | exit(errno) (2 bytes)
- .align 2
-GLOBAL(sunos_esigcode)
-#endif /* COMPAT_SUNOS */
-
-#ifdef COMPAT_SVR4
- .data
- .align 2
-GLOBAL(svr4_sigcode)
- movl %sp@(SVR4_SIGF_HANDLER),%a0 | signal handler addr
- jsr %a0@ | call signal handler
- lea %sp@(SVR4_SIGF_UC),%a0 | ucontext to resume addr
- movl %a0,%sp@- | push pointer to ucontext
- movl #SVR4_SETCONTEXT,%sp@- | push context() subcode
- subql #4,%sp | padding for call frame layout
- movql #SVR4_SYS_context,%d0 | setcontext(&sf.sf_uc)
- trap #0 | shouldn't return
- movl %d0,%sp@(4) | so save `errno'
- moveq #SVR4_SYS_exit,%d0 | and exit hard
- trap #0 | _exit(errno)
- .align 2
-GLOBAL(svr4_esigcode)
-#endif /* COMPAT_SVR4 */
-
diff -r 6634c7c4bbcd -r fe0ae6c6b2e0 sys/arch/m68k/m68k/sunos_sigcode.s
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/m68k/m68k/sunos_sigcode.s Sun Nov 26 11:47:23 2000 +0000
@@ -0,0 +1,65 @@
+/* $NetBSD: sunos_sigcode.s,v 1.1 2000/11/26 11:47:25 jdolecek Exp $ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ * Copyright (c) 1980, 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. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. 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: locore.s 1.66 92/12/22$
+ *
+ * @(#)locore.s 8.6 (Berkeley) 5/27/94
+ */
+
+/*
+ * NOTICE: This is not a standalone file. To use it, #include it in
+ * your port's locore.s, like so:
+ *
+ * #ifdef COMPAT_SUNOS
+ * #include <m68k/m68k/sunos_sigcode.s>
+ * #endif
+ */
+
+ .data
+ .align 2
+GLOBAL(sunos_sigcode)
+ movl %sp@(12),%a0 | signal handler addr (4 bytes)
+ jsr %a0@ | call signal handler (2 bytes)
+ addql #4,%sp | pop signal number (2 bytes)
+ trap #1 | special syscall entry (2 bytes)
+ movl %d0,%sp@(4) | save errno (4 bytes)
+ moveq #1,%d0 | syscall == exit (2 bytes)
+ trap #0 | exit(errno) (2 bytes)
+ .align 2
+GLOBAL(sunos_esigcode)
diff -r 6634c7c4bbcd -r fe0ae6c6b2e0 sys/arch/m68k/m68k/svr4_sigcode.s
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/m68k/m68k/svr4_sigcode.s Sun Nov 26 11:47:23 2000 +0000
@@ -0,0 +1,70 @@
+/* $NetBSD: svr4_sigcode.s,v 1.1 2000/11/26 11:47:25 jdolecek Exp $ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ * Copyright (c) 1980, 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. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. 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: locore.s 1.66 92/12/22$
+ *
+ * @(#)locore.s 8.6 (Berkeley) 5/27/94
+ */
+
+/*
+ * NOTICE: This is not a standalone file. To use it, #include it in
+ * your port's locore.s, like so:
+ *
+ * #ifdef COMPAT_SVR4
+ * #include <m68k/m68k/svr4_sigcode.s>
+ * #endif
+ */
+
+ .data
+ .align 2
+GLOBAL(svr4_sigcode)
+ movl %sp@(SVR4_SIGF_HANDLER),%a0 | signal handler addr
+ jsr %a0@ | call signal handler
+ lea %sp@(SVR4_SIGF_UC),%a0 | ucontext to resume addr
+ movl %a0,%sp@- | push pointer to ucontext
+ movl #SVR4_SETCONTEXT,%sp@- | push context() subcode
+ subql #4,%sp | padding for call frame layout
+ movql #SVR4_SYS_context,%d0 | setcontext(&sf.sf_uc)
+ trap #0 | shouldn't return
+ movl %d0,%sp@(4) | so save `errno'
+ moveq #SVR4_SYS_exit,%d0 | and exit hard
+ trap #0 | _exit(errno)
+ .align 2
+GLOBAL(svr4_esigcode)
+
diff -r 6634c7c4bbcd -r fe0ae6c6b2e0 sys/arch/mac68k/mac68k/locore.s
--- a/sys/arch/mac68k/mac68k/locore.s Sun Nov 26 11:18:20 2000 +0000
+++ b/sys/arch/mac68k/mac68k/locore.s Sun Nov 26 11:47:23 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.131 2000/11/21 13:54:15 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.132 2000/11/26 11:47:25 jdolecek Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -955,6 +955,12 @@
* Use common m68k sigcode.
*/
#include <m68k/m68k/sigcode.s>
+#ifdef COMPAT_SUNOS
+#include <m68k/m68k/sunos_sigcode.s>
+#endif
+#ifdef COMPAT_SVR4
+#include <m68k/m68k/svr4_sigcode.s>
+#endif
/*
Home |
Main Index |
Thread Index |
Old Index