--- gforth/engine/signals.c 2003/03/09 15:17:03 1.27 +++ gforth/engine/signals.c 2012/03/23 21:48:06 1.47 @@ -1,12 +1,12 @@ /* signal handling - Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007,2011 Free Software Foundation, Inc. This file is part of Gforth. Gforth is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 + as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + along with this program; if not, see http://www.gnu.org/licenses/. */ @@ -30,18 +29,27 @@ #if !defined(apollo) && !defined(MSDOS) #include #endif -/* #include */ #include #include +#include #include "io.h" +#ifdef HAS_DEBUG +extern int debug; +# define debugp(x...) do { if (debug) fprintf(x); } while (0) +#else +# define perror(x...) +# define fprintf(x...) +# define debugp(x...) +#endif + #ifndef HAVE_STACK_T /* Darwin uses "struct sigaltstack" instead of "stack_t" */ typedef struct sigaltstack stack_t; #endif #define DEFAULTCOLS 80 -#if defined(MSDOS) || defined (_WIN32) +#if defined(MSDOS) || defined (_WIN32) || defined (__CYGWIN__) #define DEFAULTROWS 25 #else #define DEFAULTROWS 24 @@ -93,12 +101,19 @@ graceful_exit (int sig) exit (0x80|sig); } -jmp_buf throw_jmp_buf; +__thread jmp_buf * throw_jmp_handler; + +void throw(int code) +{ + debugp(stderr,"\nthrow code %d to %p\n", code, *throw_jmp_handler); + longjmp(*throw_jmp_handler,code); /* !! or use siglongjmp ? */ +} static void signal_throw(int sig) { int code; + debugp(stderr,"\ncaught signal %d\n", sig); switch (sig) { case SIGINT: code=-28; break; @@ -120,13 +135,14 @@ signal_throw(int sig) sigprocmask(SIG_SETMASK, &emptyset, NULL); } #endif - longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */ + throw(code); } #ifdef SA_SIGINFO static void sigaction_throw(int sig, siginfo_t *info, void *_) { + debugp(stderr,"\nsigaction_throw %d 0x%p 0x%p\n", sig, info, _); signal_throw(sig); } @@ -135,24 +151,34 @@ static void fpe_handler(int sig, siginfo { int code; + debugp(stderr,"\nfpe_handler %d %x %x\n", sig, info, _); + switch(info->si_code) { #ifdef FPE_INTDIV - case FPE_INTDIV: code=-10; break; /* integer divide by zero */ + case FPE_INTDIV: code=BALL_DIVZERO; break; #endif #ifdef FPE_INTOVF - case FPE_INTOVF: code=-11; break; /* integer overflow */ + case FPE_INTOVF: code=BALL_RESULTRANGE; 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 */ #endif default: code=-55; break; } - longjmp(throw_jmp_buf,code); + throw(code); } @@ -173,6 +199,8 @@ static void segv_handler(int sig, siginf Address addr=info->si_addr; ImageHeader *h=gforth_header; + debugp(stderr,"\nsegv_handler %d 0x%p 0x%p\n", sig, info, _); + if (JUSTUNDER(addr, h->data_stack_base)) code=-3; else if (JUSTOVER(addr, NEXTPAGE(h->data_stack_base+h->data_stack_size))) @@ -185,7 +213,7 @@ static void segv_handler(int sig, siginf code=-44; else if (JUSTOVER(addr, NEXTPAGE(h->fp_stack_base+h->fp_stack_size))) code=-45; - longjmp(throw_jmp_buf,code); + throw(code); } #endif /* defined(SA_SIGINFO) */ @@ -219,7 +247,7 @@ void get_winsize() #endif if (rows==0) rows=DEFAULTROWS; - if (rows==0) + if (cols==0) cols=DEFAULTCOLS; } @@ -306,13 +334,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 @@ -328,18 +386,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 @@ -349,22 +395,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, @@ -393,13 +425,14 @@ 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); } - if (debug) - fprintf(stderr,"sigaltstack: %s\n",strerror(sas_retval)); +#if defined(HAS_FILE) || !defined(STANDALONE) + debugp(stderr,"sigaltstack: %s\n",strerror(sas_retval)); +#endif #endif #define DIM(X) (sizeof (X) / sizeof *(X)) @@ -409,6 +442,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