From e617b9eea9d45b170eabadf5ca96ca0536c538be Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 22 Jan 2016 00:02:21 +0000 Subject: move arm-specific translation units out of arch/arm/src, to src/*/arm this is possible with the new build system that allows src/*/$(ARCH)/* files which do not shadow a file in the parent directory, and yields a more logical organization. eventually it will be possible to remove arch/*/src from the build system. --- arch/arm/src/__aeabi_atexit.c | 6 -- arch/arm/src/__aeabi_memclr.c | 9 --- arch/arm/src/__aeabi_memcpy.c | 9 --- arch/arm/src/__aeabi_memmove.c | 9 --- arch/arm/src/__aeabi_memset.c | 9 --- arch/arm/src/__set_thread_area.c | 49 ---------------- arch/arm/src/atomics.s | 111 ------------------------------------- arch/arm/src/find_exidx.c | 42 -------------- src/exit/arm/__aeabi_atexit.c | 6 ++ src/ldso/arm/find_exidx.c | 42 ++++++++++++++ src/string/arm/__aeabi_memclr.c | 9 +++ src/string/arm/__aeabi_memcpy.c | 9 +++ src/string/arm/__aeabi_memmove.c | 9 +++ src/string/arm/__aeabi_memset.c | 9 +++ src/thread/arm/__set_thread_area.c | 49 ++++++++++++++++ src/thread/arm/__set_thread_area.s | 1 - src/thread/arm/atomics.s | 111 +++++++++++++++++++++++++++++++++++++ 17 files changed, 244 insertions(+), 245 deletions(-) delete mode 100644 arch/arm/src/__aeabi_atexit.c delete mode 100644 arch/arm/src/__aeabi_memclr.c delete mode 100644 arch/arm/src/__aeabi_memcpy.c delete mode 100644 arch/arm/src/__aeabi_memmove.c delete mode 100644 arch/arm/src/__aeabi_memset.c delete mode 100644 arch/arm/src/__set_thread_area.c delete mode 100644 arch/arm/src/atomics.s delete mode 100644 arch/arm/src/find_exidx.c create mode 100644 src/exit/arm/__aeabi_atexit.c create mode 100644 src/ldso/arm/find_exidx.c create mode 100644 src/string/arm/__aeabi_memclr.c create mode 100644 src/string/arm/__aeabi_memcpy.c create mode 100644 src/string/arm/__aeabi_memmove.c create mode 100644 src/string/arm/__aeabi_memset.c create mode 100644 src/thread/arm/__set_thread_area.c delete mode 100644 src/thread/arm/__set_thread_area.s create mode 100644 src/thread/arm/atomics.s diff --git a/arch/arm/src/__aeabi_atexit.c b/arch/arm/src/__aeabi_atexit.c deleted file mode 100644 index ce16101d..00000000 --- a/arch/arm/src/__aeabi_atexit.c +++ /dev/null @@ -1,6 +0,0 @@ -int __cxa_atexit(void (*func)(void *), void *arg, void *dso); - -int __aeabi_atexit (void *obj, void (*func) (void *), void *d) -{ - return __cxa_atexit (func, obj, d); -} diff --git a/arch/arm/src/__aeabi_memclr.c b/arch/arm/src/__aeabi_memclr.c deleted file mode 100644 index a25306d7..00000000 --- a/arch/arm/src/__aeabi_memclr.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "libc.h" - -void __aeabi_memclr(void *dest, size_t n) -{ - memset(dest, 0, n); -} -weak_alias(__aeabi_memclr, __aeabi_memclr4); -weak_alias(__aeabi_memclr, __aeabi_memclr8); diff --git a/arch/arm/src/__aeabi_memcpy.c b/arch/arm/src/__aeabi_memcpy.c deleted file mode 100644 index 4ae5c777..00000000 --- a/arch/arm/src/__aeabi_memcpy.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "libc.h" - -void __aeabi_memcpy(void *restrict dest, const void *restrict src, size_t n) -{ - memcpy(dest, src, n); -} -weak_alias(__aeabi_memcpy, __aeabi_memcpy4); -weak_alias(__aeabi_memcpy, __aeabi_memcpy8); diff --git a/arch/arm/src/__aeabi_memmove.c b/arch/arm/src/__aeabi_memmove.c deleted file mode 100644 index 951e7d39..00000000 --- a/arch/arm/src/__aeabi_memmove.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "libc.h" - -void __aeabi_memmove(void *dest, const void *src, size_t n) -{ - memmove(dest, src, n); -} -weak_alias(__aeabi_memmove, __aeabi_memmove4); -weak_alias(__aeabi_memmove, __aeabi_memmove8); diff --git a/arch/arm/src/__aeabi_memset.c b/arch/arm/src/__aeabi_memset.c deleted file mode 100644 index 89299757..00000000 --- a/arch/arm/src/__aeabi_memset.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "libc.h" - -void __aeabi_memset(void *dest, size_t n, int c) -{ - memset(dest, c, n); -} -weak_alias(__aeabi_memset, __aeabi_memset4); -weak_alias(__aeabi_memset, __aeabi_memset8); diff --git a/arch/arm/src/__set_thread_area.c b/arch/arm/src/__set_thread_area.c deleted file mode 100644 index 61d02827..00000000 --- a/arch/arm/src/__set_thread_area.c +++ /dev/null @@ -1,49 +0,0 @@ -#include -#include -#include "pthread_impl.h" -#include "libc.h" - -#define HWCAP_TLS (1 << 15) - -extern const unsigned char __attribute__((__visibility__("hidden"))) - __a_barrier_dummy[], __a_barrier_oldkuser[], - __a_barrier_v6[], __a_barrier_v7[], - __a_cas_dummy[], __a_cas_v6[], __a_cas_v7[], - __a_gettp_dummy[]; - -#define __a_barrier_kuser 0xffff0fa0 -#define __a_cas_kuser 0xffff0fc0 -#define __a_gettp_kuser 0xffff0fe0 - -extern uintptr_t __attribute__((__visibility__("hidden"))) - __a_barrier_ptr, __a_cas_ptr, __a_gettp_ptr; - -#define SET(op,ver) (__a_##op##_ptr = \ - (uintptr_t)__a_##op##_##ver - (uintptr_t)__a_##op##_dummy) - -int __set_thread_area(void *p) -{ -#if !__ARM_ARCH_7A__ && !__ARM_ARCH_7R__ && __ARM_ARCH < 7 - if (__hwcap & HWCAP_TLS) { - size_t *aux; - SET(cas, v7); - SET(barrier, v7); - for (aux=libc.auxv; *aux; aux+=2) { - if (*aux != AT_PLATFORM) continue; - const char *s = (void *)aux[1]; - if (s[0]!='v' || s[1]!='6' || s[2]-'0'<10u) break; - SET(cas, v6); - SET(barrier, v6); - break; - } - } else { - int ver = *(int *)0xffff0ffc; - SET(gettp, kuser); - SET(cas, kuser); - SET(barrier, kuser); - if (ver < 2) a_crash(); - if (ver < 3) SET(barrier, oldkuser); - } -#endif - return __syscall(0xf0005, p); -} diff --git a/arch/arm/src/atomics.s b/arch/arm/src/atomics.s deleted file mode 100644 index 5c5b0e3e..00000000 --- a/arch/arm/src/atomics.s +++ /dev/null @@ -1,111 +0,0 @@ -.syntax unified -.text - -.global __a_barrier -.hidden __a_barrier -.type __a_barrier,%function -__a_barrier: - ldr ip,1f - ldr ip,[pc,ip] - add pc,pc,ip -1: .word __a_barrier_ptr-1b -.global __a_barrier_dummy -.hidden __a_barrier_dummy -__a_barrier_dummy: - bx lr -.global __a_barrier_oldkuser -.hidden __a_barrier_oldkuser -__a_barrier_oldkuser: - push {r0,r1,r2,r3,ip,lr} - mov r1,r0 - mov r2,sp - ldr ip,=0xffff0fc0 - mov lr,pc - mov pc,ip - pop {r0,r1,r2,r3,ip,lr} - bx lr -.global __a_barrier_v6 -.hidden __a_barrier_v6 -__a_barrier_v6: - mcr p15,0,r0,c7,c10,5 - bx lr -.global __a_barrier_v7 -.hidden __a_barrier_v7 -__a_barrier_v7: - .word 0xf57ff05b /* dmb ish */ - bx lr - -.global __a_cas -.hidden __a_cas -.type __a_cas,%function -__a_cas: - ldr ip,1f - ldr ip,[pc,ip] - add pc,pc,ip -1: .word __a_cas_ptr-1b -.global __a_cas_dummy -.hidden __a_cas_dummy -__a_cas_dummy: - mov r3,r0 - ldr r0,[r2] - subs r0,r3,r0 - streq r1,[r2] - bx lr -.global __a_cas_v6 -.hidden __a_cas_v6 -__a_cas_v6: - mov r3,r0 - mcr p15,0,r0,c7,c10,5 -1: .word 0xe1920f9f /* ldrex r0,[r2] */ - subs r0,r3,r0 - .word 0x01820f91 /* strexeq r0,r1,[r2] */ - teqeq r0,#1 - beq 1b - mcr p15,0,r0,c7,c10,5 - bx lr -.global __a_cas_v7 -.hidden __a_cas_v7 -__a_cas_v7: - mov r3,r0 - .word 0xf57ff05b /* dmb ish */ -1: .word 0xe1920f9f /* ldrex r0,[r2] */ - subs r0,r3,r0 - .word 0x01820f91 /* strexeq r0,r1,[r2] */ - teqeq r0,#1 - beq 1b - .word 0xf57ff05b /* dmb ish */ - bx lr - -.global __aeabi_read_tp -.type __aeabi_read_tp,%function -__aeabi_read_tp: - -.global __a_gettp -.hidden __a_gettp -.type __a_gettp,%function -__a_gettp: - ldr r0,1f - ldr r0,[pc,r0] - add pc,pc,r0 -1: .word __a_gettp_ptr-1b -.global __a_gettp_dummy -.hidden __a_gettp_dummy -__a_gettp_dummy: - mrc p15,0,r0,c13,c0,3 - bx lr - -.data -.global __a_barrier_ptr -.hidden __a_barrier_ptr -__a_barrier_ptr: - .word 0 - -.global __a_cas_ptr -.hidden __a_cas_ptr -__a_cas_ptr: - .word 0 - -.global __a_gettp_ptr -.hidden __a_gettp_ptr -__a_gettp_ptr: - .word 0 diff --git a/arch/arm/src/find_exidx.c b/arch/arm/src/find_exidx.c deleted file mode 100644 index 77c4472b..00000000 --- a/arch/arm/src/find_exidx.c +++ /dev/null @@ -1,42 +0,0 @@ -#define _GNU_SOURCE -#include -#include - -struct find_exidx_data { - uintptr_t pc, exidx_start; - int exidx_len; -}; - -static int find_exidx(struct dl_phdr_info *info, size_t size, void *ptr) -{ - struct find_exidx_data *data = ptr; - const ElfW(Phdr) *phdr = info->dlpi_phdr; - uintptr_t addr, exidx_start = 0; - int i, match = 0, exidx_len = 0; - - for (i = info->dlpi_phnum; i > 0; i--, phdr++) { - addr = info->dlpi_addr + phdr->p_vaddr; - switch (phdr->p_type) { - case PT_LOAD: - match |= data->pc >= addr && data->pc < addr + phdr->p_memsz; - break; - case PT_ARM_EXIDX: - exidx_start = addr; - exidx_len = phdr->p_memsz; - break; - } - } - data->exidx_start = exidx_start; - data->exidx_len = exidx_len; - return match; -} - -uintptr_t __gnu_Unwind_Find_exidx(uintptr_t pc, int *pcount) -{ - struct find_exidx_data data; - data.pc = pc; - if (dl_iterate_phdr(find_exidx, &data) <= 0) - return 0; - *pcount = data.exidx_len / 8; - return data.exidx_start; -} diff --git a/src/exit/arm/__aeabi_atexit.c b/src/exit/arm/__aeabi_atexit.c new file mode 100644 index 00000000..ce16101d --- /dev/null +++ b/src/exit/arm/__aeabi_atexit.c @@ -0,0 +1,6 @@ +int __cxa_atexit(void (*func)(void *), void *arg, void *dso); + +int __aeabi_atexit (void *obj, void (*func) (void *), void *d) +{ + return __cxa_atexit (func, obj, d); +} diff --git a/src/ldso/arm/find_exidx.c b/src/ldso/arm/find_exidx.c new file mode 100644 index 00000000..77c4472b --- /dev/null +++ b/src/ldso/arm/find_exidx.c @@ -0,0 +1,42 @@ +#define _GNU_SOURCE +#include +#include + +struct find_exidx_data { + uintptr_t pc, exidx_start; + int exidx_len; +}; + +static int find_exidx(struct dl_phdr_info *info, size_t size, void *ptr) +{ + struct find_exidx_data *data = ptr; + const ElfW(Phdr) *phdr = info->dlpi_phdr; + uintptr_t addr, exidx_start = 0; + int i, match = 0, exidx_len = 0; + + for (i = info->dlpi_phnum; i > 0; i--, phdr++) { + addr = info->dlpi_addr + phdr->p_vaddr; + switch (phdr->p_type) { + case PT_LOAD: + match |= data->pc >= addr && data->pc < addr + phdr->p_memsz; + break; + case PT_ARM_EXIDX: + exidx_start = addr; + exidx_len = phdr->p_memsz; + break; + } + } + data->exidx_start = exidx_start; + data->exidx_len = exidx_len; + return match; +} + +uintptr_t __gnu_Unwind_Find_exidx(uintptr_t pc, int *pcount) +{ + struct find_exidx_data data; + data.pc = pc; + if (dl_iterate_phdr(find_exidx, &data) <= 0) + return 0; + *pcount = data.exidx_len / 8; + return data.exidx_start; +} diff --git a/src/string/arm/__aeabi_memclr.c b/src/string/arm/__aeabi_memclr.c new file mode 100644 index 00000000..a25306d7 --- /dev/null +++ b/src/string/arm/__aeabi_memclr.c @@ -0,0 +1,9 @@ +#include +#include "libc.h" + +void __aeabi_memclr(void *dest, size_t n) +{ + memset(dest, 0, n); +} +weak_alias(__aeabi_memclr, __aeabi_memclr4); +weak_alias(__aeabi_memclr, __aeabi_memclr8); diff --git a/src/string/arm/__aeabi_memcpy.c b/src/string/arm/__aeabi_memcpy.c new file mode 100644 index 00000000..4ae5c777 --- /dev/null +++ b/src/string/arm/__aeabi_memcpy.c @@ -0,0 +1,9 @@ +#include +#include "libc.h" + +void __aeabi_memcpy(void *restrict dest, const void *restrict src, size_t n) +{ + memcpy(dest, src, n); +} +weak_alias(__aeabi_memcpy, __aeabi_memcpy4); +weak_alias(__aeabi_memcpy, __aeabi_memcpy8); diff --git a/src/string/arm/__aeabi_memmove.c b/src/string/arm/__aeabi_memmove.c new file mode 100644 index 00000000..951e7d39 --- /dev/null +++ b/src/string/arm/__aeabi_memmove.c @@ -0,0 +1,9 @@ +#include +#include "libc.h" + +void __aeabi_memmove(void *dest, const void *src, size_t n) +{ + memmove(dest, src, n); +} +weak_alias(__aeabi_memmove, __aeabi_memmove4); +weak_alias(__aeabi_memmove, __aeabi_memmove8); diff --git a/src/string/arm/__aeabi_memset.c b/src/string/arm/__aeabi_memset.c new file mode 100644 index 00000000..89299757 --- /dev/null +++ b/src/string/arm/__aeabi_memset.c @@ -0,0 +1,9 @@ +#include +#include "libc.h" + +void __aeabi_memset(void *dest, size_t n, int c) +{ + memset(dest, c, n); +} +weak_alias(__aeabi_memset, __aeabi_memset4); +weak_alias(__aeabi_memset, __aeabi_memset8); diff --git a/src/thread/arm/__set_thread_area.c b/src/thread/arm/__set_thread_area.c new file mode 100644 index 00000000..61d02827 --- /dev/null +++ b/src/thread/arm/__set_thread_area.c @@ -0,0 +1,49 @@ +#include +#include +#include "pthread_impl.h" +#include "libc.h" + +#define HWCAP_TLS (1 << 15) + +extern const unsigned char __attribute__((__visibility__("hidden"))) + __a_barrier_dummy[], __a_barrier_oldkuser[], + __a_barrier_v6[], __a_barrier_v7[], + __a_cas_dummy[], __a_cas_v6[], __a_cas_v7[], + __a_gettp_dummy[]; + +#define __a_barrier_kuser 0xffff0fa0 +#define __a_cas_kuser 0xffff0fc0 +#define __a_gettp_kuser 0xffff0fe0 + +extern uintptr_t __attribute__((__visibility__("hidden"))) + __a_barrier_ptr, __a_cas_ptr, __a_gettp_ptr; + +#define SET(op,ver) (__a_##op##_ptr = \ + (uintptr_t)__a_##op##_##ver - (uintptr_t)__a_##op##_dummy) + +int __set_thread_area(void *p) +{ +#if !__ARM_ARCH_7A__ && !__ARM_ARCH_7R__ && __ARM_ARCH < 7 + if (__hwcap & HWCAP_TLS) { + size_t *aux; + SET(cas, v7); + SET(barrier, v7); + for (aux=libc.auxv; *aux; aux+=2) { + if (*aux != AT_PLATFORM) continue; + const char *s = (void *)aux[1]; + if (s[0]!='v' || s[1]!='6' || s[2]-'0'<10u) break; + SET(cas, v6); + SET(barrier, v6); + break; + } + } else { + int ver = *(int *)0xffff0ffc; + SET(gettp, kuser); + SET(cas, kuser); + SET(barrier, kuser); + if (ver < 2) a_crash(); + if (ver < 3) SET(barrier, oldkuser); + } +#endif + return __syscall(0xf0005, p); +} diff --git a/src/thread/arm/__set_thread_area.s b/src/thread/arm/__set_thread_area.s deleted file mode 100644 index 4a4cd0d8..00000000 --- a/src/thread/arm/__set_thread_area.s +++ /dev/null @@ -1 +0,0 @@ -/* Replaced by C code in arch/arm/src */ diff --git a/src/thread/arm/atomics.s b/src/thread/arm/atomics.s new file mode 100644 index 00000000..5c5b0e3e --- /dev/null +++ b/src/thread/arm/atomics.s @@ -0,0 +1,111 @@ +.syntax unified +.text + +.global __a_barrier +.hidden __a_barrier +.type __a_barrier,%function +__a_barrier: + ldr ip,1f + ldr ip,[pc,ip] + add pc,pc,ip +1: .word __a_barrier_ptr-1b +.global __a_barrier_dummy +.hidden __a_barrier_dummy +__a_barrier_dummy: + bx lr +.global __a_barrier_oldkuser +.hidden __a_barrier_oldkuser +__a_barrier_oldkuser: + push {r0,r1,r2,r3,ip,lr} + mov r1,r0 + mov r2,sp + ldr ip,=0xffff0fc0 + mov lr,pc + mov pc,ip + pop {r0,r1,r2,r3,ip,lr} + bx lr +.global __a_barrier_v6 +.hidden __a_barrier_v6 +__a_barrier_v6: + mcr p15,0,r0,c7,c10,5 + bx lr +.global __a_barrier_v7 +.hidden __a_barrier_v7 +__a_barrier_v7: + .word 0xf57ff05b /* dmb ish */ + bx lr + +.global __a_cas +.hidden __a_cas +.type __a_cas,%function +__a_cas: + ldr ip,1f + ldr ip,[pc,ip] + add pc,pc,ip +1: .word __a_cas_ptr-1b +.global __a_cas_dummy +.hidden __a_cas_dummy +__a_cas_dummy: + mov r3,r0 + ldr r0,[r2] + subs r0,r3,r0 + streq r1,[r2] + bx lr +.global __a_cas_v6 +.hidden __a_cas_v6 +__a_cas_v6: + mov r3,r0 + mcr p15,0,r0,c7,c10,5 +1: .word 0xe1920f9f /* ldrex r0,[r2] */ + subs r0,r3,r0 + .word 0x01820f91 /* strexeq r0,r1,[r2] */ + teqeq r0,#1 + beq 1b + mcr p15,0,r0,c7,c10,5 + bx lr +.global __a_cas_v7 +.hidden __a_cas_v7 +__a_cas_v7: + mov r3,r0 + .word 0xf57ff05b /* dmb ish */ +1: .word 0xe1920f9f /* ldrex r0,[r2] */ + subs r0,r3,r0 + .word 0x01820f91 /* strexeq r0,r1,[r2] */ + teqeq r0,#1 + beq 1b + .word 0xf57ff05b /* dmb ish */ + bx lr + +.global __aeabi_read_tp +.type __aeabi_read_tp,%function +__aeabi_read_tp: + +.global __a_gettp +.hidden __a_gettp +.type __a_gettp,%function +__a_gettp: + ldr r0,1f + ldr r0,[pc,r0] + add pc,pc,r0 +1: .word __a_gettp_ptr-1b +.global __a_gettp_dummy +.hidden __a_gettp_dummy +__a_gettp_dummy: + mrc p15,0,r0,c13,c0,3 + bx lr + +.data +.global __a_barrier_ptr +.hidden __a_barrier_ptr +__a_barrier_ptr: + .word 0 + +.global __a_cas_ptr +.hidden __a_cas_ptr +__a_cas_ptr: + .word 0 + +.global __a_gettp_ptr +.hidden __a_gettp_ptr +__a_gettp_ptr: + .word 0 -- cgit v1.2.1