Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/lib/libc Switch arch/sh3/sys to the new compat code layout.
details: https://anonhg.NetBSD.org/src/rev/53c9297eca1a
branches: trunk
changeset: 584410:53c9297eca1a
user: uwe <uwe%NetBSD.org@localhost>
date: Thu Sep 15 21:39:15 2005 +0000
description:
Switch arch/sh3/sys to the new compat code layout.
diffstat:
lib/libc/arch/sh3/Makefile.inc | 4 +-
lib/libc/arch/sh3/sys/Ovfork.S | 84 --------------------
lib/libc/arch/sh3/sys/__semctl.S | 42 ----------
lib/libc/arch/sh3/sys/__sigreturn14.S | 48 -----------
lib/libc/arch/sh3/sys/__sigtramp1.S | 53 -------------
lib/libc/arch/sh3/sys/msgctl.S | 45 -----------
lib/libc/arch/sh3/sys/shmctl.S | 45 -----------
lib/libc/arch/sh3/sys/sigaction.S | 45 -----------
lib/libc/arch/sh3/sys/sigpending.S | 51 ------------
lib/libc/arch/sh3/sys/sigprocmask.S | 85 ---------------------
lib/libc/arch/sh3/sys/sigreturn.S | 51 ------------
lib/libc/arch/sh3/sys/sigsuspend.S | 72 -----------------
lib/libc/compat/arch/sh3/Makefile.inc | 3 +
lib/libc/compat/arch/sh3/sys/Makefile.inc | 6 +
lib/libc/compat/arch/sh3/sys/compat_Ovfork.S | 84 ++++++++++++++++++++
lib/libc/compat/arch/sh3/sys/compat___semctl.S | 42 ++++++++++
lib/libc/compat/arch/sh3/sys/compat___sigreturn14.S | 48 +++++++++++
lib/libc/compat/arch/sh3/sys/compat___sigtramp1.S | 53 +++++++++++++
lib/libc/compat/arch/sh3/sys/compat_msgctl.S | 45 +++++++++++
lib/libc/compat/arch/sh3/sys/compat_shmctl.S | 45 +++++++++++
lib/libc/compat/arch/sh3/sys/compat_sigaction.S | 45 +++++++++++
lib/libc/compat/arch/sh3/sys/compat_sigpending.S | 51 ++++++++++++
lib/libc/compat/arch/sh3/sys/compat_sigprocmask.S | 85 +++++++++++++++++++++
lib/libc/compat/arch/sh3/sys/compat_sigreturn.S | 51 ++++++++++++
lib/libc/compat/arch/sh3/sys/compat_sigsuspend.S | 72 +++++++++++++++++
25 files changed, 632 insertions(+), 623 deletions(-)
diffs (truncated from 1362 to 300 lines):
diff -r 37a4175c3cd2 -r 53c9297eca1a lib/libc/arch/sh3/Makefile.inc
--- a/lib/libc/arch/sh3/Makefile.inc Thu Sep 15 19:56:50 2005 +0000
+++ b/lib/libc/arch/sh3/Makefile.inc Thu Sep 15 21:39:15 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2003/11/23 23:13:11 uwe Exp $
+# $NetBSD: Makefile.inc,v 1.5 2005/09/15 21:39:15 uwe Exp $
KMINCLUDES= arch/sh3/SYS.h
CPPFLAGS+= -DSOFTFLOAT # -DSOFTFLOAT_NEED_FIXUNS
@@ -8,4 +8,4 @@
#KMSRCS= bcmp.S bzero.S ffs.S strcat.S strcmp.S strcpy.S strlen.S \
# htonl.S htons.S ntohl.S ntohs.S
-SRCS+= __sigaction14_sigtramp.c __sigtramp1.S __sigtramp2.S
+SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
diff -r 37a4175c3cd2 -r 53c9297eca1a lib/libc/arch/sh3/sys/Ovfork.S
--- a/lib/libc/arch/sh3/sys/Ovfork.S Thu Sep 15 19:56:50 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/* $NetBSD: Ovfork.S,v 1.5 2003/08/07 16:42:20 agc Exp $ */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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: @(#)Ovfork.s 5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: Ovfork.S,v 1.5 2003/08/07 16:42:20 agc Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * pid = vfork();
- *
- * r1 == 0 in parent process, r1 == 1 in child process.
- * r0 == pid of child in parent, r0 == pid of parent in child.
- *
- */
-ENTRY(vfork)
- sts pr, r2 /* my rta into r2 */
- mov.l LSYS_vfork, r0
- trapa #0x80
- bf err
- add #0xff, r1
- and r1, r0
- jmp @r2
- nop
-err:
-#ifdef PIC
- mov r0, r2
- mova L_GOT, r0
- mov.l L_GOT, r1
- add r0, r1
- mov.l L_errno, r0
- mov.l @(r0, r1), r1
- mov.l r2, @r1
-#else
- mov.l L_errno, r1
- mov.l r0, @r1
-#endif
- mov #0xff, r0
- jmp @r2
- nop
-
- .align 2
-LSYS_vfork: .long SYS_vfork
-#ifdef PIC
-L_GOT: .long _GLOBAL_OFFSET_TABLE_
-L_errno: .long _C_LABEL(errno)@GOT
-#else
-L_errno: .long _C_LABEL(errno)
-#endif
diff -r 37a4175c3cd2 -r 53c9297eca1a lib/libc/arch/sh3/sys/__semctl.S
--- a/lib/libc/arch/sh3/sys/__semctl.S Thu Sep 15 19:56:50 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/* $NetBSD: __semctl.S,v 1.1 2000/04/20 13:48:14 tsubai Exp $ */
-
-/*-
- * Copyright (c) 1999 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.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff -r 37a4175c3cd2 -r 53c9297eca1a lib/libc/arch/sh3/sys/__sigreturn14.S
--- a/lib/libc/arch/sh3/sys/__sigreturn14.S Thu Sep 15 19:56:50 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/* $NetBSD: __sigreturn14.S,v 1.3 2004/03/26 20:35:37 drochner Exp $ */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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: @(#)sigreturn.s 5.2 (Berkeley) 12/17/90"
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: __sigreturn14.S,v 1.3 2004/03/26 20:35:37 drochner Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-
-PSEUDO(__sigreturn14,compat_16___sigreturn14)
diff -r 37a4175c3cd2 -r 53c9297eca1a lib/libc/arch/sh3/sys/__sigtramp1.S
--- a/lib/libc/arch/sh3/sys/__sigtramp1.S Thu Sep 15 19:56:50 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/* $NetBSD: __sigtramp1.S,v 1.2 2004/03/26 20:35:37 drochner Exp $ */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * 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.h"
-
-/*
- * The SH signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, stack looks like:
- *
- * sp-> sigcontext structure
- */
-NENTRY(__sigtramp_sigcontext_1)
- mov r15, r4 /* get pointer to sigcontext */
- SYSTRAP(compat_16___sigreturn14) /* and call sigreturn() */
- mov r0, r4 /* exit with errno */
- SYSTRAP(exit) /* if sigreturn fails */
diff -r 37a4175c3cd2 -r 53c9297eca1a lib/libc/arch/sh3/sys/msgctl.S
--- a/lib/libc/arch/sh3/sys/msgctl.S Thu Sep 15 19:56:50 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* $NetBSD: msgctl.S,v 1.1 2000/04/20 13:48:14 tsubai Exp $ */
-
-/*-
- * Copyright (c) 1999 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.
- */
Home |
Main Index |
Thread Index |
Old Index