projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.23.55: three stale bugs
[sbcl.git]
/
src
/
runtime
/
interrupt.c
diff --git
a/src/runtime/interrupt.c
b/src/runtime/interrupt.c
index
78bafeb
..
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) {
@@
-597,7
+597,8
@@
interrupt_handle_now(int signal, siginfo_t *info, os_context_t *context)
* already; we're just doing the Lisp-level processing now that we
* put off then */
static void
* already; we're just doing the Lisp-level processing now that we
* put off then */
static void
-run_deferred_handler(struct interrupt_data *data, void *v_context) {
+run_deferred_handler(struct interrupt_data *data, void *v_context)
+{
/* The pending_handler may enable interrupts and then another
* interrupt may hit, overwrite interrupt_data, so reset the
* pending handler before calling it. Trust the handler to finish
/* The pending_handler may enable interrupts and then another
* interrupt may hit, overwrite interrupt_data, so reset the
* pending handler before calling it. Trust the handler to finish
@@
-692,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
@@
-722,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
@@
-775,10
+768,11
@@
sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context)
thread->state=STATE_SUSPENDED;
FSHOW_SIGNAL((stderr,"thread=%lu suspended\n",thread->os_thread));
thread->state=STATE_SUSPENDED;
FSHOW_SIGNAL((stderr,"thread=%lu suspended\n",thread->os_thread));
+ sigemptyset(&ss);
#if defined(SIG_RESUME_FROM_GC)
#if defined(SIG_RESUME_FROM_GC)
- sigemptyset(&ss); sigaddset(&ss,SIG_RESUME_FROM_GC);
+ sigaddset(&ss,SIG_RESUME_FROM_GC);
#else
#else
- sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC);
+ sigaddset(&ss,SIG_STOP_FOR_GC);
#endif
/* It is possible to get SIGCONT (and probably other non-blockable
#endif
/* It is possible to get SIGCONT (and probably other non-blockable
@@
-811,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
@@
-898,8
+889,10
@@
arrange_return_to_lisp_function(os_context_t *context, lispobj function)
*(register_save_area + 7) = *os_context_register_addr(context,reg_EAX);
*(register_save_area + 8) = *context_eflags_addr(context);
*(register_save_area + 7) = *os_context_register_addr(context,reg_EAX);
*(register_save_area + 8) = *context_eflags_addr(context);
- *os_context_pc_addr(context) = call_into_lisp_tramp;
- *os_context_register_addr(context,reg_ECX) = register_save_area;
+ *os_context_pc_addr(context) =
+ (os_context_register_t) call_into_lisp_tramp;
+ *os_context_register_addr(context,reg_ECX) =
+ (os_context_register_t) register_save_area;
#else
/* return address for call_into_lisp: */
#else
/* return address for call_into_lisp: */
@@
-1009,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
@@
-1021,8
+1014,9
@@
interrupt_thread_handler(int num, siginfo_t *info, void *v_context)
* functions and variables.
*/
void
* functions and variables.
*/
void
-undefined_alien_function() {
- funcall0(SymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR));
+undefined_alien_function(void)
+{
+ funcall0(StaticSymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR));
}
boolean
}
boolean
@@
-1042,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) &&
@@
-1058,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;
@@
-1110,7
+1104,7
@@
sigaction_nodefer_test_handler(int signal, siginfo_t *info, void *void_context)
}
static void
}
static void
-see_if_sigaction_nodefer_works()
+see_if_sigaction_nodefer_works(void)
{
struct sigaction sa, old_sa;
{
struct sigaction sa, old_sa;
@@
-1158,9
+1152,7
@@
low_level_unblock_me_trampoline(int signal, siginfo_t *info, void *void_context)
void
undoably_install_low_level_interrupt_handler (int signal,
void
undoably_install_low_level_interrupt_handler (int signal,
- void handler(int,
- siginfo_t*,
- void*))
+ interrupt_handler_t handler)
{
struct sigaction sa;
{
struct sigaction sa;
@@
-1189,9
+1181,6
@@
undoably_install_low_level_interrupt_handler (int signal,
| (sigaction_nodefer_works ? SA_NODEFER : 0);
#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
if((signal==SIG_MEMORY_FAULT)
| (sigaction_nodefer_works ? SA_NODEFER : 0);
#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
if((signal==SIG_MEMORY_FAULT)
-#ifdef SIG_MEMORY_FAULT2
- || (signal==SIG_MEMORY_FAULT2)
-#endif
#ifdef SIG_INTERRUPT_THREAD
|| (signal==SIG_INTERRUPT_THREAD)
#endif
#ifdef SIG_INTERRUPT_THREAD
|| (signal==SIG_INTERRUPT_THREAD)
#endif
@@
-1255,7
+1244,7
@@
install_handler(int signal, void handler(int, siginfo_t*, void*))
}
void
}
void
-interrupt_init()
+interrupt_init(void)
{
#ifndef LISP_FEATURE_WIN32
int i;
{
#ifndef LISP_FEATURE_WIN32
int i;
@@
-1293,16
+1282,16
@@
void
lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr)
{
/* FIXME: This is lossy: if we get another memory fault (eg. from
lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr)
{
/* FIXME: This is lossy: if we get another memory fault (eg. from
- * another thread) before lisp has read this, we the information.
+ * another thread) before lisp has read this, we lose the information.
* However, since this is mostly informative, we'll live with that for
* now -- some address is better then no address in this case.
*/
current_memory_fault_address = addr;
* However, since this is mostly informative, we'll live with that for
* 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
-void
+static void
unhandled_trap_error(os_context_t *context)
{
lispobj context_sap;
unhandled_trap_error(os_context_t *context)
{
lispobj context_sap;
@@
-1311,11
+1300,11
@@
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");
}
-/* Common logic far trapping instructions. How we actually handle each
+/* Common logic for trapping instructions. How we actually handle each
* case is highly architecture dependent, but the overall shape is
* this. */
void
* case is highly architecture dependent, but the overall shape is
* this. */
void