X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-assem.S;h=9434c3e5278928d225a34bc617ac89508a4b2e8d;hb=638197e01ef6d5365852758c072b2b102fdceaa6;hp=e3032e28f1f53cf4149b4f4856b1ffd57f8ad87d;hpb=760ca9101a2615613b071444ee370e0f2d93fba3;p=sbcl.git

diff --git a/src/runtime/x86-assem.S b/src/runtime/x86-assem.S
index e3032e2..9434c3e 100644
--- a/src/runtime/x86-assem.S
+++ b/src/runtime/x86-assem.S
@@ -17,6 +17,7 @@
 #include "sbcl.h"
 #include "validate.h"
 #include "genesis/closure.h"
+#include "genesis/funcallable-instance.h"
 #include "genesis/fdefn.h"
 #include "genesis/static-symbols.h"
 #include "genesis/symbol.h"
@@ -361,6 +362,17 @@ GNAME(closure_tramp):
 	jmp	*CLOSURE_FUN_OFFSET(%eax)
 	SIZE(GNAME(closure_tramp))
 
+	.text
+	.align	align_4byte,0x90
+	.globl GNAME(funcallable_instance_tramp)
+	TYPE(GNAME(funcallable_instance_tramp))
+GNAME(funcallable_instance_tramp):
+	movl	FUNCALLABLE_INSTANCE_FUNCTION_OFFSET(%eax),%eax	
+	/* KLUDGE: on this platform, whatever kind of function is in %rax
+	 * now, the first word of it contains the address to jump to. */
+	jmp	*CLOSURE_FUN_OFFSET(%eax)
+	SIZE(GNAME(funcallable_instance_tramp))
+	
 /*
  * fun-end breakpoint magic
  */
@@ -832,6 +844,57 @@ GNAME(alloc_overflow_edi):
         ret
         SIZE(GNAME(alloc_overflow_edi))
 
+
+#ifdef LISP_FEATURE_DARWIN
+        .align align_4byte
+        .globl GNAME(call_into_lisp_tramp)
+        TYPE(GNAME(call_into_lisp_tramp))
+GNAME(call_into_lisp_tramp):
+        /* 1. build the stack frame from the block that's pointed to by ECX
+           2. free the block
+           3. set ECX to 0
+           4. call the function via call_into_lisp
+        */
+        pushl   0(%ecx)          /* return address */
+
+        pushl   %ebp
+        movl    %esp, %ebp
+
+        pushl   32(%ecx)         /* eflags */
+        pushl   28(%ecx)         /* EAX */
+        pushl   20(%ecx)         /* ECX */
+        pushl   16(%ecx)         /* EDX */
+        pushl   24(%ecx)         /* EBX */
+        pushl   $0                /* popal is going to ignore esp */
+        pushl   %ebp              /* is this right?? */
+        pushl   12(%ecx)         /* ESI */
+        pushl   8(%ecx)          /* EDI */
+        pushl   $0                /* args for call_into_lisp */
+        pushl   $0
+        pushl   4(%ecx)          /* function to call */
+
+        /* free our save block */
+        pushl   %ecx              /* reserve sufficient space on stack for args */
+        pushl   %ecx
+        andl    $0xfffffff0, %esp  /* align stack */
+        movl    $0x40, 4(%esp)
+        movl    %ecx, (%esp)
+        call    GNAME(os_invalidate)
+
+        /* call call_into_lisp */
+        leal    -48(%ebp), %esp
+        call    GNAME(call_into_lisp)
+
+        /* Clean up our mess */
+        leal    -36(%ebp), %esp
+        popal
+        popfl
+        leave
+        ret
+        
+        SIZE(call_into_lisp_tramp)
+#endif
+        
 	.align	align_4byte,0x90
 	.globl	GNAME(post_signal_tramp)
 	TYPE(GNAME(post_signal_tramp))
@@ -842,6 +905,10 @@ GNAME(post_signal_tramp):
 	addl $12,%esp  	/* clear call_into_lisp args from stack */
 	popal           /* restore registers */
         popfl
+#ifdef LISP_FEATURE_DARWIN
+        /* skip two padding words */
+        addl $8,%esp
+#endif
 	leave
 	ret
 	SIZE(GNAME(post_signal_tramp))