X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fppc-assem.S;h=c95fa0e9e390ad94871f19c591662a5f624f1d05;hb=4b585c19dcd87dc3410094a2d2d7385d49200a44;hp=10f46d5b356cbda8d51767edce5ba54fa7f95ecc;hpb=b9e94e326f79ab01e56cb437e424ce5ea489471f;p=sbcl.git

diff --git a/src/runtime/ppc-assem.S b/src/runtime/ppc-assem.S
index 10f46d5..c95fa0e 100644
--- a/src/runtime/ppc-assem.S
+++ b/src/runtime/ppc-assem.S
@@ -21,7 +21,7 @@
 			.align 3 @ \
 _##x:
 
-#define GFUNCDEF(x)	.globl _/**/x @ \
+#define GFUNCDEF(x)	.globl _ ## x @ \
 	FUNCDEF(x)
 #else
 #define FUNCDEF(x)	.text ; \
@@ -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			
@@ -516,11 +516,25 @@ lra:
 
 	GFUNCDEF(xundefined_tramp)
 	.globl CSYMBOL(undefined_tramp)
-CSYMBOL(undefined_tramp):	
+	.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
@@ -553,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