Separate out sigcode into its own file, since it's shared by arm26 and arm32.

This commit is contained in:
bjh21 2001-01-13 00:06:50 +00:00
parent e4cacac41c
commit 78c0ba909e
5 changed files with 76 additions and 64 deletions

View File

@ -0,0 +1,68 @@
/* $NetBSD: sigcode.S,v 1.1 2001/01/13 00:06:50 bjh21 Exp $ */
/*
* Copyright (C) 1994-1997 Mark Brinicombe
* Copyright (C) 1994 Brini
* 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 Brini.
* 4. The name of Brini may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY BRINI ``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 BRINI 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 <machine/asm.h>
RCSID("$NetBSD: sigcode.S,v 1.1 2001/01/13 00:06:50 bjh21 Exp $")
#include "assym.h"
#include <sys/syscall.h>
/*
* Signal trampoline; copied to top of user stack.
*/
ENTRY_NP(sigcode)
/*
* r0-r2 are our signal handler parameters
* r3 is the handler address
*/
add lr, pc, #0 /* Set return address */
mov pc, r3 /* Call the handler */
/*
* Call sig_return with address of the signal context
* Note: Don't use SIG_SCP as this make have been trashed by the program
*/
add r0, sp, #SIGF_SC
swi SYS___sigreturn14
/* Well if that failed we better exit quick ! */
swi SYS_exit
b . - 8
.align 0
.global _C_LABEL(esigcode)
_C_LABEL(esigcode):

View File

@ -1,4 +1,4 @@
# $NetBSD: files.arm,v 1.4 2001/01/12 21:31:52 bjh21 Exp $
# $NetBSD: files.arm,v 1.5 2001/01/13 00:06:50 bjh21 Exp $
file arch/arm/arm/in_cksum_arm.c inet
file netinet/in4_cksum.c inet
@ -9,3 +9,5 @@ file arch/arm/arm/db_disasm.c ddb
# files related to debugging
file arch/arm/arm/disassem.c
file arch/arm/arm/sigcode.S

View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.1 2000/05/09 21:55:56 bjh21 Exp $
# $NetBSD: genassym.cf,v 1.2 2001/01/13 00:06:50 bjh21 Exp $
#
# Copyright (c) 1999 Ben Harris
# All rights reserved.
@ -43,4 +43,4 @@ define TF_SIZE sizeof(struct trapframe)
define IF_R15 offsetof(struct irqframe, if_r15)
define IF_SIZE sizeof(struct irqframe)
define SF_SC offsetof(struct sigframe, sf_sc)
define SIGF_SC offsetof(struct sigframe, sf_sc)

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.8 2001/01/07 19:39:09 bjh21 Exp $ */
/* $NetBSD: locore.S,v 1.9 2001/01/13 00:06:51 bjh21 Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 Ben Harris
* Copyright (C) 1994-1997 Mark Brinicombe
@ -429,36 +429,7 @@ ENTRY(cpu_Debugger)
bl _C_LABEL(kdb_trap)
add r13, r13, #(4 * 16)
ldmfd r13!, {pc}^
#endif
/*
* Signal trampoline; copied to top of user stack.
*/
ENTRY_NP(sigcode)
/*
* r0-r2 are our signal handler parameters
* r3 is the handler address
*/
add lr, pc, #0 /* Set return address */
mov pc, r3 /* Call the handler */
/*
* Call sig_return with address of the signal context
* Note: Don't use SIG_SCP as this make have been trashed by the program
*/
add r0, sp, #SF_SC
swi SYS___sigreturn14
/* Well if that failed we better exit quick ! */
swi SYS_exit
b . - 8
.align 0
.global _C_LABEL(esigcode)
_C_LABEL(esigcode):
/*
* Dummy symbols for vmstat -i
@ -472,4 +443,4 @@ _C_LABEL(intrcnt):
.global _C_LABEL(eintrcnt)
_C_LABEL(eintrcnt):
RCSID("$NetBSD: locore.S,v 1.8 2001/01/07 19:39:09 bjh21 Exp $")
RCSID("$NetBSD: locore.S,v 1.9 2001/01/13 00:06:51 bjh21 Exp $")

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.34 2000/03/24 17:05:30 ws Exp $ */
/* $NetBSD: locore.S,v 1.35 2001/01/13 00:06:51 bjh21 Exp $ */
/*
* Copyright (C) 1994-1997 Mark Brinicombe
@ -206,35 +206,6 @@ Lcpu_reset_address:
.word _C_LABEL(cpu_reset_address)
#endif /* OFW */
/*
* Signal trampoline; copied to top of user stack.
*/
ENTRY_NP(sigcode)
/*
* r0-r2 are our signal handler parameters
* r3 is the handler address
*/
add lr, pc, #0 /* Set return address */
mov pc, r3 /* Call the handler */
/*
* Call sig_return with address of the signal context
* Note: Don't use SIG_SCP as this make have been trashed by the program
*/
add r0, sp, #SIGF_SC
swi SYS___sigreturn14
/* Well if that failed we better exit quick ! */
swi SYS_exit
b . - 8
.align 0
.global _C_LABEL(esigcode)
_C_LABEL(esigcode):
#ifdef IPKDB
#if 0
/*