c5c6b7b38e
struct sigcontext and ucontext_t/mcontext_t are defined in such
a way that both (ie struct sigcontext and ucontext_t) can be
passed on to sigreturn. The signal handler is still given a
ucontext_t for maximum flexibility.
For backward compatibility sigreturn restores the state for the
alternate signal stack from sigcontext.sc_onstack and not from
ucontext_t.uc_stack. A good way to determine which value the
application has set and thus which value to use, is still open
for discussion.
NOTE: This change should only affect those binaries that use
sigcontext and/or ucontext_t. In the source tree itself
this is only doscmd. Recompilation is required for those
applications.
This commit also fixes a lot of style bugs without hopefully
adding new ones.
NOTE: struct sigaltstack.ss_size now has type size_t again. For
some reason I changed that into unsigned int.
Parts submitted by: bde
sigaltstack bug found by: bde
120 lines
3.4 KiB
C
120 lines
3.4 KiB
C
/*
|
|
* Copyright (c) 1986, 1989, 1991, 1993
|
|
* The Regents of the University of California. 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 the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
|
|
*
|
|
* @(#)signal.h 8.1 (Berkeley) 6/11/93
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _MACHINE_SIGNAL_H_
|
|
#define _MACHINE_SIGNAL_H_
|
|
|
|
/*
|
|
* Machine-dependent signal definitions
|
|
*/
|
|
|
|
typedef int sig_atomic_t;
|
|
|
|
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
|
|
|
|
#include <machine/trap.h> /* codes for SIGILL, SIGFPE */
|
|
|
|
/*
|
|
* Information pushed on stack when a signal is delivered.
|
|
* This is used by the kernel to restore state following
|
|
* execution of the signal handler. It is also made available
|
|
* to the handler to allow it to restore state properly if
|
|
* a non-standard exit is performed.
|
|
*/
|
|
typedef unsigned int osigset_t;
|
|
|
|
struct osigcontext {
|
|
int sc_onstack; /* sigstack state to restore */
|
|
osigset_t sc_mask; /* signal mask to restore */
|
|
int sc_esp; /* machine state */
|
|
int sc_ebp;
|
|
int sc_isp;
|
|
int sc_eip;
|
|
int sc_efl;
|
|
int sc_es;
|
|
int sc_ds;
|
|
int sc_cs;
|
|
int sc_ss;
|
|
int sc_edi;
|
|
int sc_esi;
|
|
int sc_ebx;
|
|
int sc_edx;
|
|
int sc_ecx;
|
|
int sc_eax;
|
|
int sc_gs;
|
|
int sc_fs;
|
|
int sc_trapno;
|
|
int sc_err;
|
|
};
|
|
|
|
/*
|
|
* The sequence of the fields/registers in sigcontext should match
|
|
* those in mcontext_t.
|
|
*/
|
|
struct sigcontext {
|
|
sigset_t sc_mask; /* signal mask to restore */
|
|
int sc_onstack; /* sigstack state to restore */
|
|
int sc_gs;
|
|
int sc_fs;
|
|
int sc_es;
|
|
int sc_ds;
|
|
int sc_edi;
|
|
int sc_esi;
|
|
int sc_ebp;
|
|
int sc_isp;
|
|
int sc_ebx;
|
|
int sc_edx;
|
|
int sc_ecx;
|
|
int sc_eax;
|
|
int sc_trapno;
|
|
int sc_err;
|
|
int sc_eip;
|
|
int sc_cs;
|
|
int sc_efl;
|
|
int sc_esp; /* machine state */
|
|
int sc_ss;
|
|
};
|
|
|
|
#define sc_sp sc_esp
|
|
#define sc_fp sc_ebp
|
|
#define sc_pc sc_eip
|
|
#define sc_ps sc_efl
|
|
#define sc_eflags sc_efl
|
|
|
|
#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */
|
|
|
|
#endif /* !_MACHINE_SIGNAL_H_ */
|