X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-assem.S;h=ca4cfd06719388a49cfa49fc08f5b5cc2382db12;hb=afb952a15b893beccbc7750ebdc0ee403459fe28;hp=53863ce8fc221ab5299d09d9385bbd029e402a8b;hpb=024b8b36724f4497bfc6bc0b8f0202490149122b;p=sbcl.git diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S index 53863ce..ca4cfd0 100644 --- a/src/runtime/mips-assem.S +++ b/src/runtime/mips-assem.S @@ -1,8 +1,24 @@ +/* + * very-low-level utilities for runtime support + */ + +/* + * This software is part of the SBCL system. See the README file for + * more information. + * + * This software is derived from the CMU CL system, which was + * written at Carnegie Mellon University and released into the + * public domain. The software is in the public domain and is + * provided with absolutely no warranty. See the COPYING and CREDITS + * files for more information. + */ + #include "sbcl.h" #include "lispregs.h" #include "globals.h" #include "genesis/fdefn.h" #include "genesis/closure.h" +#include "genesis/funcallable-instance.h" #include "genesis/return-pc.h" #include "genesis/simple-fun.h" #include "genesis/static-symbols.h" @@ -122,9 +138,6 @@ symbol: li reg_ALLOC, 1 .set reorder - /* Mark us as in Lisp land. */ - sw zero, foreign_function_call_active - /* Load the allocation pointer, preserving the low-bit of alloc */ lw reg_BSP, dynamic_space_free_pointer addu reg_ALLOC, reg_BSP @@ -138,7 +151,7 @@ symbol: .set noreorder bgez reg_NL4, 1f subu reg_ALLOC, 1 - break 0x10 + break 0x0, 0x10 1: .set reorder /* Pass in args */ @@ -158,11 +171,15 @@ symbol: /* Indirect closure */ lw reg_CODE, CLOSURE_FUN_OFFSET(reg_LEXENV) - /* Jump into lisp land. */ addu reg_LIP, reg_CODE, SIMPLE_FUN_CODE_OFFSET + + /* Mark us as in Lisp land. */ + sw zero, foreign_function_call_active + + /* Jump into lisp land. */ jr reg_LIP - .align 2 + .align 3 .set noreorder lra: .word RETURN_PC_HEADER_WIDETAG @@ -180,6 +197,9 @@ lra: .word RETURN_PC_HEADER_WIDETAG 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 @@ -187,14 +207,11 @@ lra: .word RETURN_PC_HEADER_WIDETAG sw reg_CSP, current_control_stack_pointer sw reg_CFP, current_control_frame_pointer - /* Mark us as in C land. */ - sw reg_CSP, foreign_function_call_active - /* Check for interrupt */ .set noreorder bgez reg_NL4, 1f subu reg_ALLOC, 1 - break 0x10 + break 0x0, 0x10 1: .set reorder /* Pass one return value back to C land. For a 64bit value, we may @@ -251,6 +268,9 @@ lra: .word RETURN_PC_HEADER_WIDETAG 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 @@ -265,14 +285,11 @@ lra: .word RETURN_PC_HEADER_WIDETAG sw reg_CSP, current_control_stack_pointer sw reg_CFP, current_control_frame_pointer - /* Mark us as in C land. */ - sw reg_CSP, foreign_function_call_active - /* Check for interrupt */ .set noreorder bgez reg_NL4, 1f subu reg_ALLOC, 1 - break 0x10 + break 0x0, 0x10 1: .set reorder /* Into C land we go. */ @@ -314,9 +331,6 @@ lra: .word RETURN_PC_HEADER_WIDETAG li reg_ALLOC, 1 .set reorder - /* Mark us as in Lisp land. */ - sw zero, foreign_function_call_active - /* Load the allocation pointer, preserving the low-bit of alloc */ lw reg_BSP, dynamic_space_free_pointer addu reg_ALLOC, reg_BSP @@ -333,7 +347,7 @@ lra: .word RETURN_PC_HEADER_WIDETAG .set noreorder bgez reg_NL4, 1f subu reg_ALLOC, 1 - break 0x10 + break 0x0, 0x10 1: .set reorder /* Reset the lisp stack. */ @@ -341,6 +355,9 @@ lra: .word RETURN_PC_HEADER_WIDETAG move reg_CSP, reg_CFP move reg_CFP, reg_OCFP + /* Mark us as in Lisp land. */ + sw zero, foreign_function_call_active + /* Return to LISP. */ jr reg_LIP END(call_into_c) @@ -350,7 +367,7 @@ lra: .word RETURN_PC_HEADER_WIDETAG * * The undefined-function trampoline. */ - .align 2 + .align 3 /* minimum alignment for a lisp object */ .word SIMPLE_FUN_HEADER_WIDETAG /* header */ .word undefined_tramp - SIMPLE_FUN_CODE_OFFSET /* self */ .word NIL /* next */ @@ -358,9 +375,15 @@ lra: .word RETURN_PC_HEADER_WIDETAG .word NIL /* arglist */ .word NIL /* type */ LEAF(undefined_tramp) + /* Point reg_CODE to the header and tag it as function, since + the debugger regards a function pointer in reg_CODE which + doesn't point to a code object as undefined function. */ + lui reg_CODE, %hi(undefined_tramp) + addiu reg_CODE, %lo(undefined_tramp) + addiu reg_CODE, - 24 + FUN_POINTER_LOWTAG .set noreorder b 1f - break trap_Cerror + break 0x0, trap_Cerror /* Error data length. */ .byte 4 /* Error number. */ @@ -398,16 +421,38 @@ lra: .word RETURN_PC_HEADER_WIDETAG END(closure_tramp) /* - * Function-end breakpoint magic. + * The trampoline for funcallable instances */ - .align 2 - LEAF(fun_end_breakpoint_guts) - .set noreorder - .word RETURN_PC_HEADER_WIDETAG + .globl funcallable_instance_tramp + .align 3 + .word SIMPLE_FUN_HEADER_WIDETAG +funcallable_instance_tramp = . + 1 + .word funcallable_instance_tramp + .word NIL + .word NIL + .word NIL + .word NIL + + lw reg_LEXENV, FUNCALLABLE_INSTANCE_FUNCTION_OFFSET(reg_LEXENV) + lw reg_CODE, CLOSURE_FUN_OFFSET(reg_LEXENV) + addu reg_LIP, reg_CODE, SIMPLE_FUN_CODE_OFFSET + jr reg_LIP + nop - b multiple_value_return +/* + * Function-end breakpoint magic. This is truely magic, the code is + * copied and has to be relocatable. It also needs a properly aligned + * header tag after the fun_end_breakpoint_guts symbol. + */ + .align 3 /* minimum alignment for a lisp object */ + LEAF(fun_end_breakpoint_guts) + .set noreorder + .word RETURN_PC_HEADER_WIDETAG + b multiple_value_return nop - .set reorder + .set reorder + + /* single value return */ move reg_OCFP, reg_CSP addu reg_CSP, 4 @@ -421,7 +466,7 @@ lra: .word RETURN_PC_HEADER_WIDETAG multiple_value_return: FEXPORT(fun_end_breakpoint_trap) - break trap_FunEndBreakpoint + break 0x0, trap_FunEndBreakpoint b multiple_value_return EXPORT(fun_end_breakpoint_end) END(fun_end_breakpoint_guts)