X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-assem.S;h=1982ee86b8b741ab455209a8323be502a69ff72f;hb=d8422b9967f465801891907396bcc5bfde0f3297;hp=c2959930e4279405d9e37ac01670038d51df56c5;hpb=591a8f806180e33bf3636dfc81852e7ec58a1bb1;p=sbcl.git diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S index c295993..1982ee8 100644 --- a/src/runtime/mips-assem.S +++ b/src/runtime/mips-assem.S @@ -19,7 +19,6 @@ #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" @@ -166,7 +165,7 @@ symbol: lw reg_A5, 20(reg_CFP) /* Calculate LRA */ - la reg_LRA, lra - RETURN_PC_RETURN_POINT_OFFSET + la reg_LRA, lra + OTHER_POINTER_LOWTAG /* Indirect closure */ lw reg_CODE, CLOSURE_FUN_OFFSET(reg_LEXENV) @@ -447,10 +446,16 @@ funcallable_instance_tramp = . + 1 * copied and has to be relocatable. It also needs a properly aligned * header tag after the fun_end_breakpoint_guts symbol. */ + +/* + * For an explanation of the magic involved in function-end + * breakpoints, see the implementation in ppc-assem.S. + */ + .align 3 /* minimum alignment for a lisp object */ LEAF(fun_end_breakpoint_guts) .set noreorder - .word RETURN_PC_HEADER_WIDETAG + .word RETURN_PC_HEADER_WIDETAG + 0x800 b multiple_value_return nop .set reorder