Sun Jan 24 16:00:29 2016 UTC ()
use namespace protected types.


(christos)
diff -r1.29 -r1.30 src/sys/arch/mips/include/signal.h
cvs diff -r1.29 -r1.30 src/sys/arch/mips/include/signal.h (switch to unified diff)

--- src/sys/arch/mips/include/signal.h 2009/12/14 00:46:05 1.29
+++ src/sys/arch/mips/include/signal.h 2016/01/24 16:00:29 1.30
@@ -1,115 +1,115 @@ @@ -1,115 +1,115 @@
1/* $NetBSD: signal.h,v 1.29 2009/12/14 00:46:05 matt Exp $ */ 1/* $NetBSD: signal.h,v 1.30 2016/01/24 16:00:29 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1992, 1993 4 * Copyright (c) 1992, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Ralph Campbell. 8 * Ralph Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in the 16 * notice, this list of conditions and the following disclaimer in the
17 * documentation and/or other materials provided with the distribution. 17 * documentation and/or other materials provided with the distribution.
18 * 3. Neither the name of the University nor the names of its contributors 18 * 3. Neither the name of the University nor the names of its contributors
19 * may be used to endorse or promote products derived from this software 19 * may be used to endorse or promote products derived from this software
20 * without specific prior written permission. 20 * without specific prior written permission.
21 * 21 *
22 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 22 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
23 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 23 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
24 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 24 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
25 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 25 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE. 32 * SUCH DAMAGE.
33 * 33 *
34 * @(#)signal.h 8.1 (Berkeley) 6/10/93 34 * @(#)signal.h 8.1 (Berkeley) 6/10/93
35 */ 35 */
36 36
37#ifndef _MIPS_SIGNAL_H_ 37#ifndef _MIPS_SIGNAL_H_
38#define _MIPS_SIGNAL_H_ 38#define _MIPS_SIGNAL_H_
39 39
40#include <sys/featuretest.h> 40#include <sys/featuretest.h>
41 41
42#include <machine/cdefs.h> /* for API selection */ 42#include <machine/cdefs.h> /* for API selection */
43 43
44#ifdef _KERNEL_OPT 44#ifdef _KERNEL_OPT
45#include "opt_compat_netbsd.h" 45#include "opt_compat_netbsd.h"
46#include "opt_compat_ultrix.h" 46#include "opt_compat_ultrix.h"
47#endif 47#endif
48 48
49#if !defined(__ASSEMBLER__) 49#if !defined(__ASSEMBLER__)
50 50
51 51
52/* 52/*
53 * Machine-dependent signal definitions 53 * Machine-dependent signal definitions
54 */ 54 */
55 55
56typedef int sig_atomic_t; 56typedef int sig_atomic_t;
57 57
58/* 58/*
59 * Information pushed on stack when a signal is delivered. 59 * Information pushed on stack when a signal is delivered.
60 * This is used by the kernel to restore state following 60 * This is used by the kernel to restore state following
61 * execution of the signal handler. It is also made available 61 * execution of the signal handler. It is also made available
62 * to the handler to allow it to restore state properly if 62 * to the handler to allow it to restore state properly if
63 * a non-standard exit is performed. 63 * a non-standard exit is performed.
64 * 64 *
65 * sizeof(sigcontext) = 45 * sizeof(int) + 35 * sizeof(mips_reg_t) 65 * sizeof(sigcontext) = 45 * sizeof(int) + 35 * sizeof(mips_reg_t)
66 */ 66 */
67#if defined(_KERNEL) && (defined(COMPAT_13) || defined(COMPAT_ULTRIX)) 67#if defined(_KERNEL) && (defined(COMPAT_13) || defined(COMPAT_ULTRIX))
68struct sigcontext13 { 68struct sigcontext13 {
69 int sc_onstack; /* sigstack state to restore */ 69 int sc_onstack; /* sigstack state to restore */
70 int sc_mask; /* signal mask to restore (old style) */ 70 int sc_mask; /* signal mask to restore (old style) */
71 int sc_pc; /* pc at time of signal */ 71 int sc_pc; /* pc at time of signal */
72 int sc_regs[32]; /* processor regs 0 to 31 */ 72 int sc_regs[32]; /* processor regs 0 to 31 */
73 int mullo, mulhi; /* mullo and mulhi registers... */ 73 int mullo, mulhi; /* mullo and mulhi registers... */
74 int sc_fpused; /* fp has been used */ 74 int sc_fpused; /* fp has been used */
75 int sc_fpregs[33]; /* fp regs 0 to 31 and csr */ 75 int sc_fpregs[33]; /* fp regs 0 to 31 and csr */
76 int sc_fpc_eir; /* floating point exception instruction reg */ 76 int sc_fpc_eir; /* floating point exception instruction reg */
77 int sc_xxx[8]; /* XXX reserved */ 77 int sc_xxx[8]; /* XXX reserved */
78}; 78};
79#endif /* _KERNEL && COMPAT_13 */ 79#endif /* _KERNEL && COMPAT_13 */
80 80
81#if defined(_LIBC) || (defined(_KERNEL) && (defined(COMPAT_16) || defined(COMPAT_ULTRIX))) 81#if defined(_LIBC) || (defined(_KERNEL) && (defined(COMPAT_16) || defined(COMPAT_ULTRIX)))
82/* 82/*
83 * Only need an O32 version. 83 * Only need an O32 version.
84 */ 84 */
85#define _SIGCONTEXT_DEFINE(_name, _reg_t, _fp_t) \ 85#define _SIGCONTEXT_DEFINE(_name, _reg_t, _fp_t) \
86struct sigcontext { \ 86struct sigcontext { \
87 int sc_onstack; /* sigstack state to restore */ \ 87 int sc_onstack; /* sigstack state to restore */ \
88 int __sc_mask13; /* signal mask to restore (old style) */ \ 88 int __sc_mask13; /* signal mask to restore (old style) */ \
89 _reg_t sc_pc; /* pc at time of signal */ \ 89 _reg_t sc_pc; /* pc at time of signal */ \
90 _reg_t sc_regs[32]; /* processor regs 0 to 31 */ \ 90 _reg_t sc_regs[32]; /* processor regs 0 to 31 */ \
91 _reg_t mullo, mulhi; /* mullo and mulhi registers... */ \ 91 _reg_t mullo, mulhi; /* mullo and mulhi registers... */ \
92 int sc_fpused; /* fp has been used */ \ 92 int sc_fpused; /* fp has been used */ \
93 _fp_t sc_fpregs[33]; /* fp regs 0 to 31 and csr */ \ 93 _fp_t sc_fpregs[33]; /* fp regs 0 to 31 and csr */ \
94 int sc_fpc_eir; /* floating point exception instruction reg */ \ 94 int sc_fpc_eir; /* floating point exception instruction reg */ \
95 int sc_xxx[8]; /* XXX reserved */ \ 95 int sc_xxx[8]; /* XXX reserved */ \
96 sigset_t sc_mask; /* signal mask to restore (new style) */ \ 96 sigset_t sc_mask; /* signal mask to restore (new style) */ \
97} 97}
98 98
99/* 99/*
100 * These will be identical in O32 100 * These will be identical in O32
101 */ 101 */
102#ifdef _KERNEL 102#ifdef _KERNEL
103/* 103/*
104 * We need this only compatibility. 104 * We need this only compatibility.
105 */ 105 */
106_SIGCONTEXT_DEFINE(sigcontext, int, int); 106_SIGCONTEXT_DEFINE(sigcontext, int, int);
107#endif 107#endif
108#ifdef _LIBC 108#ifdef _LIBC
109_SIGCONTEXT_DEFINE(sigcontext, register_t, fpregister_t); 109_SIGCONTEXT_DEFINE(sigcontext, __register_t, __fpregister_t);
110#endif 110#endif
111 111
112#endif /* _LIBC || _KERNEL */ 112#endif /* _LIBC || _KERNEL */
113 113
114#endif /* !_LANGUAGE_ASSEMBLY */ 114#endif /* !_LANGUAGE_ASSEMBLY */
115#endif /* !_MIPS_SIGNAL_H_ */ 115#endif /* !_MIPS_SIGNAL_H_ */