X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fppc-assem.S;h=c95fa0e9e390ad94871f19c591662a5f624f1d05;hb=4b585c19dcd87dc3410094a2d2d7385d49200a44;hp=de3653808b4c629436107f3b9660bc2f0cd0c49b;hpb=506253505641855dc8bb87033f7af894904f848b;p=sbcl.git diff --git a/src/runtime/ppc-assem.S b/src/runtime/ppc-assem.S index de36538..c95fa0e 100644 --- a/src/runtime/ppc-assem.S +++ b/src/runtime/ppc-assem.S @@ -7,20 +7,21 @@ #include "genesis/simple-fun.h" #include "genesis/fdefn.h" #include "genesis/closure.h" +#include "genesis/funcallable-instance.h" #include "genesis/static-symbols.h" -#ifdef DARWIN +#ifdef LISP_FEATURE_DARWIN #define CSYMBOL(x) _ ## x #else #define CSYMBOL(x) x #endif -#if defined DARWIN +#if defined LISP_FEATURE_DARWIN #define FUNCDEF(x) .text @ \ .align 3 @ \ _##x: -#define GFUNCDEF(x) .globl _/**/x @ \ +#define GFUNCDEF(x) .globl _ ## x @ \ FUNCDEF(x) #else #define FUNCDEF(x) .text ; \ @@ -32,7 +33,7 @@ x: FUNCDEF(x) #endif -#if defined DARWIN +#if defined LISP_FEATURE_DARWIN #define SET_SIZE(x) #else #define SET_SIZE(x) .size x,.-x @@ -41,7 +42,7 @@ x: /* Load a register from a global, using the register as an intermediary */ /* The register will be a fixnum for one instruction, so this is gc-safe */ -#if defined DARWIN +#if defined LISP_FEATURE_DARWIN #define load(reg,global) \ lis reg,ha16(global) @ \ lwz reg,lo16(global)(reg) ; Comment @@ -56,7 +57,7 @@ x: #endif #define FIRST_SAVE_FPR 14 /* lowest-numbered non-volatile FPR */ -#ifdef DARWIN +#ifdef LISP_FEATURE_DARWIN #define FIRST_SAVE_GPR 13 /* lowest-numbered non-volatile GPR */ #define NGPR_SAVE_BYTES(n) ((32-(n))*4) #define FRAME_ARG_BYTES(n) (((((n)+6)*4)+15)&~15) @@ -67,12 +68,12 @@ x: #endif #define NFPR_SAVE_BYTES(n) ((32-(n))*8) -#ifdef DARWIN +#ifdef LISP_FEATURE_DARWIN #define FRAME_SIZE(first_g,first_f,out_arg_words,savecr) \ (NFPR_SAVE_BYTES(first_f)+ NGPR_SAVE_BYTES(first_g)+ FRAME_ARG_BYTES(out_arg_words)) #define SAVE_FPR(n) stfd f##n,-8*(32- n)(r11) #define SAVE_GPR(n) stw r##n,-4*(32- n)(r11) -#define FULL_FRAME_SIZE FRAME_SIZE(FIRST_SAVE_GPR,FIRST_SAVE_FPR,8,1) +#define FULL_FRAME_SIZE (FRAME_SIZE(FIRST_SAVE_GPR,FIRST_SAVE_FPR,8,1)+15&~15) #define RESTORE_FPR(n) lfd f##n,-8*(32- n)(r11) #define RESTORE_GPR(n) lwz r##n,-4*(32- n)(r11) #else @@ -86,7 +87,7 @@ x: #define RESTORE_GPR(n) lwz n,-4*(32-(n))(11) #endif -#ifdef DARWIN +#ifdef LISP_FEATURE_DARWIN #define C_FULL_PROLOG \ nop @\ nop @ \ @@ -302,7 +303,7 @@ x: li reg_L1,0 li reg_L2,0 li reg_LIP,0 -#ifdef DARWIN +#ifdef LISP_FEATURE_DARWIN lis reg_NULL,hi16(NIL) ori reg_NULL,reg_NULL,lo16(NIL) #else @@ -311,7 +312,6 @@ x: #endif /* Turn on pseudo-atomic */ - li reg_NL3,-4 li reg_ALLOC,4 store(reg_ZERO,reg_NL4,CSYMBOL(foreign_function_call_active)) load(reg_NL4,CSYMBOL(dynamic_space_free_pointer)) @@ -321,8 +321,9 @@ x: load(reg_OCFP,CSYMBOL(current_control_frame_pointer)) /* No longer atomic, and check for interrupt */ - add reg_ALLOC,reg_ALLOC,reg_NL3 - twlti reg_ALLOC,0 + andi. reg_NL3, reg_ALLOC, 1 + subi reg_ALLOC,reg_ALLOC,4 + twnei reg_NL3, 0 /* Pass in the arguments */ @@ -334,18 +335,18 @@ x: lwz reg_A3,12(reg_CFP) /* Calculate LRA */ -#ifdef DARWIN +#ifdef LISP_FEATURE_DARWIN lis reg_LRA,ha16(lra) addi reg_LRA,reg_LRA,lo16(lra) #else lis reg_LRA,lra@h - addi reg_LRA,reg_LRA,lra@l + ori reg_LRA,reg_LRA,lra@l #endif addi reg_LRA,reg_LRA,OTHER_POINTER_LOWTAG /* 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 @@ -363,7 +364,6 @@ lra: mr REG(3),reg_A0 /* Turn on pseudo-atomic */ - li reg_NL3,-4 la reg_ALLOC,4(reg_ALLOC) /* Store lisp state */ @@ -380,9 +380,10 @@ lra: store(reg_NL1,reg_NL2,CSYMBOL(foreign_function_call_active)) /* Check for interrupt */ - add reg_ALLOC,reg_ALLOC,reg_NL3 - twlti reg_ALLOC,0 - + andi. reg_NL3, reg_ALLOC, 1 + subi reg_ALLOC, reg_ALLOC, 4 + twnei reg_NL3,0 + /* Back to C */ C_FULL_EPILOG blr @@ -411,7 +412,6 @@ lra: mr reg_NARGS,reg_NL3 /* Turn on pseudo-atomic */ - li reg_NL3,-4 la reg_ALLOC,4(reg_ALLOC) /* Convert the return address to an offset and save it on the stack. */ @@ -432,11 +432,13 @@ lra: store(reg_CSP,reg_CFUNC,CSYMBOL(foreign_function_call_active)) /* load(reg_POLL,saver2) */ /* Disable pseudo-atomic; check pending interrupt */ - add reg_ALLOC,reg_ALLOC,reg_NL3 - twlti reg_ALLOC,0 + andi. reg_NL3, reg_ALLOC, 1 + subi reg_ALLOC, reg_ALLOC, 4 + twnei reg_NL3, 0 + mr reg_NL3,reg_NARGS -#ifdef DARWIN +#ifdef LISP_FEATURE_DARWIN /* PowerOpen (i.e. OS X) requires the callee address in r12 (a.k.a. CFUNC), so move it back there, too. */ mfctr reg_CFUNC @@ -445,7 +447,7 @@ lra: bctrl /* Re-establish NIL */ -#ifdef DARWIN +#ifdef LISP_FEATURE_DARWIN lis reg_NULL,hi16(NIL) ori reg_NULL,reg_NULL,lo16(NIL) #else @@ -474,7 +476,7 @@ lra: li reg_LIP,0 /* Atomic ... */ - li reg_NL3,-4 + li reg_NL3,-4 li reg_ALLOC,4 /* No long in foreign function call. */ @@ -497,8 +499,10 @@ lra: la reg_LIP,-OTHER_POINTER_LOWTAG(reg_LIP) /* No longer atomic */ - add reg_ALLOC,reg_ALLOC,reg_NL3 - twlti reg_ALLOC,0 + andi. reg_NL3, reg_ALLOC, 1 + subi reg_ALLOC, reg_ALLOC, 4 + twnei reg_NL3, 0 + mtlr reg_LIP /* Reset the lisp stack. */ @@ -512,38 +516,40 @@ 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,24 - .long CSYMBOL(undefined_tramp) - .long NIL - .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) mtctr reg_LIP bctr - + mr reg_CSP,reg_CFP + b 1b + SET_SIZE(xundefined_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) @@ -552,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) @@ -578,3 +601,82 @@ CSYMBOL(closure_tramp): blr SET_SIZE(ppc_flush_cache_line) + GFUNCDEF(do_pending_interrupt) + twllei reg_ZERO, trap_PendingInterrupt + blr +/* King Nato's branch has a nop here. Do we need this? */ + SET_SIZE(do_pending_interrupt) + +#if defined LISP_FEATURE_GENCGC + + GFUNCDEF(fpu_save) + stfd FREG(1), 0(REG(3)) + stfd FREG(2), 8(REG(3)) + stfd FREG(3), 16(REG(3)) + stfd FREG(4), 24(REG(3)) + stfd FREG(5), 32(REG(3)) + stfd FREG(6), 40(REG(3)) + stfd FREG(7), 48(REG(3)) + stfd FREG(8), 56(REG(3)) + stfd FREG(9), 64(REG(3)) + stfd FREG(10), 72(REG(3)) + stfd FREG(11), 80(REG(3)) + stfd FREG(12), 88(REG(3)) + stfd FREG(13), 96(REG(3)) + stfd FREG(14), 104(REG(3)) + stfd FREG(15), 112(REG(3)) + stfd FREG(16), 120(REG(3)) + stfd FREG(17), 128(REG(3)) + stfd FREG(18), 136(REG(3)) + stfd FREG(19), 144(REG(3)) + stfd FREG(20), 152(REG(3)) + stfd FREG(21), 160(REG(3)) + stfd FREG(22), 168(REG(3)) + stfd FREG(23), 176(REG(3)) + stfd FREG(24), 184(REG(3)) + stfd FREG(25), 192(REG(3)) + stfd FREG(26), 200(REG(3)) + stfd FREG(27), 208(REG(3)) + stfd FREG(28), 216(REG(3)) + stfd FREG(29), 224(REG(3)) + stfd FREG(30), 232(REG(3)) + stfd FREG(31), 240(REG(3)) + blr + SET_SIZE(fpu_save) + + GFUNCDEF(fpu_restore) + lfd FREG(1), 0(REG(3)) + lfd FREG(2), 8(REG(3)) + lfd FREG(3), 16(REG(3)) + lfd FREG(4), 24(REG(3)) + lfd FREG(5), 32(REG(3)) + lfd FREG(6), 40(REG(3)) + lfd FREG(7), 48(REG(3)) + lfd FREG(8), 56(REG(3)) + lfd FREG(9), 64(REG(3)) + lfd FREG(10), 72(REG(3)) + lfd FREG(11), 80(REG(3)) + lfd FREG(12), 88(REG(3)) + lfd FREG(13), 96(REG(3)) + lfd FREG(14), 104(REG(3)) + lfd FREG(15), 112(REG(3)) + lfd FREG(16), 120(REG(3)) + lfd FREG(17), 128(REG(3)) + lfd FREG(18), 136(REG(3)) + lfd FREG(19), 144(REG(3)) + lfd FREG(20), 152(REG(3)) + lfd FREG(21), 160(REG(3)) + lfd FREG(22), 168(REG(3)) + lfd FREG(23), 176(REG(3)) + lfd FREG(24), 184(REG(3)) + lfd FREG(25), 192(REG(3)) + lfd FREG(26), 200(REG(3)) + lfd FREG(27), 208(REG(3)) + lfd FREG(28), 216(REG(3)) + lfd FREG(29), 224(REG(3)) + lfd FREG(30), 232(REG(3)) + lfd FREG(31), 240(REG(3)) + blr + SET_SIZE(fpu_restore) + +#endif