| Index: fusl/arch/i386/bits/signal.h
|
| diff --git a/fusl/arch/i386/bits/signal.h b/fusl/arch/i386/bits/signal.h
|
| index 1f9085a553b3667d2ef9dad89c01a023ca9e6ffc..4260b7ae6de78772da0f79c4808267170bf9803b 100644
|
| --- a/fusl/arch/i386/bits/signal.h
|
| +++ b/fusl/arch/i386/bits/signal.h
|
| @@ -1,5 +1,5 @@
|
| -#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|
| - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
| +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) || \
|
| + defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
|
|
| #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
| #define MINSIGSTKSZ 2048
|
| @@ -7,117 +7,114 @@
|
| #endif
|
|
|
| #ifdef _GNU_SOURCE
|
| -#define REG_GS 0
|
| -#define REG_FS 1
|
| -#define REG_ES 2
|
| -#define REG_DS 3
|
| -#define REG_EDI 4
|
| -#define REG_ESI 5
|
| -#define REG_EBP 6
|
| -#define REG_ESP 7
|
| -#define REG_EBX 8
|
| -#define REG_EDX 9
|
| -#define REG_ECX 10
|
| -#define REG_EAX 11
|
| -#define REG_TRAPNO 12
|
| -#define REG_ERR 13
|
| -#define REG_EIP 14
|
| -#define REG_CS 15
|
| -#define REG_EFL 16
|
| -#define REG_UESP 17
|
| -#define REG_SS 18
|
| +#define REG_GS 0
|
| +#define REG_FS 1
|
| +#define REG_ES 2
|
| +#define REG_DS 3
|
| +#define REG_EDI 4
|
| +#define REG_ESI 5
|
| +#define REG_EBP 6
|
| +#define REG_ESP 7
|
| +#define REG_EBX 8
|
| +#define REG_EDX 9
|
| +#define REG_ECX 10
|
| +#define REG_EAX 11
|
| +#define REG_TRAPNO 12
|
| +#define REG_ERR 13
|
| +#define REG_EIP 14
|
| +#define REG_CS 15
|
| +#define REG_EFL 16
|
| +#define REG_UESP 17
|
| +#define REG_SS 18
|
| #endif
|
|
|
| #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
| typedef int greg_t, gregset_t[19];
|
| typedef struct _fpstate {
|
| - unsigned long cw, sw, tag, ipoff, cssel, dataoff, datasel;
|
| - struct {
|
| - unsigned short significand[4], exponent;
|
| - } _st[8];
|
| - unsigned long status;
|
| -} *fpregset_t;
|
| + unsigned long cw, sw, tag, ipoff, cssel, dataoff, datasel;
|
| + struct {
|
| + unsigned short significand[4], exponent;
|
| + } _st[8];
|
| + unsigned long status;
|
| +} * fpregset_t;
|
| struct sigcontext {
|
| - unsigned short gs, __gsh, fs, __fsh, es, __esh, ds, __dsh;
|
| - unsigned long edi, esi, ebp, esp, ebx, edx, ecx, eax;
|
| - unsigned long trapno, err, eip;
|
| - unsigned short cs, __csh;
|
| - unsigned long eflags, esp_at_signal;
|
| - unsigned short ss, __ssh;
|
| - struct _fpstate *fpstate;
|
| - unsigned long oldmask, cr2;
|
| + unsigned short gs, __gsh, fs, __fsh, es, __esh, ds, __dsh;
|
| + unsigned long edi, esi, ebp, esp, ebx, edx, ecx, eax;
|
| + unsigned long trapno, err, eip;
|
| + unsigned short cs, __csh;
|
| + unsigned long eflags, esp_at_signal;
|
| + unsigned short ss, __ssh;
|
| + struct _fpstate* fpstate;
|
| + unsigned long oldmask, cr2;
|
| };
|
| typedef struct {
|
| - gregset_t gregs;
|
| - fpregset_t fpregs;
|
| - unsigned long oldmask, cr2;
|
| + gregset_t gregs;
|
| + fpregset_t fpregs;
|
| + unsigned long oldmask, cr2;
|
| } mcontext_t;
|
| #else
|
| -typedef struct {
|
| - unsigned __space[22];
|
| -} mcontext_t;
|
| +typedef struct { unsigned __space[22]; } mcontext_t;
|
| #endif
|
|
|
| struct sigaltstack {
|
| - void *ss_sp;
|
| - int ss_flags;
|
| - size_t ss_size;
|
| + void* ss_sp;
|
| + int ss_flags;
|
| + size_t ss_size;
|
| };
|
|
|
| typedef struct __ucontext {
|
| - unsigned long uc_flags;
|
| - struct __ucontext *uc_link;
|
| - stack_t uc_stack;
|
| - mcontext_t uc_mcontext;
|
| - sigset_t uc_sigmask;
|
| - unsigned long __fpregs_mem[28];
|
| + unsigned long uc_flags;
|
| + struct __ucontext* uc_link;
|
| + stack_t uc_stack;
|
| + mcontext_t uc_mcontext;
|
| + sigset_t uc_sigmask;
|
| + unsigned long __fpregs_mem[28];
|
| } ucontext_t;
|
|
|
| -#define SA_NOCLDSTOP 1
|
| -#define SA_NOCLDWAIT 2
|
| -#define SA_SIGINFO 4
|
| -#define SA_ONSTACK 0x08000000
|
| -#define SA_RESTART 0x10000000
|
| -#define SA_NODEFER 0x40000000
|
| -#define SA_RESETHAND 0x80000000
|
| -#define SA_RESTORER 0x04000000
|
| +#define SA_NOCLDSTOP 1
|
| +#define SA_NOCLDWAIT 2
|
| +#define SA_SIGINFO 4
|
| +#define SA_ONSTACK 0x08000000
|
| +#define SA_RESTART 0x10000000
|
| +#define SA_NODEFER 0x40000000
|
| +#define SA_RESETHAND 0x80000000
|
| +#define SA_RESTORER 0x04000000
|
|
|
| #endif
|
|
|
| -#define SIGHUP 1
|
| -#define SIGINT 2
|
| -#define SIGQUIT 3
|
| -#define SIGILL 4
|
| -#define SIGTRAP 5
|
| -#define SIGABRT 6
|
| -#define SIGIOT SIGABRT
|
| -#define SIGBUS 7
|
| -#define SIGFPE 8
|
| -#define SIGKILL 9
|
| -#define SIGUSR1 10
|
| -#define SIGSEGV 11
|
| -#define SIGUSR2 12
|
| -#define SIGPIPE 13
|
| -#define SIGALRM 14
|
| -#define SIGTERM 15
|
| +#define SIGHUP 1
|
| +#define SIGINT 2
|
| +#define SIGQUIT 3
|
| +#define SIGILL 4
|
| +#define SIGTRAP 5
|
| +#define SIGABRT 6
|
| +#define SIGIOT SIGABRT
|
| +#define SIGBUS 7
|
| +#define SIGFPE 8
|
| +#define SIGKILL 9
|
| +#define SIGUSR1 10
|
| +#define SIGSEGV 11
|
| +#define SIGUSR2 12
|
| +#define SIGPIPE 13
|
| +#define SIGALRM 14
|
| +#define SIGTERM 15
|
| #define SIGSTKFLT 16
|
| -#define SIGCHLD 17
|
| -#define SIGCONT 18
|
| -#define SIGSTOP 19
|
| -#define SIGTSTP 20
|
| -#define SIGTTIN 21
|
| -#define SIGTTOU 22
|
| -#define SIGURG 23
|
| -#define SIGXCPU 24
|
| -#define SIGXFSZ 25
|
| +#define SIGCHLD 17
|
| +#define SIGCONT 18
|
| +#define SIGSTOP 19
|
| +#define SIGTSTP 20
|
| +#define SIGTTIN 21
|
| +#define SIGTTOU 22
|
| +#define SIGURG 23
|
| +#define SIGXCPU 24
|
| +#define SIGXFSZ 25
|
| #define SIGVTALRM 26
|
| -#define SIGPROF 27
|
| -#define SIGWINCH 28
|
| -#define SIGIO 29
|
| -#define SIGPOLL 29
|
| -#define SIGPWR 30
|
| -#define SIGSYS 31
|
| +#define SIGPROF 27
|
| +#define SIGWINCH 28
|
| +#define SIGIO 29
|
| +#define SIGPOLL 29
|
| +#define SIGPWR 30
|
| +#define SIGSYS 31
|
| #define SIGUNUSED SIGSYS
|
|
|
| #define _NSIG 65
|
| -
|
|
|