Tue Jul 16 22:19:16 2013 UTC ()
Add END(func)
Use SYSTRAP


(matt)
diff -r1.3 -r1.4 src/lib/libc/arch/m68k/sys/__sigtramp2.S
diff -r1.2 -r1.3 src/lib/libc/arch/m68k/sys/_lwp_getprivate.S
cvs diff -r1.3 -r1.4 src/lib/libc/arch/m68k/sys/__sigtramp2.S (expand / switch to unified diff)

--- src/lib/libc/arch/m68k/sys/__sigtramp2.S 2013/07/16 20:49:42 1.3
+++ src/lib/libc/arch/m68k/sys/__sigtramp2.S 2013/07/16 22:19:16 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: __sigtramp2.S,v 1.3 2013/07/16 20:49:42 matt Exp $ */ 1/* $NetBSD: __sigtramp2.S,v 1.4 2013/07/16 22:19:16 matt Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2003 The NetBSD Foundation, Inc. 4 * Copyright (c) 2003 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -34,17 +34,17 @@ @@ -34,17 +34,17 @@
34 * 34 *
35 * On entry, stack looks like: 35 * On entry, stack looks like:
36 * 36 *
37 * ucontext structure [12+sizeof(siginfo_t)] 37 * ucontext structure [12+sizeof(siginfo_t)]
38 * siginfo structure [12] 38 * siginfo structure [12]
39 * pointer to ucontext structure [8] 39 * pointer to ucontext structure [8]
40 * pointer to siginfo structure [4] 40 * pointer to siginfo structure [4]
41 * sp-> signal number [0] 41 * sp-> signal number [0]
42 */ 42 */
43ENTRY_NOPROFILE(__sigtramp_siginfo_2) 43ENTRY_NOPROFILE(__sigtramp_siginfo_2)
44 movl 8(%sp),%a0 /* get pointer to ucontext */ 44 movl 8(%sp),%a0 /* get pointer to ucontext */
45 movl %a0,4(%sp) /* put it in the argument slot */ 45 movl %a0,4(%sp) /* put it in the argument slot */
46 /* fake return address already there */ 46 /* fake return address already there */
47 movl #SYS_setcontext,%d0 47 SYSTRAP(setcontext)
48 trap #0 
49 movl %d0,4(%sp) /* error code */ 48 movl %d0,4(%sp) /* error code */
50 SYSTRAP(exit) /* exit */ 49 SYSTRAP(exit) /* exit */
 50END(__sigtramp_siginfo_2)
cvs diff -r1.2 -r1.3 src/lib/libc/arch/m68k/sys/_lwp_getprivate.S (expand / switch to unified diff)

--- src/lib/libc/arch/m68k/sys/_lwp_getprivate.S 2008/04/28 20:22:56 1.2
+++ src/lib/libc/arch/m68k/sys/_lwp_getprivate.S 2013/07/16 22:19:16 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: _lwp_getprivate.S,v 1.2 2008/04/28 20:22:56 martin Exp $ */ 1/* $NetBSD: _lwp_getprivate.S,v 1.3 2013/07/16 22:19:16 matt Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 The NetBSD Foundation, Inc. 4 * Copyright (c) 2007 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -23,13 +23,14 @@ @@ -23,13 +23,14 @@
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26 * POSSIBILITY OF SUCH DAMAGE. 26 * POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29#include "SYS.h" 29#include "SYS.h"
30 30
31SYSCALL(_lwp_getprivate) 31SYSCALL(_lwp_getprivate)
32#ifdef __SVR4_ABI__ 32#ifdef __SVR4_ABI__
33 movl %d0,%a0 33 movl %d0,%a0
34#endif 34#endif
35 rts 35 rts
 36END(_lwp_getprivate)