Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/alpha split linux signal code off locore.s
details: https://anonhg.NetBSD.org/src/rev/daf8ceba23be
branches: trunk
changeset: 499729:daf8ceba23be
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Mon Nov 27 22:29:26 2000 +0000
description:
split linux signal code off locore.s
diffstat:
sys/arch/alpha/alpha/linux_sigcode.s | 105 +++++++++++++++++++++++++++++++++++
sys/arch/alpha/alpha/locore.s | 41 +-------------
sys/arch/alpha/conf/files.alpha | 3 +-
3 files changed, 109 insertions(+), 40 deletions(-)
diffs (191 lines):
diff -r e30ced06cc31 -r daf8ceba23be sys/arch/alpha/alpha/linux_sigcode.s
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/alpha/alpha/linux_sigcode.s Mon Nov 27 22:29:26 2000 +0000
@@ -0,0 +1,105 @@
+/* $NetBSD: linux_sigcode.s,v 1.1 2000/11/27 22:29:26 jdolecek Exp $ */
+
+/*-
+ * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center.
+ *
+ * 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 NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 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.
+ */
+
+/*
+ * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ *
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ * Software Distribution Coordinator or Software.Distribution%CS.CMU.EDU@localhost
+ * School of Computer Science
+ * Carnegie Mellon University
+ * Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+.stabs __FILE__,100,0,0,kernel_text
+
+#include <compat/linux/linux_syscall.h>
+
+#include <machine/asm.h>
+
+__KERNEL_RCSID(0, "$NetBSD: linux_sigcode.s,v 1.1 2000/11/27 22:29:26 jdolecek Exp $");
+
+#include "assym.h"
+
+.stabs __FILE__,132,0,0,kernel_text
+
+/*
+ * Linux signal trampoline code. Almost identical to the normal one.
+ */
+
+NESTED(linux_sigcode,0,0,ra,0,0)
+ lda sp, -16(sp) /* save the sigcontext pointer */
+ stq a2, 0(sp)
+ jsr ra, (t12) /* call the signal handler */
+ ldq a0, 0(sp) /* get the sigcontext pointer */
+ lda sp, 16(sp)
+ LINUX_CALLSYS_NOERROR(sigreturn)
+ mov v0, a0
+ LINUX_CALLSYS_NOERROR(exit)
+XNESTED(linux_esigcode,0)
+ END(linux_sigcode)
+
+NESTED(linux_rt_sigcode,0,0,ra,0,0)
+ lda sp, -16(sp) /* save the sigcontext pointer */
+ stq a2, 0(sp)
+ jsr ra, (t12) /* call the signal handler */
+ ldq a0, 0(sp) /* get the sigcontext pointer */
+ lda sp, 16(sp)
+ LINUX_CALLSYS_NOERROR(rt_sigreturn)
+ mov v0, a0
+ LINUX_CALLSYS_NOERROR(exit)
+XNESTED(linux_rt_esigcode,0)
+ END(linux_rt_sigcode)
diff -r e30ced06cc31 -r daf8ceba23be sys/arch/alpha/alpha/locore.s
--- a/sys/arch/alpha/alpha/locore.s Mon Nov 27 22:23:09 2000 +0000
+++ b/sys/arch/alpha/alpha/locore.s Mon Nov 27 22:29:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.84 2000/11/20 03:15:15 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.85 2000/11/27 22:29:26 jdolecek Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -69,15 +69,10 @@
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
-#include "opt_compat_linux.h"
-
-#ifdef COMPAT_LINUX
-#include <compat/linux/linux_syscall.h>
-#endif
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.84 2000/11/20 03:15:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.85 2000/11/27 22:29:26 jdolecek Exp $");
#include "assym.h"
@@ -304,38 +299,6 @@
/**************************************************************************/
-#ifdef COMPAT_LINUX
-/*
- * Linux signal trampoline code. Almost identical to the normal one.
- */
-
-NESTED(linux_sigcode,0,0,ra,0,0)
- lda sp, -16(sp) /* save the sigcontext pointer */
- stq a2, 0(sp)
- jsr ra, (t12) /* call the signal handler */
- ldq a0, 0(sp) /* get the sigcontext pointer */
- lda sp, 16(sp)
- LINUX_CALLSYS_NOERROR(sigreturn)
- mov v0, a0
- LINUX_CALLSYS_NOERROR(exit)
-XNESTED(linux_esigcode,0)
- END(linux_sigcode)
-
-NESTED(linux_rt_sigcode,0,0,ra,0,0)
- lda sp, -16(sp) /* save the sigcontext pointer */
- stq a2, 0(sp)
- jsr ra, (t12) /* call the signal handler */
- ldq a0, 0(sp) /* get the sigcontext pointer */
- lda sp, 16(sp)
- LINUX_CALLSYS_NOERROR(rt_sigreturn)
- mov v0, a0
- LINUX_CALLSYS_NOERROR(exit)
-XNESTED(linux_rt_esigcode,0)
- END(linux_rt_sigcode)
-#endif
-
-/**************************************************************************/
-
/*
* exception_return: return from trap, exception, or syscall
*/
diff -r e30ced06cc31 -r daf8ceba23be sys/arch/alpha/conf/files.alpha
--- a/sys/arch/alpha/conf/files.alpha Mon Nov 27 22:23:09 2000 +0000
+++ b/sys/arch/alpha/conf/files.alpha Mon Nov 27 22:29:26 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.127 2000/11/26 17:44:08 ad Exp $
+# $NetBSD: files.alpha,v 1.128 2000/11/27 22:29:26 jdolecek Exp $
#
# alpha-specific configuration info
@@ -527,6 +527,7 @@
# Linux Binary Compatibility (COMPAT_LINUX)
include "compat/linux/files.linux"
include "compat/linux/arch/alpha/files.linux_alpha"
+file arch/alpha/alpha/linux_sigcode.s compat_linux
# OSS audio driver compatibility
include "compat/ossaudio/files.ossaudio"
Home |
Main Index |
Thread Index |
Old Index