projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.24.12: adding and fixing the HPUX/HPPA build target
[sbcl.git]
/
src
/
runtime
/
interrupt.c
diff --git
a/src/runtime/interrupt.c
b/src/runtime/interrupt.c
index
c702e58
..
e72bdd9
100644
(file)
--- a/
src/runtime/interrupt.c
+++ b/
src/runtime/interrupt.c
@@
-276,7
+276,7
@@
fake_foreign_function_call(os_context_t *context)
(lispobj *)(unsigned long)
(*os_context_register_addr(context, reg_ALLOC));
/* fprintf(stderr,"dynamic_space_free_pointer: %p\n", dynamic_space_free_pointer); */
(lispobj *)(unsigned long)
(*os_context_register_addr(context, reg_ALLOC));
/* fprintf(stderr,"dynamic_space_free_pointer: %p\n", dynamic_space_free_pointer); */
-#if defined(LISP_FEATURE_ALPHA)
+#if defined(LISP_FEATURE_ALPHA) || defined(LISP_FEATURE_MIPS)
if ((long)dynamic_space_free_pointer & 1) {
lose("dead in fake_foreign_function_call, context = %x\n", context);
}
if ((long)dynamic_space_free_pointer & 1) {
lose("dead in fake_foreign_function_call, context = %x\n", context);
}
@@
-370,7
+370,7
@@
interrupt_internal_error(os_context_t *context, boolean continuable)
* confused, we have a chance to determine what's going on. */
describe_internal_error(context);
#endif
* confused, we have a chance to determine what's going on. */
describe_internal_error(context);
#endif
- funcall2(SymbolFunction(INTERNAL_ERROR), context_sap,
+ funcall2(StaticSymbolFunction(INTERNAL_ERROR), context_sap,
continuable ? T : NIL);
undo_fake_foreign_function_call(context); /* blocks signals again */
continuable ? T : NIL);
undo_fake_foreign_function_call(context); /* blocks signals again */
@@
-442,7
+442,7
@@
interrupt_handle_pending(os_context_t *context)
* that had to be executed or because pseudo atomic triggered
* twice for a single interrupt. For the interested reader,
* that may happen if an interrupt hits after the interrupted
* that had to be executed or because pseudo atomic triggered
* twice for a single interrupt. For the interested reader,
* that may happen if an interrupt hits after the interrupted
- * flag is cleared but before pseduo-atomic is set and a
+ * flag is cleared but before pseudo-atomic is set and a
* pseudo atomic is interrupted in that interrupt. */
if (data->pending_handler) {
* pseudo atomic is interrupted in that interrupt. */
if (data->pending_handler) {
@@
-693,10
+693,6
@@
maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context)
if(!maybe_defer_handler(interrupt_handle_now,data,signal,info,context))
interrupt_handle_now(signal, info, context);
if(!maybe_defer_handler(interrupt_handle_now,data,signal,info,context))
interrupt_handle_now(signal, info, context);
-
-#ifdef LISP_FEATURE_DARWIN
- DARWIN_FIX_CONTEXT(context);
-#endif
}
static void
}
static void
@@
-723,10
+719,6
@@
low_level_maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context)
if(!maybe_defer_handler(low_level_interrupt_handle_now,data,
signal,info,context))
low_level_interrupt_handle_now(signal, info, context);
if(!maybe_defer_handler(low_level_interrupt_handle_now,data,
signal,info,context))
low_level_interrupt_handle_now(signal, info, context);
-
-#ifdef LISP_FEATURE_DARWIN
- DARWIN_FIX_CONTEXT(context);
-#endif
}
#endif
}
#endif
@@
-813,9
+805,6
@@
interrupt_handle_now_handler(int signal, siginfo_t *info, void *void_context)
os_restore_fp_control(context);
#endif
interrupt_handle_now(signal, info, context);
os_restore_fp_control(context);
#endif
interrupt_handle_now(signal, info, context);
-#ifdef LISP_FEATURE_DARWIN
- DARWIN_FIX_CONTEXT(context);
-#endif
}
/* manipulate the signal context and stack such that when the handler
}
/* manipulate the signal context and stack such that when the handler
@@
-1013,7
+1002,7
@@
interrupt_thread_handler(int num, siginfo_t *info, void *v_context)
/* let the handler enable interrupts again when it sees fit */
sigaddset_deferrable(os_context_sigmask_addr(context));
/* let the handler enable interrupts again when it sees fit */
sigaddset_deferrable(os_context_sigmask_addr(context));
- arrange_return_to_lisp_function(context, SymbolFunction(RUN_INTERRUPTION));
+ arrange_return_to_lisp_function(context, StaticSymbolFunction(RUN_INTERRUPTION));
}
#endif
}
#endif
@@
-1027,7
+1016,7
@@
interrupt_thread_handler(int num, siginfo_t *info, void *v_context)
void
undefined_alien_function(void)
{
void
undefined_alien_function(void)
{
- funcall0(SymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR));
+ funcall0(StaticSymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR));
}
boolean
}
boolean
@@
-1047,7
+1036,7
@@
handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr)
protect_control_stack_return_guard_page(1);
arrange_return_to_lisp_function
protect_control_stack_return_guard_page(1);
arrange_return_to_lisp_function
- (context, SymbolFunction(CONTROL_STACK_EXHAUSTED_ERROR));
+ (context, StaticSymbolFunction(CONTROL_STACK_EXHAUSTED_ERROR));
return 1;
}
else if(addr >= CONTROL_STACK_RETURN_GUARD_PAGE(th) &&
return 1;
}
else if(addr >= CONTROL_STACK_RETURN_GUARD_PAGE(th) &&
@@
-1063,7
+1052,7
@@
handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr)
else if (addr >= undefined_alien_address &&
addr < undefined_alien_address + os_vm_page_size) {
arrange_return_to_lisp_function
else if (addr >= undefined_alien_address &&
addr < undefined_alien_address + os_vm_page_size) {
arrange_return_to_lisp_function
- (context, SymbolFunction(UNDEFINED_ALIEN_VARIABLE_ERROR));
+ (context, StaticSymbolFunction(UNDEFINED_ALIEN_VARIABLE_ERROR));
return 1;
}
else return 0;
return 1;
}
else return 0;
@@
-1298,7
+1287,7
@@
lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr)
* now -- some address is better then no address in this case.
*/
current_memory_fault_address = addr;
* now -- some address is better then no address in this case.
*/
current_memory_fault_address = addr;
- arrange_return_to_lisp_function(context, SymbolFunction(MEMORY_FAULT_ERROR));
+ arrange_return_to_lisp_function(context, StaticSymbolFunction(MEMORY_FAULT_ERROR));
}
#endif
}
#endif
@@
-1311,7
+1300,7
@@
unhandled_trap_error(os_context_t *context)
#ifndef LISP_FEATURE_WIN32
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
#endif
#ifndef LISP_FEATURE_WIN32
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
#endif
- funcall1(SymbolFunction(UNHANDLED_TRAP_ERROR), context_sap);
+ funcall1(StaticSymbolFunction(UNHANDLED_TRAP_ERROR), context_sap);
lose("UNHANDLED-TRAP-ERROR fell through");
}
lose("UNHANDLED-TRAP-ERROR fell through");
}