From aacd348637e38795dd7ae3c7c8c908d8c0cd24fd Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 27 Feb 2014 22:03:25 -0500 Subject: rename superh port to "sh" for consistency linux, gcc, etc. all use "sh" as the name for the superh arch. there was already some inconsistency internally in musl: the dynamic linker was searching for "ld-musl-sh.path" as its path file despite its own name being "ld-musl-superh.so.1". there was some sentiment in both directions as to how to resolve the inconsistency, but overall "sh" was favored. --- src/thread/sh/__set_thread_area.s | 5 ++++ src/thread/sh/__unmapself.s | 22 ++++++++++++++++ src/thread/sh/clone.s | 47 +++++++++++++++++++++++++++++++++++ src/thread/sh/syscall_cp.s | 39 +++++++++++++++++++++++++++++ src/thread/superh/__set_thread_area.s | 5 ---- src/thread/superh/__unmapself.s | 22 ---------------- src/thread/superh/clone.s | 47 ----------------------------------- src/thread/superh/syscall_cp.s | 39 ----------------------------- 8 files changed, 113 insertions(+), 113 deletions(-) create mode 100644 src/thread/sh/__set_thread_area.s create mode 100644 src/thread/sh/__unmapself.s create mode 100644 src/thread/sh/clone.s create mode 100644 src/thread/sh/syscall_cp.s delete mode 100644 src/thread/superh/__set_thread_area.s delete mode 100644 src/thread/superh/__unmapself.s delete mode 100644 src/thread/superh/clone.s delete mode 100644 src/thread/superh/syscall_cp.s (limited to 'src/thread') diff --git a/src/thread/sh/__set_thread_area.s b/src/thread/sh/__set_thread_area.s new file mode 100644 index 00000000..53887e64 --- /dev/null +++ b/src/thread/sh/__set_thread_area.s @@ -0,0 +1,5 @@ +.global __set_thread_area +.type __set_thread_area, @function +__set_thread_area: + rts + ldc r4, gbr diff --git a/src/thread/sh/__unmapself.s b/src/thread/sh/__unmapself.s new file mode 100644 index 00000000..b34c3c80 --- /dev/null +++ b/src/thread/sh/__unmapself.s @@ -0,0 +1,22 @@ +.text +.global __unmapself +.type __unmapself, @function +__unmapself: + mov #91, r3 ! SYS_munmap + trapa #18 + + or r0, r0 + or r0, r0 + or r0, r0 + or r0, r0 + or r0, r0 + + mov #1, r3 ! SYS_exit + mov #0, r4 + trapa #17 + + or r0, r0 + or r0, r0 + or r0, r0 + or r0, r0 + or r0, r0 diff --git a/src/thread/sh/clone.s b/src/thread/sh/clone.s new file mode 100644 index 00000000..d6c9184d --- /dev/null +++ b/src/thread/sh/clone.s @@ -0,0 +1,47 @@ +.text +.global __clone +.type __clone, @function +__clone: +! incoming: fn stack flags arg ptid tls ctid +! r4 r5 r6 r7 @r15 @(4,r15) @(8,r15) + + mov #-16, r0 + and r0, r5 + + mov r4, r1 ! r1 = fn + mov r7, r2 ! r2 = arg + + mov #120, r3 ! r3 = __NR_clone + mov r6, r4 ! r4 = flags + !mov r5, r5 ! r5 = stack + mov.l @r15, r6 ! r6 = ptid + mov.l @(8,r15), r7 ! r7 = ctid + mov.l @(4,r15), r0 ! r0 = tls + trapa #21 + + or r0, r0 + or r0, r0 + or r0, r0 + or r0, r0 + or r0, r0 + + cmp/eq #0, r0 + bt 1f + + ! we are the parent, return + rts + nop + +1: ! we are the child, call fn(arg) + jsr @r1 + mov r2, r4 + + mov #1, r3 ! __NR_exit + mov r0, r4 + trapa #17 + + or r0, r0 + or r0, r0 + or r0, r0 + or r0, r0 + or r0, r0 diff --git a/src/thread/sh/syscall_cp.s b/src/thread/sh/syscall_cp.s new file mode 100644 index 00000000..5677b9c0 --- /dev/null +++ b/src/thread/sh/syscall_cp.s @@ -0,0 +1,39 @@ +.text +.global __syscall_cp_asm +.type __syscall_cp_asm, @function +__syscall_cp_asm: + +.global __cp_begin +__cp_begin: + mov.l @r4, r4 + tst r4, r4 + bt 2f + + mov.l L1, r0 + braf r0 + nop +1: + +.align 2 +L1: .long __cancel@PLT-(1b-.) + +2: mov r5, r3 + mov r6, r4 + mov r7, r5 + mov.l @r15, r6 + mov.l @(4,r15), r7 + mov.l @(8,r15), r0 + mov.l @(12,r15), r1 + trapa #22 + +.global __cp_end +__cp_end: + ! work around hardware bug + or r0, r0 + or r0, r0 + or r0, r0 + or r0, r0 + or r0, r0 + + rts + nop diff --git a/src/thread/superh/__set_thread_area.s b/src/thread/superh/__set_thread_area.s deleted file mode 100644 index 53887e64..00000000 --- a/src/thread/superh/__set_thread_area.s +++ /dev/null @@ -1,5 +0,0 @@ -.global __set_thread_area -.type __set_thread_area, @function -__set_thread_area: - rts - ldc r4, gbr diff --git a/src/thread/superh/__unmapself.s b/src/thread/superh/__unmapself.s deleted file mode 100644 index b34c3c80..00000000 --- a/src/thread/superh/__unmapself.s +++ /dev/null @@ -1,22 +0,0 @@ -.text -.global __unmapself -.type __unmapself, @function -__unmapself: - mov #91, r3 ! SYS_munmap - trapa #18 - - or r0, r0 - or r0, r0 - or r0, r0 - or r0, r0 - or r0, r0 - - mov #1, r3 ! SYS_exit - mov #0, r4 - trapa #17 - - or r0, r0 - or r0, r0 - or r0, r0 - or r0, r0 - or r0, r0 diff --git a/src/thread/superh/clone.s b/src/thread/superh/clone.s deleted file mode 100644 index d6c9184d..00000000 --- a/src/thread/superh/clone.s +++ /dev/null @@ -1,47 +0,0 @@ -.text -.global __clone -.type __clone, @function -__clone: -! incoming: fn stack flags arg ptid tls ctid -! r4 r5 r6 r7 @r15 @(4,r15) @(8,r15) - - mov #-16, r0 - and r0, r5 - - mov r4, r1 ! r1 = fn - mov r7, r2 ! r2 = arg - - mov #120, r3 ! r3 = __NR_clone - mov r6, r4 ! r4 = flags - !mov r5, r5 ! r5 = stack - mov.l @r15, r6 ! r6 = ptid - mov.l @(8,r15), r7 ! r7 = ctid - mov.l @(4,r15), r0 ! r0 = tls - trapa #21 - - or r0, r0 - or r0, r0 - or r0, r0 - or r0, r0 - or r0, r0 - - cmp/eq #0, r0 - bt 1f - - ! we are the parent, return - rts - nop - -1: ! we are the child, call fn(arg) - jsr @r1 - mov r2, r4 - - mov #1, r3 ! __NR_exit - mov r0, r4 - trapa #17 - - or r0, r0 - or r0, r0 - or r0, r0 - or r0, r0 - or r0, r0 diff --git a/src/thread/superh/syscall_cp.s b/src/thread/superh/syscall_cp.s deleted file mode 100644 index 5677b9c0..00000000 --- a/src/thread/superh/syscall_cp.s +++ /dev/null @@ -1,39 +0,0 @@ -.text -.global __syscall_cp_asm -.type __syscall_cp_asm, @function -__syscall_cp_asm: - -.global __cp_begin -__cp_begin: - mov.l @r4, r4 - tst r4, r4 - bt 2f - - mov.l L1, r0 - braf r0 - nop -1: - -.align 2 -L1: .long __cancel@PLT-(1b-.) - -2: mov r5, r3 - mov r6, r4 - mov r7, r5 - mov.l @r15, r6 - mov.l @(4,r15), r7 - mov.l @(8,r15), r0 - mov.l @(12,r15), r1 - trapa #22 - -.global __cp_end -__cp_end: - ! work around hardware bug - or r0, r0 - or r0, r0 - or r0, r0 - or r0, r0 - or r0, r0 - - rts - nop -- cgit v1.2.1