X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-assem.S;h=885d1623c59f29fc7bc389371a44494bb9179731;hb=f318d0b1654042ed8f1b887852a9ba1f539208e4;hp=c1570511a1da11f784a2aab842038efacdd58b20;hpb=02a1e16406ff92bbecb073e0e98753f40d52de97;p=sbcl.git

diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S
index c157051..885d162 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
@@ -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
 
@@ -175,6 +192,9 @@ lra:	.word	RETURN_PC_HEADER_WIDETAG
 	/* Nested lisp -> C calls may have clobbered gp. */
 	lw	gp, framesize-16(sp)
 
+	/* Mark us as in C land. */
+	sw	reg_CSP, foreign_function_call_active
+
 	/* Set the pseudo-atomic flag. */
 	li	reg_NL4, 0
 	addu	reg_ALLOC, 1
@@ -187,9 +207,6 @@ 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
@@ -245,6 +262,9 @@ lra:	.word	RETURN_PC_HEADER_WIDETAG
 	move	reg_CFP, reg_CSP
 	addu	reg_CSP, reg_CFP, 32
 
+	/* Mark us as in C land. */
+	sw	reg_CSP, foreign_function_call_active
+
 	/* Set the pseudo-atomic flag. */
 	.set	noreorder
 	li	reg_NL4, 0
@@ -265,9 +285,6 @@ 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
@@ -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
@@ -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)
@@ -357,13 +374,14 @@ lra:	.word	RETURN_PC_HEADER_WIDETAG
 	.word   NIL /* name */
 	.word	NIL /* arglist */
 	.word	NIL /* type */
+	.word	NIL /* xrefs */
 	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
+	addiu	reg_CODE, -SIMPLE_FUN_CODE_OFFSET
 	.set	noreorder
 	b	1f
 	 break	0x0, trap_Cerror
@@ -396,6 +414,7 @@ lra:	.word	RETURN_PC_HEADER_WIDETAG
 	.word   NIL /* name */
 	.word	NIL /* arglist */
 	.word	NIL /* type */
+	.word	NIL /* xrefs */
 	LEAF(closure_tramp)
         lw	reg_LEXENV, FDEFN_FUN_OFFSET(reg_FDEFN)
         lw	reg_CODE, CLOSURE_FUN_OFFSET(reg_LEXENV)
@@ -404,15 +423,37 @@ lra:	.word	RETURN_PC_HEADER_WIDETAG
 	END(closure_tramp)
 
 /*
- * Function-end breakpoint magic.
+ * The trampoline for funcallable instances
  */
-	.align	3 /* minimum alignment for a lisp object */
-	.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
+	.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
+
+/*
+ * 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)
-	b	multiple_value_return
+	.set    noreorder
+	.word   RETURN_PC_HEADER_WIDETAG
+	b       multiple_value_return
 	 nop
-	.set	reorder
+	.set    reorder
 
 	/* single value return */