projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.33.25: switch SB-QUEUE into using ASDF
[sbcl.git]
/
src
/
runtime
/
ppc-arch.c
diff --git
a/src/runtime/ppc-arch.c
b/src/runtime/ppc-arch.c
index
5e6b885
..
533293d
100644
(file)
--- a/
src/runtime/ppc-arch.c
+++ b/
src/runtime/ppc-arch.c
@@
-16,6
+16,7
@@
#include "globals.h"
#include "validate.h"
#include "os.h"
#include "globals.h"
#include "validate.h"
#include "os.h"
+#include "interrupt.h"
#include "lispregs.h"
#include "signal.h"
#include "interrupt.h"
#include "lispregs.h"
#include "signal.h"
#include "interrupt.h"
@@
-356,7
+357,13
@@
handle_allocation_trap(os_context_t * context)
dynamic_space_free_pointer);
#endif
dynamic_space_free_pointer);
#endif
- memory = (char *) alloc(size);
+ {
+ struct interrupt_data *data =
+ arch_os_get_current_thread()->interrupt_data;
+ data->allocation_trap_context = context;
+ memory = (char *) alloc(size);
+ data->allocation_trap_context = 0;
+ }
#if 0
fprintf(stderr, "alloc returned %p\n", memory);
#if 0
fprintf(stderr, "alloc returned %p\n", memory);
@@
-423,14
+430,10
@@
arch_handle_single_step_trap(os_context_t *context, int trap)
}
static void
}
static void
-sigtrap_handler(int signal, siginfo_t *siginfo, void *void_context)
+sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context)
{
unsigned int code;
{
unsigned int code;
- os_context_t *context = void_context;
-#ifdef LISP_FEATURE_LINUX
- os_restore_fp_control(context);
-#endif
code=*((u32 *)(*os_context_pc_addr(context)));
if (code == ((3 << 26) | (0x18 << 21) | (reg_NL3 << 16))) {
arch_clear_pseudo_atomic_interrupted(context);
code=*((u32 *)(*os_context_pc_addr(context)));
if (code == ((3 << 26) | (0x18 << 21) | (reg_NL3 << 16))) {
arch_clear_pseudo_atomic_interrupted(context);