Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add SA_SIGINFO support for ARM.

This commit is contained in:
matt 2003-10-05 19:48:39 +00:00
parent 73ca535921
commit f3198687d6
3 changed files with 84 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libc/arch/arm/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.5 2002/07/10 04:29:06 thorpej Exp $
# $NetBSD: Makefile.inc,v 1.6 2003/10/05 19:48:39 matt Exp $
.include <bsd.own.mk>
@ -6,7 +6,7 @@ KMINCLUDES=
KMSRCS=arch/arm/gen/divsi3.S arch/arm/string/memmove.S \
arch/arm/string/memcpy.S
SRCS+= __sigaction14_sigtramp.c __sigtramp1.S
SRCS+= __sigaction14_sigtramp.c __sigtramp1.S __sigtramp2.S
CPPFLAGS += -DSOFTFLOAT

34
lib/libc/arch/arm/sys/__sigaction14_sigtramp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: __sigaction14_sigtramp.c,v 1.2 2003/01/18 11:06:25 thorpej Exp $ */
/* $NetBSD: __sigaction14_sigtramp.c,v 1.3 2003/10/05 19:48:39 matt Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -36,10 +36,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#define __LIBC12_SOURCE__
#include <sys/types.h>
#include <stddef.h>
#include <signal.h>
#include <errno.h>
#include "extern.h"
@ -48,13 +48,31 @@ __weak_alias(__sigaction14, __libc_sigaction14)
int
__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
{
extern int __sigtramp_sigcontext_1[];
extern const int __sigtramp_sigcontext_1[];
extern const int __sigtramp_siginfo_2[];
int rv;
/*
* Right here we should select the SA_SIGINFO trampoline
* if SA_SIGINFO is set in the sigaction.
* If no sigaction, use the "default" trampoline since it won't
* be used.
*/
if (act == NULL)
return __sigaction_sigtramp(sig, act, oact, NULL, 0);
return (__sigaction_sigtramp(sig, act, oact,
__sigtramp_sigcontext_1, 1));
/*
* We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
* set in the sigaction.
*/
if ((act->sa_flags & SA_SIGINFO) == 0) {
rv = __sigaction_sigtramp(sig, act, oact,
__sigtramp_sigcontext_1, 1);
if (rv >= 0 || errno != EINVAL)
return rv;
}
/*
* If SA_SIGINFO was specificed or the compatibility trampolines
* can't be used, use the siginfo trampoline.
*/
return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
}

56
lib/libc/arch/arm/sys/__sigtramp2.S Executable file
View File

@ -0,0 +1,56 @@
/* $NetBSD: __sigtramp2.S,v 1.1 2003/10/05 19:48:39 matt 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 ARM signal trampoline is invoked only to return from
* the signal; the kernel calls the signal handler directly.
*
* On entry, the stack looks like:
*
* ucontext structure
* sp-> siginfo structure
* and r5 points to the ucontext
*/
ENTRY_NP(__sigtramp_siginfo_2)
mov r0, r5 /* set the arg */
SYSTRAP(setcontext) /* and call setcontext */
/* If that failed, exit with the error code. */
SYSTRAP(exit)