projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.5.32: partial fix for DISASSEMBLE bug reported by Peter Graves
[sbcl.git]
/
src
/
runtime
/
interrupt.h
diff --git
a/src/runtime/interrupt.h
b/src/runtime/interrupt.h
index
ae72020
..
a373662
100644
(file)
--- a/
src/runtime/interrupt.h
+++ b/
src/runtime/interrupt.h
@@
-13,6
+13,7
@@
#define _INCLUDE_INTERRUPT_H_
#include <signal.h>
#define _INCLUDE_INTERRUPT_H_
#include <signal.h>
+#include <string.h>
/*
* This is a workaround for some slightly silly Linux/GNU Libc
/*
* This is a workaround for some slightly silly Linux/GNU Libc
@@
-25,6
+26,8
@@
/* FIXME: do not rely on NSIG being a multiple of 8 */
#define REAL_SIGSET_SIZE_BYTES ((NSIG/8))
/* FIXME: do not rely on NSIG being a multiple of 8 */
#define REAL_SIGSET_SIZE_BYTES ((NSIG/8))
+extern void check_blockables_blocked_or_lose();
+
static inline void
sigcopyset(sigset_t *new, sigset_t *old)
{
static inline void
sigcopyset(sigset_t *new, sigset_t *old)
{
@@
-45,10
+48,9
@@
union interrupt_handler {
void (*c)(int, siginfo_t*, void*);
};
void (*c)(int, siginfo_t*, void*);
};
-struct interrupt_data {
- void (*interrupt_low_level_handlers[NSIG]) (int, siginfo_t*, void*) ;
- union interrupt_handler interrupt_handlers[NSIG];
+extern union interrupt_handler interrupt_handlers[NSIG];
+struct interrupt_data {
/* signal information for pending signal. pending_signal=0 when there
* is no pending signal. */
void (*pending_handler) (int, siginfo_t*, void*) ;
/* signal information for pending signal. pending_signal=0 when there
* is no pending signal. */
void (*pending_handler) (int, siginfo_t*, void*) ;
@@
-62,13
+64,10
@@
extern void interrupt_init();
extern void fake_foreign_function_call(os_context_t* context);
extern void undo_fake_foreign_function_call(os_context_t* context);
extern void arrange_return_to_lisp_function(os_context_t *, lispobj);
extern void fake_foreign_function_call(os_context_t* context);
extern void undo_fake_foreign_function_call(os_context_t* context);
extern void arrange_return_to_lisp_function(os_context_t *, lispobj);
-extern void interrupt_handle_now(int, siginfo_t*, void*);
+extern void interrupt_handle_now(int, siginfo_t*, os_context_t*);
extern void interrupt_handle_pending(os_context_t*);
extern void interrupt_handle_pending(os_context_t*);
-extern void interrupt_internal_error(int, siginfo_t*, os_context_t*,
- boolean continuable);
+extern void interrupt_internal_error(os_context_t*, boolean continuable);
extern boolean handle_guard_page_triggered(os_context_t *,os_vm_address_t);
extern boolean handle_guard_page_triggered(os_context_t *,os_vm_address_t);
-extern boolean interrupt_maybe_gc(int, siginfo_t*, void*);
-extern boolean interrupt_maybe_gc_int(int, siginfo_t *, void *);
extern boolean maybe_defer_handler(void *handler, struct interrupt_data *data,
int signal, siginfo_t *info,
os_context_t *context);
extern boolean maybe_defer_handler(void *handler, struct interrupt_data *data,
int signal, siginfo_t *info,
os_context_t *context);
@@
-92,9
+91,11
@@
extern unsigned long install_handler(int signal,
extern union interrupt_handler interrupt_handlers[NSIG];
/* Set all deferrable signals into *s. */
extern union interrupt_handler interrupt_handlers[NSIG];
/* Set all deferrable signals into *s. */
-void sigaddset_deferrable(sigset_t *s);
+extern void sigaddset_deferrable(sigset_t *s);
/* Set all blockable signals into *s. */
/* Set all blockable signals into *s. */
-void sigaddset_blockable(sigset_t *s);
+extern void sigaddset_blockable(sigset_t *s);
+
+extern void block_blockable_signals();
/* The void* casting here avoids having to mess with the various types
* of function argument lists possible for signal handlers:
/* The void* casting here avoids having to mess with the various types
* of function argument lists possible for signal handlers:
@@
-103,4
+104,10
@@
void sigaddset_blockable(sigset_t *s);
* "cleanly" with union types is in fact a mess. */
#define ARE_SAME_HANDLER(x, y) ((void*)(x) == (void*)(y))
* "cleanly" with union types is in fact a mess. */
#define ARE_SAME_HANDLER(x, y) ((void*)(x) == (void*)(y))
+extern void handle_trap(os_context_t *context, int trap);
+
+#ifndef LISP_FEATURE_WIN32
+extern void lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr);
+#endif
+
#endif
#endif