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/gen to the new compat code layout.
details: https://anonhg.NetBSD.org/src/rev/346d67398e72
branches: trunk
changeset: 584412:346d67398e72
user: uwe <uwe%NetBSD.org@localhost>
date: Thu Sep 15 22:44:58 2005 +0000
description:
Switch arch/sh3/gen to the new compat code layout.
diffstat:
lib/libc/arch/sh3/gen/Makefile.inc | 4 +-
lib/libc/arch/sh3/gen/__setjmp14.S | 135 -----------------------
lib/libc/arch/sh3/gen/__sigsetjmp14.S | 138 ------------------------
lib/libc/arch/sh3/gen/_setjmp.S | 85 --------------
lib/libc/arch/sh3/gen/setjmp.S | 54 ++++----
lib/libc/arch/sh3/gen/sigsetjmp.S | 66 +++++-----
lib/libc/compat/arch/sh3/Makefile.inc | 3 +-
lib/libc/compat/arch/sh3/gen/Makefile.inc | 10 +
lib/libc/compat/arch/sh3/gen/compat__setjmp.S | 85 ++++++++++++++
lib/libc/compat/arch/sh3/gen/compat_setjmp.S | 133 +++++++++++++++++++++++
lib/libc/compat/arch/sh3/gen/compat_sigsetjmp.S | 138 ++++++++++++++++++++++++
11 files changed, 431 insertions(+), 420 deletions(-)
diffs (truncated from 1020 to 300 lines):
diff -r f75f738912ad -r 346d67398e72 lib/libc/arch/sh3/gen/Makefile.inc
--- a/lib/libc/arch/sh3/gen/Makefile.inc Thu Sep 15 21:56:30 2005 +0000
+++ b/lib/libc/arch/sh3/gen/Makefile.inc Thu Sep 15 22:44:58 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.17 2005/04/15 22:39:11 kleink Exp $
+# $NetBSD: Makefile.inc,v 1.18 2005/09/15 22:44:58 uwe Exp $
-SRCS+= _setjmp.S setjmp.S sigsetjmp.S __setjmp14.S __sigsetjmp14.S
+SRCS+= setjmp.S sigsetjmp.S
SRCS+= makecontext.c resumecontext.c swapcontext.S
diff -r f75f738912ad -r 346d67398e72 lib/libc/arch/sh3/gen/__setjmp14.S
--- a/lib/libc/arch/sh3/gen/__setjmp14.S Thu Sep 15 21:56:30 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/* $NetBSD: __setjmp14.S,v 1.6 2003/08/07 16:42:19 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: @(#)setjmp.s 5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
- RCSID("$NetBSD: __setjmp14.S,v 1.6 2003/08/07 16:42:19 agc Exp $")
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- * longjmp(a,v)
- * will generate a "return(v)" from the last call to
- * setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- */
-
-ENTRY(__setjmp14)
- sts.l pr, @-r15
- mov.l r4, @-r15
- mov r4, r6
- mov #1, r4 /* SIG_BLOCK */
- mov #0, r5
- add #4*10, r6 /* &sigmask */
-
-#ifdef PIC
- mov.l L__sigprocmask14r1, r0
- bsrf r0
- nop
-L__sigprocmask14o1:
-#else
- mov.l L__sigprocmask14, r0
- jsr @r0
- nop
-#endif
-
- mov.l @r15+, r4
- lds.l @r15+, pr
- add #4*10, r4
- mov #1, r0
- mov.l r0, @-r4 /* savemask */
- mov.l r15, @-r4
- mov.l r14, @-r4
- mov.l r13, @-r4
- mov.l r12, @-r4
- mov.l r11, @-r4
- mov.l r10, @-r4
- mov.l r9, @-r4
- mov.l r8, @-r4
- sts.l pr, @-r4
- rts
- xor r0, r0
-
-ENTRY(__longjmp14)
- mov.l r4, @-r15
- mov.l r5, @-r15
-
- mov r4, r5
- mov #3, r4 /* SIG_SETMASK */
- add #4*10, r5 /* &sigmask */
- mov #0, r6
-#ifdef PIC
- mov.l L__sigprocmask14r2, r0
- bsrf r0
- nop
-L__sigprocmask14o2:
-#else
- mov.l L__sigprocmask14, r0
- jsr @r0
- nop
-#endif
- mov.l @r15+, r5
- mov.l @r15+, r4
-
- lds.l @r4+, pr
- mov.l @r4+, r8
- mov.l @r4+, r9
- mov.l @r4+, r10
- mov.l @r4+, r11
- mov.l @r4+, r12
- mov.l @r4+, r13
- mov.l @r4+, r14
- mov.l @r4+, r15
- mov r5, r0
- tst r0, r0
- bf .L0
- add #1, r0
-.L0:
- rts
- nop
-
- .align 2
-#ifdef PIC
-L__sigprocmask14r1:
- .long _C_LABEL(__sigprocmask14)-L__sigprocmask14o1
-L__sigprocmask14r2:
- .long _C_LABEL(__sigprocmask14)-L__sigprocmask14o2
-#else
-L__sigprocmask14:
- .long _C_LABEL(__sigprocmask14)
-#endif
diff -r f75f738912ad -r 346d67398e72 lib/libc/arch/sh3/gen/__sigsetjmp14.S
--- a/lib/libc/arch/sh3/gen/__sigsetjmp14.S Thu Sep 15 21:56:30 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/* $NetBSD: __sigsetjmp14.S,v 1.6 2003/08/07 16:42:19 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: @(#)setjmp.s 5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
- RCSID("$NetBSD: __sigsetjmp14.S,v 1.6 2003/08/07 16:42:19 agc Exp $")
-#endif
-
-ENTRY(__sigsetjmp14)
- tst r5, r5
- bt 1f
-
- sts.l pr, @-r15
- mov.l r4, @-r15
- mov.l r5, @-r15
- mov r4, r6
- mov #1, r4 /* SIG_BLOCK */
- mov #0, r5
- add #4*10, r6 /* &sigmask */
-
-#ifdef PIC
- mov.l L__sigprocmask14r1, r0
- bsrf r0
- nop
-L__sigprocmask14o1:
-#else
- mov.l L__sigprocmask14, r0
- jsr @r0
- nop
-#endif
-
- mov.l @r15+, r5
- mov.l @r15+, r4
- lds.l @r15+, pr
-
-1:
- add #4*10, r4
- mov.l r5, @-r4
- mov.l r15, @-r4
- mov.l r14, @-r4
- mov.l r13, @-r4
- mov.l r12, @-r4
- mov.l r11, @-r4
- mov.l r10, @-r4
- mov.l r9, @-r4
- mov.l r8, @-r4
- sts.l pr, @-r4
- rts
- xor r0, r0
-
-ENTRY(__siglongjmp14)
- mov r4, r0
- add #4*9, r0
- mov.l @r0, r0
- tst r0, r0
- bt 1f
-
- mov.l r4, @-r15
- mov.l r5, @-r15
- mov r4, r5
- mov #3, r4 /* SIG_SETMASK */
- add #4*10, r5 /* &sigmask */
- mov #0, r6
-#ifdef PIC
- mov.l L__sigprocmask14r2, r0
- bsrf r0
- nop
-L__sigprocmask14o2:
-#else
- mov.l L__sigprocmask14, r0
- jsr @r0
- nop
-#endif
- mov.l @r15+, r5
- mov.l @r15+, r4
-
-1:
- lds.l @r4+, pr
- mov.l @r4+, r8
- mov.l @r4+, r9
- mov.l @r4+, r10
- mov.l @r4+, r11
- mov.l @r4+, r12
- mov.l @r4+, r13
- mov.l @r4+, r14
- mov.l @r4+, r15
-
- mov r5, r0
- tst r0, r0
- bf .L0
- add #1, r0
-.L0:
- rts
- nop
-
- .align 2
-#ifdef PIC
-L__sigprocmask14r1:
- .long _C_LABEL(__sigprocmask14)-L__sigprocmask14o1
-L__sigprocmask14r2:
- .long _C_LABEL(__sigprocmask14)-L__sigprocmask14o2
-#else
-L__sigprocmask14:
- .long _C_LABEL(__sigprocmask14)
-#endif
diff -r f75f738912ad -r 346d67398e72 lib/libc/arch/sh3/gen/_setjmp.S
--- a/lib/libc/arch/sh3/gen/_setjmp.S Thu Sep 15 21:56:30 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/* $NetBSD: _setjmp.S,v 1.2 2003/08/07 16:42:19 agc Exp $ */
-
-/*-
Home |
Main Index |
Thread Index |
Old Index