X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-assem.S;h=4be362842b4f2218a0cc2c04ad7d2cbe76a48364;hb=1363121ddb1d2e722e2e41d1c93758551066797c;hp=2b882c237465b67f1f2a47d9f45f3a4342fea15b;hpb=e3547b45241fdc4a2aaab382f1e7e8f71566beba;p=sbcl.git diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S index 2b882c2..4be3628 100644 --- a/src/runtime/mips-assem.S +++ b/src/runtime/mips-assem.S @@ -122,9 +122,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 +135,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 +155,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 +181,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 +191,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 @@ -240,6 +241,7 @@ lra: .word RETURN_PC_HEADER_WIDETAG .set at .set reorder + /* Setup the lisp stack. */ move reg_OCFP, reg_CFP move reg_CFP, reg_CSP addu reg_CSP, reg_CFP, 32 @@ -250,10 +252,13 @@ 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 - sw reg_NFP, (reg_CFP) + sw reg_LRA, (reg_CFP) sw reg_CODE, 4(reg_CFP) sw gp, 8(reg_CFP) @@ -264,14 +269,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. */ @@ -284,7 +286,11 @@ lra: .word RETURN_PC_HEADER_WIDETAG move reg_NL0, v0 # reg_CFUNC move reg_NL1, v1 # reg_NL4 - /* Clear unsaved boxed descriptor regs before allowing an interrupt */ + /* + * Clear boxed descriptor registers before allowing an interrupt. + * We can't rely on C saving some of those registers, they might + * have been GCed in the meanwhile. + */ li reg_A0, 0 # t0 li reg_A1, 0 # t1 li reg_A2, 0 # t2 @@ -293,7 +299,14 @@ lra: .word RETURN_PC_HEADER_WIDETAG li reg_A5, 0 # t5 li reg_FDEFN, 0 # t6 li reg_LEXENV, 0 # t7 + /* + * reg_NFP and reg_OCFP are pointing to fixed locations and are + * preserved by C. + */ + li reg_LRA, 0 # s2 + li reg_L0, 0 # s3 li reg_L1, 0 # t8 + li reg_CODE, 0 # s8 li reg_LIP, 0 # ra /* Turn on pseudo-atomic. */ @@ -302,9 +315,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 @@ -312,16 +322,16 @@ lra: .word RETURN_PC_HEADER_WIDETAG lw reg_BSP, current_binding_stack_pointer /* Restore LRA & CODE */ - lw reg_LIP, (reg_CFP) + lw reg_LRA, (reg_CFP) lw reg_CODE, 4(reg_CFP) - subu reg_LIP, OTHER_POINTER_LOWTAG + subu reg_LIP, reg_NFP, OTHER_POINTER_LOWTAG addu reg_LIP, reg_CODE /* Check for interrupt */ .set noreorder bgez reg_NL4, 1f subu reg_ALLOC, 1 - break 0x10 + break 0x0, 0x10 1: .set reorder /* Reset the lisp stack. */ @@ -329,6 +339,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) @@ -338,7 +351,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 */ @@ -346,19 +359,38 @@ lra: .word RETURN_PC_HEADER_WIDETAG .word NIL /* arglist */ .word NIL /* type */ LEAF(undefined_tramp) - break trap_Error - .byte 4 - .byte UNDEFINED_FUN_ERROR - .byte 254 - .byte (0xc0 + sc_DescriptorReg) - .byte 1 + /* 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 0x0, trap_Cerror + /* Error data length. */ + .byte 4 + /* Error number. */ + .byte UNDEFINED_FUN_ERROR + /* Magic value 254 means a 16bit little endian value follows. + See debug-var-io.lisp. */ + .byte 254 + /* reg_FDEFN is #14. */ + .byte ((14 << 5) + sc_DescriptorReg) % 0x100 + .byte ((14 << 5) + sc_DescriptorReg) / 0x100 .align 2 + .set reorder +1: lw reg_CODE, FDEFN_FUN_OFFSET(reg_FDEFN) + lw reg_LIP, SIMPLE_FUN_CODE_OFFSET(reg_CODE) + jr reg_LIP END(undefined_tramp) /* * The closure trampoline. */ - .align 2 + .align 5 /* common MIPS cacheline size */ + .word 0 /* pad 1 */ + .word 0 /* pad 2 */ .word SIMPLE_FUN_HEADER_WIDETAG /* header */ .word closure_tramp - SIMPLE_FUN_CODE_OFFSET /* self */ .word NIL /* next */ @@ -373,16 +405,19 @@ lra: .word RETURN_PC_HEADER_WIDETAG END(closure_tramp) /* - * Function-end breakpoint magic. + * 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 + .align 3 /* minimum alignment for a lisp object */ LEAF(fun_end_breakpoint_guts) - .set noreorder - .word RETURN_PC_HEADER_WIDETAG - - b multiple_value_return + .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 @@ -396,7 +431,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)