Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sh3 remove COMPAT_13 staff. No 1.3 release of sh3 p...
details: https://anonhg.NetBSD.org/src/rev/9c95f64f06c3
branches: trunk
changeset: 526781:9c95f64f06c3
user: uch <uch%NetBSD.org@localhost>
date: Fri May 10 15:25:12 2002 +0000
description:
remove COMPAT_13 staff. No 1.3 release of sh3 port. these are trace of
i386 port.
diffstat:
sys/arch/sh3/conf/files.sh3 | 12 +---
sys/arch/sh3/include/signal.h | 3 +-
sys/arch/sh3/sh3/compat_13_machdep.c | 107 -----------------------------------
sys/arch/sh3/sh3/sh3_machdep.c | 12 +---
4 files changed, 4 insertions(+), 130 deletions(-)
diffs (186 lines):
diff -r de2ffeff02f8 -r 9c95f64f06c3 sys/arch/sh3/conf/files.sh3
--- a/sys/arch/sh3/conf/files.sh3 Fri May 10 14:51:26 2002 +0000
+++ b/sys/arch/sh3/conf/files.sh3 Fri May 10 15:25:12 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.sh3,v 1.27 2002/05/09 12:24:19 uch Exp $
+# $NetBSD: files.sh3,v 1.28 2002/05/10 15:25:13 uch Exp $
#
defflag opt_cputype.h SH3 SH4
@@ -10,7 +10,6 @@
file arch/sh3/sh3/db_interface.c ddb | kgdb
file arch/sh3/sh3/db_memrw.c ddb | kgdb
file arch/sh3/sh3/db_trace.c ddb
-file arch/sh3/sh3/sh3disasm.c ddb
file arch/sh3/sh3/in_cksum.S inet
file netinet/in4_cksum.c inet
file arch/sh3/sh3/kgdb_machdep.c kgdb
@@ -41,13 +40,6 @@
file arch/sh3/sh3/procfs_machdep.c procfs
#
-# Compatibility modules
-#
-
-# Binary compatibility with previous NetBSD releases (COMPAT_XX)
-file arch/sh3/sh3/compat_13_machdep.c compat_13
-
-#
# Executable file format
#
-file arch/sh3/sh3/coff_exec.c exec_coff
+file arch/sh3/sh3/coff_exec.c exec_coff
diff -r de2ffeff02f8 -r 9c95f64f06c3 sys/arch/sh3/include/signal.h
--- a/sys/arch/sh3/include/signal.h Fri May 10 14:51:26 2002 +0000
+++ b/sys/arch/sh3/include/signal.h Fri May 10 15:25:12 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.h,v 1.3 2002/05/09 12:25:41 uch Exp $ */
+/* $NetBSD: signal.h,v 1.4 2002/05/10 15:25:13 uch Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
@@ -102,7 +102,6 @@
int sc_r15;
int sc_onstack; /* sigstack state to restore */
- int __sc_mask13; /* signal mask to restore (old style) */
int sc_expevt; /* XXX should be above */
int sc_err;
diff -r de2ffeff02f8 -r 9c95f64f06c3 sys/arch/sh3/sh3/compat_13_machdep.c
--- a/sys/arch/sh3/sh3/compat_13_machdep.c Fri May 10 14:51:26 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/* $NetBSD: compat_13_machdep.c,v 1.4 2002/02/12 15:26:49 uch Exp $ */
-
-/*-
- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * 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.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/signalvar.h>
-#include <sys/kernel.h>
-#include <sys/map.h>
-#include <sys/proc.h>
-#include <sys/user.h>
-#include <sys/mount.h>
-#include <sys/syscallargs.h>
-
-int
-compat_13_sys_sigreturn(struct proc *p, void *v, register_t *retval)
-{
- struct compat_13_sys_sigreturn_args /* {
- syscallarg(struct sigcontext13 *) sigcntxp;
- } */ *uap = v;
- struct sigcontext13 *scp, context;
- struct trapframe *tf;
- sigset_t mask;
-
- /*
- * The trampoline code hands us the context.
- * It is unsafe to keep track of it ourselves, in the event that a
- * program jumps out of a signal handler.
- */
- scp = SCARG(uap, sigcntxp);
- if (copyin((caddr_t)scp, &context, sizeof(*scp)) != 0)
- return (EFAULT);
-
- /* Restore register context. */
- tf = p->p_md.md_regs;
-
- /* Check for security violations. */
- if (((context.sc_ssr ^ tf->tf_ssr) & PSL_USERSTATIC) != 0)
- return (EINVAL);
-
- tf->tf_ssr = context.sc_ssr;
-
- tf->tf_r0 = context.sc_r0;
- tf->tf_r1 = context.sc_r1;
- tf->tf_r2 = context.sc_r2;
- tf->tf_r3 = context.sc_r3;
- tf->tf_r4 = context.sc_r4;
- tf->tf_r5 = context.sc_r5;
- tf->tf_r6 = context.sc_r6;
- tf->tf_r7 = context.sc_r7;
- tf->tf_r8 = context.sc_r8;
- tf->tf_r9 = context.sc_r9;
- tf->tf_r10 = context.sc_r10;
- tf->tf_r11 = context.sc_r11;
- tf->tf_r12 = context.sc_r12;
- tf->tf_r13 = context.sc_r13;
- tf->tf_r14 = context.sc_r14;
- tf->tf_spc = context.sc_spc;
- tf->tf_r15 = context.sc_r15;
- tf->tf_pr = context.sc_pr;
-
- /* Restore signal stack. */
- if (context.sc_onstack & SS_ONSTACK)
- p->p_sigctx.ps_sigstk.ss_flags |= SS_ONSTACK;
- else
- p->p_sigctx.ps_sigstk.ss_flags &= ~SS_ONSTACK;
-
- /* Restore signal mask. */
- native_sigset13_to_sigset(&context.sc_mask, &mask);
- (void) sigprocmask1(p, SIG_SETMASK, &mask, 0);
-
- return (EJUSTRETURN);
-}
diff -r de2ffeff02f8 -r 9c95f64f06c3 sys/arch/sh3/sh3/sh3_machdep.c
--- a/sys/arch/sh3/sh3/sh3_machdep.c Fri May 10 14:51:26 2002 +0000
+++ b/sys/arch/sh3/sh3/sh3_machdep.c Fri May 10 15:25:12 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3_machdep.c,v 1.40 2002/05/09 12:28:09 uch Exp $ */
+/* $NetBSD: sh3_machdep.c,v 1.41 2002/05/10 15:25:13 uch Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -428,16 +428,6 @@
/* Save signal mask. */
frame.sf_sc.sc_mask = *mask;
-#ifdef COMPAT_13
- /*
- * XXX We always have to save an old style signal mask because
- * XXX we might be delivering a signal to a process which will
- * XXX escape from the signal in a non-standard way and invoke
- * XXX sigreturn() directly.
- */
- native_sigset_to_sigset13(mask, &frame.sf_sc.__sc_mask13);
-#endif
-
if (copyout(&frame, fp, sizeof(frame)) != 0) {
/*
* Process has trashed its stack; give it an illegal
Home |
Main Index |
Thread Index |
Old Index