diff options
author | Rich Felker <dalias@aerifal.cx> | 2016-01-21 19:08:54 +0000 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2016-01-21 19:08:54 +0000 |
commit | 1315596b510189b5159e742110b504177bdd4932 (patch) | |
tree | 27159b7b95b944671454b11f36ee13308241f4b5 /arch/sh | |
parent | ce3e24eaae91e7a90f87eb7f1edea8df5942de11 (diff) | |
download | musl-1315596b510189b5159e742110b504177bdd4932.zip musl-1315596b510189b5159e742110b504177bdd4932.tar.gz musl-1315596b510189b5159e742110b504177bdd4932.tar.bz2 |
refactor internal atomic.h
rather than having each arch provide its own atomic.h, there is a new
shared atomic.h in src/internal which pulls arch-specific definitions
from arc/$(ARCH)/atomic_arch.h. the latter can be extremely minimal,
defining only a_cas or new ll/sc type primitives which the shared
atomic.h will use to construct everything else.
this commit avoids making heavy changes to the individual archs'
atomic implementations. definitions which are identical or
near-identical to what the new shared atomic.h would produce have been
removed, but otherwise the changes made are just hooking up the
arch-specific files to the new infrastructure. major changes to take
advantage of the new system will come in subsequent commits.
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/atomic_arch.h (renamed from arch/sh/atomic.h) | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/arch/sh/atomic.h b/arch/sh/atomic_arch.h index f2e6dac..2ac7724 100644 --- a/arch/sh/atomic.h +++ b/arch/sh/atomic_arch.h @@ -1,27 +1,3 @@ -#ifndef _INTERNAL_ATOMIC_H -#define _INTERNAL_ATOMIC_H - -#include <stdint.h> - -static inline int a_ctz_l(unsigned long x) -{ - static const char debruijn32[32] = { - 0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13, - 31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14 - }; - return debruijn32[(x&-x)*0x076be629 >> 27]; -} - -static inline int a_ctz_64(uint64_t x) -{ - uint32_t y = x; - if (!y) { - y = x>>32; - return 32 + a_ctz_l(y); - } - return a_ctz_l(y); -} - #define LLSC_CLOBBERS "r0", "t", "memory" #define LLSC_START(mem) "synco\n" \ "0: movli.l @" mem ", r0\n" @@ -118,51 +94,3 @@ void __sh_or(volatile int *, int); #define a_and(x,v) __sh_and(x, v) #define a_or(x,v) __sh_or(x, v) #endif - -static inline void *a_cas_p(volatile void *p, void *t, void *s) -{ - return (void *)a_cas(p, (int)t, (int)s); -} - -static inline void a_inc(volatile int *x) -{ - a_fetch_add(x, 1); -} - -static inline void a_dec(volatile int *x) -{ - a_fetch_add(x, -1); -} - -#define a_spin a_barrier - -static inline void a_barrier() -{ - a_cas(&(int){0}, 0, 0); -} - -static inline void a_crash() -{ - *(volatile char *)0=0; -} - -static inline void a_or_l(volatile void *p, long v) -{ - a_or(p, v); -} - -static inline void a_and_64(volatile uint64_t *p, uint64_t v) -{ - union { uint64_t v; uint32_t r[2]; } u = { v }; - a_and((int *)p, u.r[0]); - a_and((int *)p+1, u.r[1]); -} - -static inline void a_or_64(volatile uint64_t *p, uint64_t v) -{ - union { uint64_t v; uint32_t r[2]; } u = { v }; - a_or((int *)p, u.r[0]); - a_or((int *)p+1, u.r[1]); -} - -#endif |