X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-assem.S;h=6c7b7d61f4c4157656af5fa3306043f63d34356c;hb=9b1fade83db8453b75b8c7380eb12ce41b5b889c;hp=b44b4bc10d48e4682d16af151761e9d49ec11c15;hpb=39e19255f69cbba8668b4b7ffa58532ab6309375;p=sbcl.git diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S index b44b4bc..6c7b7d6 100644 --- a/src/runtime/mips-assem.S +++ b/src/runtime/mips-assem.S @@ -192,14 +192,14 @@ lra: .word RETURN_PC_HEADER_WIDETAG /* Nested lisp -> C calls may have clobbered gp. */ lw gp, framesize-16(sp) + /* Mark us as in C land. */ + sw reg_CSP, foreign_function_call_active + /* Set the pseudo-atomic flag. */ li reg_NL4, 0 addu reg_ALLOC, 1 .set reorder - /* Mark us as in C land. */ - sw reg_CSP, foreign_function_call_active - /* Save LISP state. */ subu reg_NL0, reg_ALLOC, 1 sw reg_NL0, dynamic_space_free_pointer @@ -262,15 +262,15 @@ lra: .word RETURN_PC_HEADER_WIDETAG move reg_CFP, reg_CSP addu reg_CSP, reg_CFP, 32 + /* Mark us as in C land. */ + sw reg_CSP, foreign_function_call_active + /* Set the pseudo-atomic flag. */ .set noreorder li reg_NL4, 0 addu reg_ALLOC, 1 .set reorder - /* Mark us as in C land. */ - sw reg_CSP, foreign_function_call_active - /* Convert the return address to an offset and save it on the stack. */ subu reg_NFP, reg_LIP, reg_CODE addu reg_NFP, OTHER_POINTER_LOWTAG @@ -473,3 +473,10 @@ multiple_value_return: b multiple_value_return EXPORT(fun_end_breakpoint_end) END(fun_end_breakpoint_guts) + + + .align 3 /* minimum alignment for a lisp object */ + LEAF(do_pending_interrupt) + break 0x0, trap_PendingInterrupt + jr reg_LIP + END(do_pending_interrupt)