From f8817cda45ad90fe1db44697d3d10c80a38f1e99 Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia Ripoll <jjgarcia@jjgr-2.local>
Date: Fri, 25 Sep 2009 16:58:55 +0200
Subject: [PATCH] SIGSEGV and SIGBUS must be handled synchronously.

---
 src/c/unixint.d | 28 +++++++++++++++++-----------
 src/gc/os_dep.c |  1 +
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/c/unixint.d b/src/c/unixint.d
index 622e85593..88cf06f0b 100644
--- a/src/c/unixint.d
+++ b/src/c/unixint.d
@@ -264,6 +264,7 @@ static cl_object pop_signal(cl_env_ptr env);
 static cl_object
 handler_fn_protype(lisp_signal_handler, int sig, siginfo_t *info, void *aux)
 {
+        printf(";;; signal %d received\n", sig);
 #if defined(ECL_THREADS) && !defined(_MSC_VER) && !defined(mingw32)
 	cl_env_ptr the_env = ecl_process_env();
         if (sig == ecl_get_option(ECL_OPT_THREAD_INTERRUPT_SIGNAL)) {
@@ -356,6 +357,7 @@ unblock_signal(int signal)
 static void
 handle_signal_now(cl_object signal_code)
 {
+        printf(";;; handling signal %p received\n", signal_code);
         switch (type_of(signal_code)) {
         case t_fixnum:
                 FEerror("Serious signal ~D caught.", 1, signal_code);
@@ -518,6 +520,7 @@ handler_fn_protype(sigsegv_handler, int sig, siginfo_t *info, void *aux)
 {
 	cl_env_ptr the_env;
 	reinstall_signal(sig, sigsegv_handler);
+        printf(";;; sigsegv received\n");
 	if (!ecl_get_option(ECL_OPT_BOOTED)) {
 		ecl_internal_error("Got signal before environment was installed"
 				   " on our thread.");
@@ -557,11 +560,14 @@ handler_fn_protype(sigbus_handler, int sig, siginfo_t *info, void *aux)
 {
         cl_env_ptr the_env;
 	reinstall_signal(sig, sigsegv_handler);
+        printf(";;; sigbus received\n");
 #if defined(SA_SIGINFO) && defined(ECL_USE_MPROTECT)
 	/* We access the environment when it was protected. That
 	 * means there was a pending signal. */
 	the_env = ecl_process_env();
-	if ((void*)the_env == (void*)info->si_addr) {
+	if (((char*)the_env <= (char*)info->si_addr) &&
+            ((char*)info->si_addr <= (char*)(the_env+1)))
+        {
 		cl_object signal;
 		mprotect(the_env, sizeof(*the_env), PROT_READ | PROT_WRITE);
                 the_env->disable_interrupts = 0;
@@ -947,16 +953,6 @@ install_asynchronous_signal_handlers()
 	pthread_sigmask(SIG_SETMASK, NULL, &sigmask);
 #endif
 	cl_core.default_sigmask = NULL;
-#ifdef SIGSEGV
-	if (ecl_get_option(ECL_OPT_TRAP_SIGSEGV)) {
-		async_handler(SIGSEGV, sigsegv_handler, &sigmask);
-	}
-#endif
-#if defined(SIGBUS) /*&& !defined(GBC_BOEHM)*/
-	if (ecl_get_option(ECL_OPT_TRAP_SIGBUS)) {
-		async_handler(SIGBUS, sigbus_handler, &sigmask);
-	}
-#endif
 #ifdef SIGINT
 	if (ecl_get_option(ECL_OPT_TRAP_SIGINT)) {
 		async_handler(SIGINT, non_evil_signal_handler, &sigmask);
@@ -1053,6 +1049,16 @@ install_synchronous_signal_handlers()
 		si_trap_fpe(@'division-by-zero', Cnil);
 # endif
 	}
+#endif
+#ifdef SIGBUS
+	if (ecl_get_option(ECL_OPT_TRAP_SIGBUS)) {
+		mysignal(SIGBUS, sigbus_handler);
+	}
+#endif
+#ifdef SIGSEGV
+	if (ecl_get_option(ECL_OPT_TRAP_SIGSEGV)) {
+		mysignal(SIGSEGV, sigsegv_handler);
+	}
 #endif
 	ecl_process_env()->disable_interrupts = 0;
 }
diff --git a/src/gc/os_dep.c b/src/gc/os_dep.c
index b5c5d0c46..b2a0756dc 100644
--- a/src/gc/os_dep.c
+++ b/src/gc/os_dep.c
@@ -3878,6 +3878,7 @@ catch_exception_raise(mach_port_t exception_port, mach_port_t thread,
 #   error FIXME for non-ppc/x86 darwin
 # endif
 
+      printf("Exception %d received\n", exception);
 
   if(exception != EXC_BAD_ACCESS || code[0] != KERN_PROTECTION_FAILURE) {
 #   ifdef DEBUG_EXCEPTION_HANDLING