--- gforth/engine/signals.c	2002/12/24 23:40:30	1.19
+++ gforth/engine/signals.c	2003/03/09 15:17:03	1.27
@@ -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.
 
@@ -31,9 +31,14 @@
 #include <sys/ioctl.h>
 #endif
 /* #include <asm/signal.h> */
+#include <sys/types.h>
 #include <signal.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)
@@ -67,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;
@@ -104,12 +107,29 @@ 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 ? */
 }
 
 #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 */
 {
@@ -369,7 +389,12 @@ void install_signal_handlers(void)
   int sas_retval=-1;
 
   sigstack.ss_size=SIGSTKSZ;
-  if ((sigstack.ss_sp = my_alloc(sigstack.ss_size)) != NULL) {
+  /* 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);
   }
@@ -388,10 +413,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