projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix attach_thread to allocate a TLS index for *gc-inhibit* if needed
[sbcl.git]
/
src
/
runtime
/
mips-assem.S
diff --git
a/src/runtime/mips-assem.S
b/src/runtime/mips-assem.S
index
885d162
..
1982ee8
100644
(file)
--- 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/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"
#include "genesis/simple-fun.h"
#include "genesis/static-symbols.h"
@@
-166,7
+165,7
@@
symbol:
lw reg_A5, 20(reg_CFP)
/* Calculate LRA */
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)
/* 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.
*/
* 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
.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
b multiple_value_return
nop
.set reorder
@@
-469,7
+474,16
@@
funcallable_instance_tramp = . + 1
multiple_value_return:
FEXPORT(fun_end_breakpoint_trap)
multiple_value_return:
FEXPORT(fun_end_breakpoint_trap)
- break 0x0, trap_FunEndBreakpoint
+ .set noreorder
b multiple_value_return
b multiple_value_return
+ break 0x0, trap_FunEndBreakpoint
+ .set reorder
EXPORT(fun_end_breakpoint_end)
END(fun_end_breakpoint_guts)
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)