Date: Thursday, September 1, 2011 @ 09:16:50 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp

Modified: Darwin-os.c

Oops. Need to check for gc write barrier before handling the sigbus.

-------------+ Darwin-os.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)

Index: src/lisp/Darwin-os.c diff -u src/lisp/Darwin-os.c:1.33 src/lisp/Darwin-os.c:1.34 --- src/lisp/Darwin-os.c:1.33 Wed Aug 31 22:18:26 2011 +++ src/lisp/Darwin-os.c Thu Sep 1 09:16:49 2011 @@ -14,7 +14,7 @@ * Frobbed for OpenBSD by Pierre R. Mai, 2001. * Frobbed for Darwin by Pierre R. Mai, 2003. * - * $Header: /project/cmucl/cvsroot/src/lisp/Darwin-os.c,v 1.33 2011/09/01 05:18:26 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/Darwin-os.c,v 1.34 2011/09/01 16:16:49 rtoy Exp $ * */

@@ -497,6 +497,17 @@ DPRINTF(0, (stderr, " foreign_function_call = %d\n", foreign_function_call_active)); #endif

+#if defined(GENCGC) +#if defined(SIGSEGV_VERBOSE) + fprintf(stderr, "Signal %d, fault_addr=%x\n", + signal, fault_addr); +#endif + if (gc_write_barrier(code->si_addr)) + return; +#else + if (interrupt_maybe_gc(signal, code, context)) + return; +#endif #ifdef RED_ZONE_HIT { /* @@ -504,6 +515,7 @@ * handler there. Global variables are used to pass the * context * to the other stack. */ + tramp_signal = signal; tramp_code = *code; tramp_context = *context; @@ -512,17 +524,6 @@ } #endif

-#if defined(GENCGC) -#if defined(SIGSEGV_VERBOSE) - fprintf(stderr, "Signal %d, fault_addr=%x, page_index=%d:\n", - signal, fault_addr, page_index); -#endif - if (gc_write_barrier(code->si_addr)) - return; -#else - if (interrupt_maybe_gc(signal, code, context)) - return; -#endif /* a *real* protection fault */ fprintf(stderr, "sigbus_handler: Real protection violation: %p\n", fault_addr); sigbus_handle_now(signal, code, context);