#include "interrupt.h"
#include "interr.h"
#include "breakpoint.h"
+#include "alloc.h"
#if defined(LISP_FEATURE_GENCGC)
#include "gencgc-alloc-region.h"
boolean
arch_pseudo_atomic_atomic(os_context_t *context)
{
- return ((*os_context_register_addr(context,reg_ALLOC)) & 4);
+ /* FIXME: this foreign_function_call_active test is dubious at
+ * best. If a foreign call is made in a pseudo atomic section
+ * (?) or more likely a pseudo atomic section is in a foreign
+ * call then an interrupt is executed immediately. Maybe it
+ * has to do with C code not maintaining pseudo atomic
+ * properly. MG - 2005-08-10
+ *
+ * The foreign_function_call_active used to live at each call-site
+ * to arch_pseudo_atomic_atomic, but this seems clearer.
+ * --NS 2007-05-15 */
+ return (!foreign_function_call_active)
+ && ((*os_context_register_addr(context,reg_ALLOC)) & 4);
}
void
}
static void
-sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context)
+sigtrap_handler(int signal, siginfo_t *siginfo, void *void_context)
{
unsigned int code;
+ os_context_t *context = void_context;
#ifdef LISP_FEATURE_LINUX
os_restore_fp_control(context);
if (allocation_trap_p(context)) {
handle_allocation_trap(context);
arch_skip_instruction(context);
-#ifdef LISP_FEATURE_DARWIN
- DARWIN_FIX_CONTEXT(context);
-#endif
return;
}
#endif
/* twllei reg_ZERO,N will always trap if reg_ZERO = 0 */
int trap = code & 0x1f;
handle_trap(context,trap);
-
-#ifdef LISP_FEATURE_DARWIN
- DARWIN_FIX_CONTEXT(context);
-#endif
return;
}
if (((code >> 26) == 3) && (((code >> 21) & 31) == 24)) {
interrupt_internal_error(context, 0);
-#ifdef LISP_FEATURE_DARWIN
- DARWIN_FIX_CONTEXT(context);
-#endif
return;
}
- interrupt_handle_now(signal, code, context);
-#ifdef LISP_FEATURE_DARWIN
- /* Work around G5 bug */
- DARWIN_FIX_CONTEXT(context);
-#endif
+ interrupt_handle_now(signal, (siginfo_t *)code, context);
}
void arch_install_interrupt_handlers()
{
- undoably_install_low_level_interrupt_handler(SIGILL,sigtrap_handler);
- undoably_install_low_level_interrupt_handler(SIGTRAP,sigtrap_handler);
+ undoably_install_low_level_interrupt_handler(SIGILL, sigtrap_handler);
+ undoably_install_low_level_interrupt_handler(SIGTRAP, sigtrap_handler);
}
void