--- gforth/engine/signals.c	2002/01/14 08:40:24	1.14
+++ gforth/engine/signals.c	2003/02/17 22:42:09	1.25
@@ -21,8 +21,8 @@
 */
 
 
-#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
@@ -102,26 +107,41 @@ 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 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
   case FPE_FLTDIV: code=-42; break; /* floating point divide by zero */
   case FPE_FLTOVF: code=-43; break; /* floating point overflow  */
   case FPE_FLTUND: code=-54; break; /* floating point underflow  */
   case FPE_FLTRES: code=-41; break; /* floating point inexact result  */
+#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);
@@ -356,6 +376,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 = my_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))
 /*
@@ -368,10 +405,25 @@ void install_signal_handlers(void)
     bsd_signal(sigs_to_quit [i], graceful_exit);
 #ifdef SA_SIGINFO
   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