1.0.0.26:

[sbcl.git] / src / runtime / ppc-assem.S

diff --git a/src/runtime/ppc-assem.S b/src/runtime/ppc-assem.S
index c760abb..974f339 100644 (file)
--- a/src/runtime/ppc-assem.S
+++ b/src/runtime/ppc-assem.S
@@ -7,6 +7,7 @@
 #include "genesis/simple-fun.h"
 #include "genesis/fdefn.h"
 #include "genesis/closure.h"
+#include "genesis/funcallable-instance.h"
 #include "genesis/static-symbols.h"
 
 #ifdef LISP_FEATURE_DARWIN
@@ -345,7 +346,7 @@ x:
 
        /* Function is an indirect closure */
        lwz reg_CODE,SIMPLE_FUN_SELF_OFFSET(reg_LEXENV)
-       addi reg_LIP,reg_CODE,6*4-FUN_POINTER_LOWTAG
+       addi reg_LIP,reg_CODE,SIMPLE_FUN_CODE_OFFSET
        mtctr reg_LIP
        slwi reg_NARGS,reg_NL2,2
        bctr                    
@@ -515,18 +516,27 @@ lra:
 
        GFUNCDEF(xundefined_tramp)
        .globl CSYMBOL(undefined_tramp)
-       .byte 0,0,0,SIMPLE_FUN_HEADER_WIDETAG
-       .byte 18<<2
-CSYMBOL(undefined_tramp):      
-       .byte 0,0,48
-       .long CSYMBOL(undefined_tramp)
-       .long NIL
-       .long NIL
-       .long NIL
+       .long   SIMPLE_FUN_HEADER_WIDETAG                         /* header */
+       .long   CSYMBOL(undefined_tramp) - SIMPLE_FUN_CODE_OFFSET /* self */
+       .long   NIL                                               /* next */
+       .long   NIL                                               /* name */
+       .long   NIL                                               /* arglist */
+       .long   NIL                                               /* type */
+       .long   NIL                                               /* xref */
+CSYMBOL(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.  */
+       bcl 20,31,.+4                  /* get address of the next instruction */
+       mflr reg_CODE                  /* header 1 extra word back from here */
+       addi reg_CODE,reg_CODE,-(SIMPLE_FUN_CODE_OFFSET+4)
+       
        twllei reg_ZERO,trap_Cerror
        .byte 4
        .byte UNDEFINED_FUN_ERROR
-       .byte 254, sc_DescriptorReg+0x40, 1     /* 140?  sparc says sc_descriptorReg */
+       .byte 254, sc_DescriptorReg+0x40, 1 /* 140?  sparc says sc_descriptorReg */
+       /* This stuff is for the continuable error.  I don't think there's
+        * any support for it on the lisp side */
        .align 2
 1:     lwz reg_CODE,FDEFN_RAW_ADDR_OFFSET(reg_FDEFN)
        la reg_LIP,SIMPLE_FUN_CODE_OFFSET(reg_CODE)
@@ -539,15 +549,7 @@ CSYMBOL(undefined_tramp):
 
        GFUNCDEF(xclosure_tramp)
        .globl CSYMBOL(closure_tramp)
-       .byte 0,0,0,SIMPLE_FUN_HEADER_WIDETAG
-       .byte 18<<2
 CSYMBOL(closure_tramp):
-       .byte 0,0,24
-       .long CSYMBOL(closure_tramp)
-       .long NIL 
-       .long NIL
-       .long NIL
-       .long NIL
        lwz reg_LEXENV,FDEFN_FUN_OFFSET(reg_FDEFN)
        lwz reg_CODE,CLOSURE_FUN_OFFSET(reg_LEXENV)
        la reg_LIP,SIMPLE_FUN_CODE_OFFSET(reg_CODE)
@@ -556,6 +558,23 @@ CSYMBOL(closure_tramp):
 
        SET_SIZE(xclosure_tramp)
 
+       GFUNCDEF(xfuncallable_instance_tramp)
+       .globl CSYMBOL(funcallable_instance_tramp)
+       .long SIMPLE_FUN_HEADER_WIDETAG
+CSYMBOL(funcallable_instance_tramp) = . + 1
+       .long CSYMBOL(funcallable_instance_tramp)
+       .long NIL
+       .long NIL
+       .long NIL
+       .long NIL
+       .long NIL
+       lwz reg_LEXENV,FUNCALLABLE_INSTANCE_FUNCTION_OFFSET(reg_LEXENV)
+       lwz reg_FDEFN,CLOSURE_FUN_OFFSET(reg_LEXENV)
+       addi reg_LIP,reg_FDEFN,SIMPLE_FUN_CODE_OFFSET
+       mtctr reg_LIP
+       bctr
+       SET_SIZE(funcallable_instance_tramp)
+       
        GFUNCDEF(fun_end_breakpoint_trap)
        .long 0
        SET_SIZE(fun_end_breakpoint_trap)