Improve sigcode.S template so linux_sigcode.S can use it as well. Add a
netbsd32_sigcode.S.
This commit is contained in:
matt
parent
d192a5d694
commit
b3d36290af
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: linux_sigcode.S,v 1.2 2001/04/11 19:41:02 manu Exp $ */
|
||||
/* $NetBSD: linux_sigcode.S,v 1.3 2003/01/19 00:00:11 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
|
@ -38,8 +38,6 @@
|
|||
* Emmanuel Dreyfus <p99dreyf@criens.u-psud.fr>
|
||||
*/
|
||||
|
||||
#include <machine/asm.h>
|
||||
|
||||
#include <compat/linux/linux_syscall.h>
|
||||
|
||||
/*
|
||||
|
|
@ -47,24 +45,10 @@
|
|||
*/
|
||||
#define LINUX__SIGNAL_FRAMESIZE 64
|
||||
|
||||
/*
|
||||
* The following code gets copied to the top of the user stack on process
|
||||
* execution. It does signal trampolining on signal delivery.
|
||||
*
|
||||
* On entry r1 points to a struct sigframe at bottom of current stack.
|
||||
* All other registers are unchanged.
|
||||
*
|
||||
* XXX Linux just does this:
|
||||
* 0x38007777 li r0,0x7777
|
||||
* 0x44000002 sc
|
||||
*/
|
||||
.globl _C_LABEL(linux_sigcode),_C_LABEL(linux_esigcode)
|
||||
_C_LABEL(linux_sigcode):
|
||||
addi 1,1,-16 /* reserved space for callee */
|
||||
blrl
|
||||
addi 3,1,16+LINUX__SIGNAL_FRAMESIZE /* compute &sf_sc */
|
||||
li 0,LINUX_SYS_sigreturn
|
||||
sc /* linux_sys_sigreturn(scp) */
|
||||
li 0,LINUX_SYS_exit
|
||||
sc /* linux_sys_exit(errno) */
|
||||
_C_LABEL(linux_esigcode):
|
||||
#define SIGCODE_NAME linux_sigcode
|
||||
#define ESIGCODE_NAME linux_esigcode
|
||||
#define SIGNAL_FRAMESIZE LINUX_SIGNAL_FRAMESIZE
|
||||
#define SIGRETURN_NAME LINUX_SYS_sigreturn
|
||||
#define EXIT_NAME LINUX_SYS_exit
|
||||
|
||||
#include "sigcode.S"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
/* $NetBSD: netbsd32_sigcode.S,v 1.1 2003/01/19 00:00:11 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
* Copyright (C) 1995, 1996 TooLs GmbH.
|
||||
* 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 TooLs GmbH.
|
||||
* 4. The name of TooLs GmbH may not be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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/syscall.h>
|
||||
#include <compat/netbsd32/netbsd32_syscall.h>
|
||||
|
||||
#define SIGCODE_NAME netbsd32_sigcode
|
||||
#define ESIGCODE_NAME netbsd32_esigcode
|
||||
#define SIGRETURN_NAME netbsd32_SYS_netbsd32___sigreturn14
|
||||
#define EXIT_NAME netbsd32_SYS_netbsd32_exit
|
||||
#define SIGCALLFRAMESIZE 16
|
||||
|
||||
#include "sigcode.S"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: sigcode.S,v 1.3 2003/01/18 23:46:32 matt Exp $ */
|
||||
/* $NetBSD: sigcode.S,v 1.4 2003/01/19 00:00:12 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
|
@ -41,6 +41,17 @@
|
|||
#define SIGRETURN_NAME SYS___sigreturn14
|
||||
#define EXIT_NAME SYS_exit
|
||||
#endif
|
||||
#ifndef SIGNAL_FRAMESIZE
|
||||
#define SIGNAL_FRAMESIZE 0
|
||||
#endif
|
||||
#ifndef SIGCALLFRAMESIZE
|
||||
#ifdef _LP64
|
||||
#define SIGCALLFRAMESIZE 32
|
||||
#else
|
||||
#define SIGCALLFRAMESIZE 16
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* The following code gets copied to the top of the user stack on process
|
||||
* execution. It does signal trampolining on signal delivery.
|
||||
|
|
@ -50,11 +61,12 @@
|
|||
*/
|
||||
.globl _C_LABEL(SIGCODE_NAME),_C_LABEL(ESIGCODE_NAME)
|
||||
_C_LABEL(SIGCODE_NAME):
|
||||
addi %r1,%r1,-16 /* reserved space for callee */
|
||||
addi %r1,%r1,-SIGCALLFRAMESIZE /* reserved space for callee */
|
||||
blrl
|
||||
addi %r3,%r1,16 /* compute &sf_sc */
|
||||
addi %r3,%r1,SIGCALLFRAMESIZE+SIGNAL_FRAMESIZE
|
||||
/* compute &sf_sc */
|
||||
li %r0,SIGRETURN_NAME
|
||||
sc /* sigreturn(scp) */
|
||||
sc /* sigreturn(scp) */
|
||||
li %r0,EXIT_NAME
|
||||
sc /* exit(errno) */
|
||||
sc /* exit(errno) */
|
||||
_C_LABEL(ESIGCODE_NAME):
|
||||
|
|
|
|||
Loading…
Reference in New Issue