X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-arch.c;h=543c7e0f7bf9692a59d4cc77257bc6becb3dcb0d;hb=1b6dc22623c7bdc5137e98541f0e21f8f1c55caa;hp=9b51cc096223d3b876f4f962e9b299b36ddbe8a9;hpb=e365f2f7a9c66d307b48fee70778f4eaa84bdcc0;p=sbcl.git diff --git a/src/runtime/x86-arch.c b/src/runtime/x86-arch.c index 9b51cc0..543c7e0 100644 --- a/src/runtime/x86-arch.c +++ b/src/runtime/x86-arch.c @@ -72,8 +72,7 @@ void arch_skip_instruction(os_context_t *context) int vlen; int code; - FSHOW((stderr, "/[arch_skip_inst at %x]\n", *os_context_pc_addr(context))); - + /* Get and skip the Lisp interrupt code. */ code = *(char*)(*os_context_pc_addr(context))++; switch (code) @@ -192,6 +191,7 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) int code = info->si_code; os_context_t *context = (os_context_t*)void_context; unsigned int trap; + sigset_t ss; if (single_stepping && (signal==SIGTRAP)) { @@ -242,6 +242,9 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) case trap_PendingInterrupt: FSHOW((stderr, "/\n")); arch_skip_instruction(context); + sigemptyset(&ss); + sigaddset(&ss,SIGTRAP); + sigprocmask(SIG_UNBLOCK,&ss,0); interrupt_handle_pending(context); break;