--- gforth/engine/signals.c 2003/02/02 11:05:50 1.24 +++ gforth/engine/signals.c 2006/10/21 19:22:03 1.30 @@ -1,6 +1,6 @@ /* signal handling - Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. This file is part of Gforth. @@ -72,8 +72,6 @@ void install_signal_handler(int sig, voi } #endif -typedef void Sigfunc(int); - Sigfunc *bsd_signal(int signo, Sigfunc *func) { struct sigaction act, oact; @@ -109,8 +107,19 @@ signal_throw(int sig) case SIGBUS: code=-23; break; #endif case SIGSEGV: code=-9; break; +#ifdef SIGPIPE + case SIGPIPE: code=-2049; break; +#endif default: code=-256-sig; break; } +#ifdef __CYGWIN__ + /* the SA_NODEFER apparently does not work on Cygwin 1.3.18(0.69/3/2) */ + { + sigset_t emptyset; + sigemptyset(&emptyset); + sigprocmask(SIG_SETMASK, &emptyset, NULL); + } +#endif longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */ } @@ -133,10 +142,18 @@ static void fpe_handler(int sig, siginfo #ifdef FPE_INTOVF case FPE_INTOVF: code=-11; break; /* integer overflow */ #endif +#ifdef FPE_FLTDIV case FPE_FLTDIV: code=-42; break; /* floating point divide by zero */ +#endif +#ifdef FPE_FLTOVF case FPE_FLTOVF: code=-43; break; /* floating point overflow */ +#endif +#ifdef FPE_FLTUND case FPE_FLTUND: code=-54; break; /* floating point underflow */ +#endif +#ifdef FPE_FLTRES case FPE_FLTRES: code=-41; break; /* floating point inexact result */ +#endif #if 0 /* defined by Unix95, but unnecessary */ case FPE_FLTINV: /* invalid floating point operation */ case FPE_FLTSUB: /* subscript out of range */ @@ -297,13 +314,43 @@ void install_signal_handlers(void) }; #endif + static short async_sigs_to_throw [] = { +#ifdef SIGINT + SIGINT, +#endif +#ifdef SIGALRM + SIGALRM, +#endif +#ifdef SIGPOLL + SIGPOLL, +#endif +#ifdef SIGPROF + SIGPROF, +#endif +#ifdef SIGURG + SIGURG, +#endif +#ifdef SIGPIPE + SIGPIPE, +#endif +#ifdef SIGUSR1 + SIGUSR1, +#endif +#ifdef SIGUSR2 + SIGUSR2, +#endif +#ifdef SIGVTALRM + SIGVTALRM, +#endif +#ifdef SIGXFSZ + SIGXFSZ, +#endif + }; + static short sigs_to_throw [] = { #ifdef SIGBREAK SIGBREAK, #endif -#ifdef SIGINT - SIGINT, -#endif #ifdef SIGILL SIGILL, #endif @@ -319,18 +366,6 @@ void install_signal_handlers(void) #ifdef SIGSEGV SIGSEGV, #endif -#ifdef SIGALRM - SIGALRM, -#endif -#ifdef SIGPIPE - SIGPIPE, -#endif -#ifdef SIGPOLL - SIGPOLL, -#endif -#ifdef SIGPROF - SIGPROF, -#endif #ifdef SIGBUS SIGBUS, #endif @@ -340,22 +375,8 @@ void install_signal_handlers(void) #ifdef SIGTRAP SIGTRAP, #endif -#ifdef SIGURG - SIGURG, -#endif -#ifdef SIGUSR1 - SIGUSR1, -#endif -#ifdef SIGUSR2 - SIGUSR2, -#endif -#ifdef SIGVTALRM - SIGVTALRM, -#endif -#ifdef SIGXFSZ - SIGXFSZ, -#endif }; + static short sigs_to_quit [] = { #ifdef SIGQUIT SIGQUIT, @@ -384,7 +405,7 @@ void install_signal_handlers(void) SUSv2 ss_sp should point to the start of the stack, but unfortunately Irix 6.5 (at least) expects ss_sp to point to the end, so we work around this issue by accomodating everyone. */ - if ((sigstack.ss_sp = my_alloc(sigstack.ss_size*2)) != NULL) { + if ((sigstack.ss_sp = gforth_alloc(sigstack.ss_size*2)) != NULL) { sigstack.ss_sp += sigstack.ss_size; sigstack.ss_flags=0; sas_retval=sigaltstack(&sigstack,(stack_t *)0); @@ -400,6 +421,9 @@ void install_signal_handlers(void) */ for (i = 0; i < DIM (sigs_to_throw); i++) bsd_signal(sigs_to_throw[i], throw_handler); + for (i = 0; i < DIM (async_sigs_to_throw); i++) + bsd_signal(async_sigs_to_throw[i], + ignore_async_signals ? SIG_IGN : throw_handler); for (i = 0; i < DIM (sigs_to_quit); i++) bsd_signal(sigs_to_quit [i], graceful_exit); #ifdef SA_SIGINFO