add a siginfo signal trampoline and always use it.
This commit is contained in:
chs
parent
56371a56c7
commit
61b506f0a2
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: __sigaction14_sigtramp.c,v 1.1 2002/07/09 23:32:36 thorpej Exp $ */
|
||||
/* $NetBSD: __sigaction14_sigtramp.c,v 1.2 2004/07/18 22:38:07 chs Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
|
|
@ -43,16 +43,13 @@
|
|||
|
||||
#include "extern.h"
|
||||
|
||||
int
|
||||
__sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
|
||||
{
|
||||
extern int __sigtramp_sigcontext_1[];
|
||||
__weak_alias(__sigaction14, __libc_sigaction14)
|
||||
|
||||
/*
|
||||
* Right here we should select the SA_SIGINFO trampoline
|
||||
* if SA_SIGINFO is set in the sigaction.
|
||||
*/
|
||||
int
|
||||
__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
|
||||
{
|
||||
extern int __sigtramp_siginfo_2[];
|
||||
|
||||
return (__sigaction_sigtramp(sig, act, oact,
|
||||
__sigtramp_sigcontext_1, 1));
|
||||
__sigtramp_siginfo_2, 2));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,118 @@
|
|||
/* $NetBSD: __sigtramp2.S,v 1.1 2004/07/18 22:38:07 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998-2001 Michael Shalayeff
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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 Michael Shalayeff.
|
||||
* 4. The name of the author may not be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR OR HIS RELATIVES 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 MIND, 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.
|
||||
*
|
||||
* Portitions of this file are derived from other sources, see
|
||||
* the copyrights and acknowledgements below.
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 1990,1991,1992,1994 The University of Utah and
|
||||
* the Computer Systems Laboratory (CSL). All rights reserved.
|
||||
*
|
||||
* THE UNIVERSITY OF UTAH AND CSL PROVIDE THIS SOFTWARE IN ITS "AS IS"
|
||||
* CONDITION, AND DISCLAIM ANY LIABILITY OF ANY KIND FOR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM ITS USE.
|
||||
*
|
||||
* CSL requests users of this software to return to csl-dist@cs.utah.edu any
|
||||
* improvements that they make and grant CSL redistribution rights.
|
||||
*
|
||||
* Utah $Hdr: locore.s 1.62 94/12/15$
|
||||
*/
|
||||
/*
|
||||
* (c) Copyright 1988 HEWLETT-PACKARD COMPANY
|
||||
*
|
||||
* To anyone who acknowledges that this file is provided "AS IS"
|
||||
* without any express or implied warranty:
|
||||
* permission to use, copy, modify, and distribute this file
|
||||
* for any purpose is hereby granted without fee, provided that
|
||||
* the above copyright notice and this notice appears in all
|
||||
* copies, and that the name of Hewlett-Packard Company not be
|
||||
* used in advertising or publicity pertaining to distribution
|
||||
* of the software without specific, written prior permission.
|
||||
* Hewlett-Packard Company makes no representations about the
|
||||
* suitability of this software for any purpose.
|
||||
*/
|
||||
|
||||
#include "SYS.h"
|
||||
|
||||
ENTRY_NOPROFILE(__sigtramp_siginfo_2, 0)
|
||||
.call
|
||||
|
||||
/*
|
||||
* Our sendsig() places the address of the signal handler in %arg3.
|
||||
* It may actually be a PLABEL.
|
||||
*/
|
||||
bb,>=,n %arg3, 30, L$sigcode_bounce ; branch if not a PLABEL
|
||||
depi 0, 31, 2, %arg3 ; zero L bit in PLABEL pointer
|
||||
ldw 4(%arg3), %r19 ; load shared library linkage
|
||||
ldw 0(%arg3), %arg3 ; load real catcher address
|
||||
|
||||
L$sigcode_bounce:
|
||||
|
||||
/*
|
||||
* This blr puts the address of the following nop in rp.
|
||||
* It also schedules the nop for execution, which is why
|
||||
* that instruction has to be a nop, or, rather, not any
|
||||
* instruction only meant to execute once the signal handler
|
||||
* returns.
|
||||
*/
|
||||
blr %r0, %rp
|
||||
|
||||
/*
|
||||
* This bv schedules the instruction pointed to by arg3
|
||||
* for execution. So, arg3 is the address of the signal
|
||||
* handler.
|
||||
*/
|
||||
bv,n %r0(%arg3)
|
||||
nop
|
||||
|
||||
/*
|
||||
* The signal handler has returned. Since r3 is on the list
|
||||
* of callee-saved registers, it's whatever the sendsig
|
||||
* code wanted it set to. Since we copy it into arg0,
|
||||
* it looks like sendsig leaves r3 holding the desired
|
||||
* single argument to sys_setcontext, i.e., the ucontext_t *.
|
||||
*/
|
||||
|
||||
/* Make a SYS_setcontext system call. */
|
||||
copy %r3, %arg0
|
||||
ldil L%SYSCALLGATE, %r1
|
||||
.call
|
||||
ble 4(%sr7, %r1)
|
||||
ldi SYS_setcontext, %t1
|
||||
|
||||
/* Make a SYS_exit system call. */
|
||||
copy %ret0, %arg0
|
||||
ldil L%SYSCALLGATE, %r1
|
||||
.call
|
||||
ble 4(%sr7, %r1)
|
||||
ldi SYS_exit, %t1
|
||||
EXIT(__sigtramp_sigcontext_1)
|
||||
Loading…
Reference in New Issue