diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-02-03 15:54:46 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-02-03 15:54:46 +0000 |
| commit | 8fcce15e77b4e4484b4e57cab7dca9bbcfec313e (patch) | |
| tree | 29fba4dd081c7b9a39bb030b9245bd57e54904b4 /sys/arch/hp300 | |
| parent | 36673853fc6ee0ff9ae8cc28e77379253b98a06d (diff) | |
mv siginfo_t * to the proper place
Diffstat (limited to 'sys/arch/hp300')
| -rw-r--r-- | sys/arch/hp300/hp300/locore.s | 11 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/machdep.c | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s index 11f3f63aa5c..735ee0ec998 100644 --- a/sys/arch/hp300/hp300/locore.s +++ b/sys/arch/hp300/hp300/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.8 1997/02/03 04:47:56 downsj Exp $ */ +/* $OpenBSD: locore.s,v 1.9 1997/02/03 15:54:43 deraadt Exp $ */ /* $NetBSD: locore.s,v 1.62 1996/11/06 20:19:30 cgd Exp $ */ /* @@ -1142,11 +1142,10 @@ _proc_trampoline: * Stack looks like: * * sp+0 -> signal number - * sp+4 signal specific code + * sp+4 pointer to siginfo (sip) * sp+8 pointer to signal context frame (scp) - * sp+12 pointer to siginfo (sip) - * sp+16 address of handler - * sp+20 saved hardware state + * sp+12 address of handler + * sp+16 saved hardware state * . * . * scp+0-> beginning of signal context frame @@ -1154,7 +1153,7 @@ _proc_trampoline: .globl _sigcode, _esigcode, _sigcodetrap .data _sigcode: - movl sp@(16),a0 | signal handler addr (4 bytes) + movl sp@(12),a0 | signal handler addr (4 bytes) jsr a0@ | call signal handler (2 bytes) addql #4,sp | pop signo (2 bytes) _sigcodetrap: diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c index 8a11216119d..59bf97b2687 100644 --- a/sys/arch/hp300/hp300/machdep.c +++ b/sys/arch/hp300/hp300/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.13 1997/02/03 12:48:46 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.14 1997/02/03 15:54:45 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.77 1996/12/11 16:49:23 thorpej Exp $ */ /* @@ -729,9 +729,8 @@ struct sigstate { */ struct sigframe { int sf_signum; /* signo for handler */ - int sf_code; /* additional info for handler */ + siginfo_t *sf_sip; /* pointer to siginfo_t */ struct sigcontext *sf_scp; /* context ptr for handler */ - siginfo_t *sf_sip; sig_t sf_handler; /* handler addr for u_sigc */ struct sigstate sf_state; /* state of the hardware */ struct sigcontext sf_sc; /* actual context */ @@ -849,10 +848,9 @@ sendsig(catcher, sig, mask, code, type, val) * Build the argument list for the signal handler. */ kfp->sf_signum = sig; - kfp->sf_code = code; + kfp->sf_sip = NULL; kfp->sf_scp = &fp->sf_sc; kfp->sf_handler = catcher; - kfp->sf_sip = NULL; /* * Save necessary hardware state. Currently this includes: |