From 1c8eb8bad791fe9d01d0d4ab77882db634fa933d Mon Sep 17 00:00:00 2001 From: rofl0r Date: Fri, 9 Nov 2012 23:36:55 +0100 Subject: PPC port cleaned up, static linking works well now. --- src/thread/powerpc/__set_thread_area.s | 11 +++++ src/thread/powerpc/__unmapself.s | 9 ++++ src/thread/powerpc/clone.s | 83 ++++++++++++++++++++++++++++++++++ src/thread/powerpc/syscall_cp.s | 51 +++++++++++++++++++++ src/thread/ppc/__unmapself.S | 11 ----- 5 files changed, 154 insertions(+), 11 deletions(-) create mode 100644 src/thread/powerpc/__set_thread_area.s create mode 100644 src/thread/powerpc/__unmapself.s create mode 100644 src/thread/powerpc/clone.s create mode 100644 src/thread/powerpc/syscall_cp.s delete mode 100644 src/thread/ppc/__unmapself.S (limited to 'src/thread') diff --git a/src/thread/powerpc/__set_thread_area.s b/src/thread/powerpc/__set_thread_area.s new file mode 100644 index 00000000..c1a34c1f --- /dev/null +++ b/src/thread/powerpc/__set_thread_area.s @@ -0,0 +1,11 @@ +.text +.global __set_thread_area +.type __set_thread_area, %function +__set_thread_area: + # mov pointer in reg3 into r2 + mr 2, 3 + # put 0 into return reg + li 3, 0 + # return + blr + diff --git a/src/thread/powerpc/__unmapself.s b/src/thread/powerpc/__unmapself.s new file mode 100644 index 00000000..bb3724e3 --- /dev/null +++ b/src/thread/powerpc/__unmapself.s @@ -0,0 +1,9 @@ + .text + .global __unmapself + .type __unmapself,%function +__unmapself: + li 0, 91 # __NR_munmap + sc + li 0, 1 #__NR_exit + sc + blr diff --git a/src/thread/powerpc/clone.s b/src/thread/powerpc/clone.s new file mode 100644 index 00000000..cea69e99 --- /dev/null +++ b/src/thread/powerpc/clone.s @@ -0,0 +1,83 @@ +.text +.global __clone +.type __clone, %function +__clone: +# int clone(fn, stack, flags, arg, ptid, tls, ctid) +# a b c d e f g +# 3 4 5 6 7 8 9 +# pseudo C code: +# tid = syscall(SYS_clone,c,b,e,f,g); +# if (!tid) syscall(SYS_exit, a(d)); +# return tid; + +# SYS_clone = 120 +# SYS_exit = 1 + +# in order that the child can find the start func and its arg, we need to store it into +# non-volative regs. to do so, we have to store those 2 regs into our stackframe, so +# we can restore them later. +stw 30, -4(1) +stw 31, -8(1) +subi 1, 1, 16 + +# save r3 (func) into r30, and r6(arg) into r31 +mr 30, 3 +mr 31, 6 + +#move c into first arg +mr 3, 5 +#mr 4, 4 +mr 5, 7 +mr 6, 8 +mr 7, 9 + +# move syscall number into r0 +li 0, 120 + +sc + +# check for syscall error +#this code should be more efficient, but it borks +#bns+ 1f # jump to label 1 if no summary overflow. +#else +#neg 3, 3 #negate the result (errno) +#b 2f # jump to epilogue + +# this error check code at least does not spoil the clone call. +#mfcr 0 # Check for an error +#rlwinm 4, 0, 0, 3, 3 # by checking for bit 28. +#cmplwi 0, 4, 0 # It is an error if non-zero. +#beq 0, 1f # Jump if not an error. +#neg 3, 3 # Negate the error number. +#b 2f # jump to epilogue +1: +# compare sc result with 0 +cmpwi cr7, 3, 0 + +# if not 0, jump to end +bne cr7, 2f + +#else: we're the child +#call funcptr +# move arg (d) into r3 +mr 3, 31 +#move r30 (funcptr) into CTR reg +mtctr 30 +# call CTR reg +bctrl +# mov SYS_exit into r0 (the exit param is already in r3) +li 0, 1 +sc + +2: + +# restore stack +addi 1, 1, 16 +lwz 30, -4(1) +lwz 31, -8(1) + +blr + + + + diff --git a/src/thread/powerpc/syscall_cp.s b/src/thread/powerpc/syscall_cp.s new file mode 100644 index 00000000..2c97ca04 --- /dev/null +++ b/src/thread/powerpc/syscall_cp.s @@ -0,0 +1,51 @@ +#r0: volatile. may be modified during linkage. +#r1: stack frame: 16 byte alignment. +#r2: tls/thread pointer on pp32 +#r3,r4: return values, first args +#r5-r10: args +#r11-r12: volatile. may be modified during linkage +#r13: "small data area" pointer +#r14 - r30: local vars +#r31: local or environment pointer + +#r1, r14-31: belong to the caller, must be saved and restored +#r0, r3-r12, ctr, xer: volatile, not preserved +#r0,r11,r12: may be altered by cross-module call, +#"a func cannot depend on that these regs have the values placed by the caller" + +#the fields CR2,CR2,CR4 of the cond reg must be preserved +#LR (link reg) shall contain the funcs return address + .text + .global __syscall_cp_asm + .type __syscall_cp_asm,%function +__syscall_cp_asm: + # at enter: r3 = pointer to self->cancel, r4: syscall no, r5: first arg, r6: 2nd, r7: 3rd, r8: 4th, r9: 5th, r10: 6th + .global __cp_begin +__cp_begin: + # r3 holds first argument, its a pointer to self->cancel. + # we must compare the dereferenced value with 0 and jump to __cancel if its not + + lwz 0, 0(3) #deref pointer into r0 + + cmpwi cr7, 0, 0 #compare r0 with 0, store result in cr7. + beq+ cr7, 1f #jump to label 1 if r0 was 0 + + b __cancel #else call cancel + # (the return address is not needed, since __cancel never returns) +1: + #ok, the cancel flag was not set + # syscall: number goes to r0, the rest 3-8 + mr 0, 4 # put the system call number into r0 + mr 3, 5 # Shift the arguments: arg1 + mr 4, 6 # arg2 + mr 5, 7 # arg3 + mr 6, 8 # arg4 + mr 7, 9 # arg5 + mr 8, 10 # arg6 + sc + .global __cp_end +__cp_end: + bnslr+ # return if no summary overflow. + #else negate result. + neg 3, 3 + blr diff --git a/src/thread/ppc/__unmapself.S b/src/thread/ppc/__unmapself.S deleted file mode 100644 index e14663e7..00000000 --- a/src/thread/ppc/__unmapself.S +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include - .text - .global __unmapself - .type __unmapself,%function -__unmapself: - li r0, __NR_munmap - sc - li r0, __NR_exit - sc - blr -- cgit v1.2.1