From 28ddfd0df589f6051bd77dce506f7d8e73de5cbc Mon Sep 17 00:00:00 2001 From: Thiemo Seufer Date: Tue, 20 Sep 2005 19:12:27 +0000 Subject: [PATCH] 0.9.4.82: The final piece to fix bug #379 for mips. --- src/runtime/mips-assem.S | 14 ++++++++------ version.lisp-expr | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S index c157051..614b005 100644 --- a/src/runtime/mips-assem.S +++ b/src/runtime/mips-assem.S @@ -404,15 +404,17 @@ 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 /* minimum alignment for a lisp object */ - .set noreorder - .word RETURN_PC_HEADER_WIDETAG + .align 3 /* minimum alignment for a lisp object */ LEAF(fun_end_breakpoint_guts) - b multiple_value_return + .set noreorder + .word RETURN_PC_HEADER_WIDETAG + b multiple_value_return nop - .set reorder + .set reorder /* single value return */ diff --git a/version.lisp-expr b/version.lisp-expr index b603e28..22b2ef3 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.4.81" +"0.9.4.82" -- 1.7.10.4