projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
additional list seeking transformations
[sbcl.git]
/
src
/
runtime
/
ppc-arch.c
diff --git
a/src/runtime/ppc-arch.c
b/src/runtime/ppc-arch.c
index
e2d5c67
..
5e6b885
100644
(file)
--- a/
src/runtime/ppc-arch.c
+++ b/
src/runtime/ppc-arch.c
@@
-21,6
+21,7
@@
#include "interrupt.h"
#include "interr.h"
#include "breakpoint.h"
#include "interrupt.h"
#include "interr.h"
#include "breakpoint.h"
+#include "alloc.h"
#if defined(LISP_FEATURE_GENCGC)
#include "gencgc-alloc-region.h"
#if defined(LISP_FEATURE_GENCGC)
#include "gencgc-alloc-region.h"
@@
-422,9
+423,10
@@
arch_handle_single_step_trap(os_context_t *context, int trap)
}
static 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;
{
unsigned int code;
+ os_context_t *context = void_context;
#ifdef LISP_FEATURE_LINUX
os_restore_fp_control(context);
#ifdef LISP_FEATURE_LINUX
os_restore_fp_control(context);
@@
-444,9
+446,6
@@
sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context)
if (allocation_trap_p(context)) {
handle_allocation_trap(context);
arch_skip_instruction(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
return;
}
#endif
@@
-455,32
+454,21
@@
sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context)
/* twllei reg_ZERO,N will always trap if reg_ZERO = 0 */
int trap = code & 0x1f;
handle_trap(context,trap);
/* 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);
return;
}
if (((code >> 26) == 3) && (((code >> 21) & 31) == 24)) {
interrupt_internal_error(context, 0);
-#ifdef LISP_FEATURE_DARWIN
- DARWIN_FIX_CONTEXT(context);
-#endif
return;
}
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()
{
}
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
}
void