Deleted Added
sdiff udiff text old ( 190623 ) new ( 227399 )
full compact
signal.h (190623) signal.h (227399)
1/*-
2 * Copyright (c) 1986, 1989, 1991, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)signal.h 8.1 (Berkeley) 6/11/93
1/*-
2 * Copyright (c) 1986, 1989, 1991, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)signal.h 8.1 (Berkeley) 6/11/93
30 * $FreeBSD: head/sys/i386/include/signal.h 190623 2009-04-01 13:44:28Z kib $
30 * $FreeBSD: head/sys/i386/include/signal.h 227399 2011-11-09 18:25:50Z kib $
31 */
32
33#ifndef _MACHINE_SIGNAL_H_
34#define _MACHINE_SIGNAL_H_
35
36#include <sys/cdefs.h>
37#include <sys/_sigset.h>
38
39/*
40 * Machine-dependent signal definitions
41 */
42
43typedef int sig_atomic_t;
44
45#if __BSD_VISIBLE
46#include <machine/trap.h> /* codes for SIGILL, SIGFPE */
47
48/*
31 */
32
33#ifndef _MACHINE_SIGNAL_H_
34#define _MACHINE_SIGNAL_H_
35
36#include <sys/cdefs.h>
37#include <sys/_sigset.h>
38
39/*
40 * Machine-dependent signal definitions
41 */
42
43typedef int sig_atomic_t;
44
45#if __BSD_VISIBLE
46#include <machine/trap.h> /* codes for SIGILL, SIGFPE */
47
48/*
49 * Only the kernel should need these old type definitions.
50 */
51#if defined(_KERNEL) && defined(COMPAT_43)
52/*
53 * Information pushed on stack when a signal is delivered.
54 * This is used by the kernel to restore state following
55 * execution of the signal handler. It is also made available
56 * to the handler to allow it to restore state properly if
57 * a non-standard exit is performed.
58 */
49 * Information pushed on stack when a signal is delivered.
50 * This is used by the kernel to restore state following
51 * execution of the signal handler. It is also made available
52 * to the handler to allow it to restore state properly if
53 * a non-standard exit is performed.
54 */
55
56#if defined(_KERNEL) && defined(COMPAT_43)
57/*
58 * Only the kernel should need these old type definitions.
59 */
59struct osigcontext {
60 int sc_onstack; /* sigstack state to restore */
61 osigset_t sc_mask; /* signal mask to restore */
62 int sc_esp; /* machine state follows: */
63 int sc_ebp;
64 int sc_isp;
65 int sc_eip;
66 int sc_efl;

--- 11 unchanged lines hidden (view full) ---

78 int sc_fs;
79 int sc_trapno;
80 int sc_err;
81};
82#endif
83
84/*
85 * The sequence of the fields/registers in struct sigcontext should match
60struct osigcontext {
61 int sc_onstack; /* sigstack state to restore */
62 osigset_t sc_mask; /* signal mask to restore */
63 int sc_esp; /* machine state follows: */
64 int sc_ebp;
65 int sc_isp;
66 int sc_eip;
67 int sc_efl;

--- 11 unchanged lines hidden (view full) ---

79 int sc_fs;
80 int sc_trapno;
81 int sc_err;
82};
83#endif
84
85/*
86 * The sequence of the fields/registers in struct sigcontext should match
86 * those in mcontext_t.
87 * those in mcontext_t and struct trapframe.
87 */
88struct sigcontext {
89 struct __sigset sc_mask; /* signal mask to restore */
90 int sc_onstack; /* sigstack state to restore */
91 int sc_gs; /* machine state (struct trapframe) */
92 int sc_fs;
93 int sc_es;
94 int sc_ds;

--- 9 unchanged lines hidden (view full) ---

104 int sc_err;
105 int sc_eip;
106 int sc_cs;
107 int sc_efl;
108 int sc_esp;
109 int sc_ss;
110 int sc_len; /* sizeof(mcontext_t) */
111 /*
88 */
89struct sigcontext {
90 struct __sigset sc_mask; /* signal mask to restore */
91 int sc_onstack; /* sigstack state to restore */
92 int sc_gs; /* machine state (struct trapframe) */
93 int sc_fs;
94 int sc_es;
95 int sc_ds;

--- 9 unchanged lines hidden (view full) ---

105 int sc_err;
106 int sc_eip;
107 int sc_cs;
108 int sc_efl;
109 int sc_esp;
110 int sc_ss;
111 int sc_len; /* sizeof(mcontext_t) */
112 /*
112 * XXX - See <machine/ucontext.h> and <machine/npx.h> for
113 * the following fields.
113 * See and for
114 * the following fields.
114 */
115 int sc_fpformat;
116 int sc_ownedfp;
117 int sc_spare1[1];
118 int sc_fpstate[128] __aligned(16);
119
120 int sc_fsbase;
121 int sc_gsbase;

--- 13 unchanged lines hidden --- 		115 */
116 int sc_fpformat;
117 int sc_ownedfp;
118 int sc_spare1[1];
119 int sc_fpstate[128] __aligned(16);
120
121 int sc_fsbase;
122 int sc_gsbase;

--- 13 unchanged lines hidden ---