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 4c00459..974f339 100644 (file)
--- a/src/runtime/ppc-assem.S
+++ b/src/runtime/ppc-assem.S
@@ -346,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                    
@@ -522,13 +522,14 @@ lra:
        .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 is 7 words back from here */
-       addi reg_CODE,reg_CODE,-7*4+FUN_POINTER_LOWTAG
+       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
@@ -566,6 +567,7 @@ CSYMBOL(funcallable_instance_tramp) = . + 1
        .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