--- gforth/engine/signals.c	2000/07/21 09:25:27	1.9
+++ gforth/engine/signals.c	2006/10/21 22:13:49	1.31
@@ -1,6 +1,6 @@
 /* signal handling
 
-  Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -16,13 +16,13 @@
 
   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., 675 Mass Ave, Cambridge, MA 02139, USA.
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 */
 
 
-#define _GNU_SOURCE
-
+#include "config.h"
+#include "forth.h"
 #include <stdio.h>
 #include <setjmp.h>
 #include <string.h>
@@ -31,11 +31,14 @@
 #include <sys/ioctl.h>
 #endif
 /* #include <asm/signal.h> */
+#include <sys/types.h>
 #include <signal.h>
-#include "config.h"
-#include "forth.h"
 #include "io.h"
 
+#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)
@@ -52,6 +55,10 @@ UCell rows=DEFAULTROWS;
 /* systems that don't have SA_NODEFER hopefully don't block anyway */
 #endif
 
+#ifndef SA_ONSTACK
+#define SA_ONSTACK 0
+#endif
+
 #ifdef SA_SIGINFO
 void install_signal_handler(int sig, void (*handler)(int, siginfo_t *, void *))
      /* installs three-argument signal handler for sig */
@@ -60,20 +67,18 @@ void install_signal_handler(int sig, voi
 
   action.sa_sigaction=handler;
   sigemptyset(&action.sa_mask);
-  action.sa_flags=SA_RESTART|SA_NODEFER|SA_SIGINFO; /* pass siginfo */
+  action.sa_flags=SA_RESTART|SA_NODEFER|SA_SIGINFO|SA_ONSTACK; /* pass siginfo */
   sigaction(sig, &action, NULL);
 }
 #endif
 
-typedef void Sigfunc(int);
-
 Sigfunc *bsd_signal(int signo, Sigfunc *func)
 {
   struct sigaction act, oact;
 
   act.sa_handler=func;
   sigemptyset(&act.sa_mask);
-  act.sa_flags=SA_NODEFER;
+  act.sa_flags=SA_NODEFER; /* SA_ONSTACK does not work for graceful_exit */
   if (sigaction(signo,&act,&oact) < 0)
     return SIG_ERR;
   else
@@ -90,6 +95,11 @@ graceful_exit (int sig)
 
 jmp_buf throw_jmp_buf;
 
+void throw(int code)
+{
+  longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */
+}
+
 static void 
 signal_throw(int sig)
 {
@@ -102,29 +112,60 @@ 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;
   }
-  longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */
+#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
+  throw(code);
 }
 
 #ifdef SA_SIGINFO
+static void
+sigaction_throw(int sig, siginfo_t *info, void *_)
+{
+  signal_throw(sig);
+}
+
 static void fpe_handler(int sig, siginfo_t *info, void *_)
      /* handler for SIGFPE */
 {
   int code;
 
   switch(info->si_code) {
+#ifdef FPE_INTDIV
   case FPE_INTDIV: code=-10; break; /* integer divide by zero */
+#endif
+#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  */
+#endif
   default: code=-55; break;
   }
-  longjmp(throw_jmp_buf,code);
+  throw(code);
 }
 
 
@@ -157,7 +198,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) */
@@ -174,6 +215,7 @@ void get_winsize()
 {
 #ifdef TIOCGWINSZ
   struct winsize size;
+  size.ws_row = size.ws_col = 0;
   
   if (ioctl (1, TIOCGWINSZ, (char *) &size) >= 0) {
     rows = size.ws_row;
@@ -183,15 +225,15 @@ void get_winsize()
   char *s;
   if ((s=getenv("LINES"))) {
     rows=atoi(s);
-    if (rows==0)
-      rows=DEFAULTROWS;
   }
   if ((s=getenv("COLUMNS"))) {
     rows=atoi(s);
-    if (rows==0)
-      cols=DEFAULTCOLS;
   }
 #endif
+  if (rows==0)
+    rows=DEFAULTROWS;
+  if (rows==0)
+    cols=DEFAULTCOLS;
 }
 
 #ifdef SIGWINCH
@@ -277,13 +319,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
@@ -299,18 +371,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
@@ -320,22 +380,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,
@@ -355,6 +401,23 @@ void install_signal_handlers(void)
   };
   int i;
   void (*throw_handler)() = die_on_signal ? graceful_exit : signal_throw;
+#ifdef SIGSTKSZ 
+  stack_t sigstack;
+  int sas_retval=-1;
+
+  sigstack.ss_size=SIGSTKSZ;
+  /* Actually the stack should only be ss_size large, and according to
+     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 = 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));
+#endif
 
 #define DIM(X)		(sizeof (X) / sizeof *(X))
 /*
@@ -363,12 +426,32 @@ 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
-  install_signal_handler(SIGFPE, fpe_handler);
-  install_signal_handler(SIGSEGV, segv_handler);
+  if (!die_on_signal) {
+#ifdef SIGFPE
+    install_signal_handler(SIGFPE, fpe_handler);
+#endif
+#ifdef SIGSEGV
+    install_signal_handler(SIGSEGV, segv_handler);
+#endif
+    /* use SA_ONSTACK for all signals that could come from executing
+       wrong code */
+#ifdef SIGILL
+    install_signal_handler(SIGILL, sigaction_throw);
 #endif
+#ifdef SIGBUS
+    install_signal_handler(SIGBUS, sigaction_throw);
+#endif
+#ifdef SIGTRAP
+    install_signal_handler(SIGTRAP, sigaction_throw);
+#endif
+  }
+#endif /* defined(SA_SIGINFO) */
 #ifdef SIGCONT
     bsd_signal(SIGCONT, termprep);
 #endif