X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fppc-arch.c;h=533293d8835638d4ea38cc4c1f4dedc816cb11ed;hb=f2db6743b1fadeea9e72cb583d857851c87efcd4;hp=297fbf053e7ecbbbcca519916ea92562c5d79369;hpb=842d3c24e4a1a6b5ebadb9ee754814174a951029;p=sbcl.git diff --git a/src/runtime/ppc-arch.c b/src/runtime/ppc-arch.c index 297fbf0..533293d 100644 --- 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 "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 - 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); @@ -423,10 +430,9 @@ arch_handle_single_step_trap(os_context_t *context, int trap) } 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; - os_context_t *context = void_context; code=*((u32 *)(*os_context_pc_addr(context))); if (code == ((3 << 26) | (0x18 << 21) | (reg_NL3 << 16))) {