projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.31.23: OAOOize external-format support
[sbcl.git]
/
src
/
runtime
/
ppc-arch.c
diff --git
a/src/runtime/ppc-arch.c
b/src/runtime/ppc-arch.c
index
11be9fd
..
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);
@@
-446,9
+449,6
@@
sigtrap_handler(int signal, siginfo_t *siginfo, void *void_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
@@
-457,25
+457,14
@@
sigtrap_handler(int signal, siginfo_t *siginfo, void *void_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;
}
interrupt_handle_now(signal, (siginfo_t *)code, context);
return;
}
interrupt_handle_now(signal, (siginfo_t *)code, context);
-#ifdef LISP_FEATURE_DARWIN
- /* Work around G5 bug */
- DARWIN_FIX_CONTEXT(context);
-#endif
}
}