diff options
| author | Walter Lee <walt@tilera.com> | 2014-01-25 20:34:42 +0000 |
|---|---|---|
| committer | Walter Lee <walt@gcc.gnu.org> | 2014-01-25 20:34:42 +0000 |
| commit | 4d6d3bc532e4b1b43f2a57aff835c416b462200d (patch) | |
| tree | bba32f344440956223bb4a7466b46da1d1dc6adf /libgcc | |
| parent | cbd9890e93bc95ef213702cb65c65836dfea2381 (diff) | |
atomic.c (BIT_OFFSET): Define.
2014-01-25 Walter Lee <walt@tilera.com>
* config/tilepro/atomic.c (BIT_OFFSET): Define.
(__atomic_subword_cmpxchg): Use BIT_OFFSET.
(__atomic_subword): Ditto.
From-SVN: r207086
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 6 | ||||
| -rw-r--r-- | libgcc/config/tilepro/atomic.c | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 9ea34c01615..e01d2fbd5ee 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,5 +1,11 @@ 2014-01-25 Walter Lee <walt@tilera.com> + * config/tilepro/atomic.c (BIT_OFFSET): Define. + (__atomic_subword_cmpxchg): Use BIT_OFFSET. + (__atomic_subword): Ditto. + +2014-01-25 Walter Lee <walt@tilera.com> + * config/tilepro/atomic.c (__atomic_do_and_fetch): Add a prefix op argument. (__atomic_nand_fetch_4): Add prefix op. diff --git a/libgcc/config/tilepro/atomic.c b/libgcc/config/tilepro/atomic.c index 99193237d36..2ad114a06d5 100644 --- a/libgcc/config/tilepro/atomic.c +++ b/libgcc/config/tilepro/atomic.c @@ -135,6 +135,12 @@ __atomic_exchange_##size(volatile type* ptr, type val, int model) \ __atomic_exchange_methods (int, 4) __atomic_exchange_methods (long long, 8) +#ifdef __LITTLE_ENDIAN__ +#define BIT_OFFSET(n, type) ((n) * 8) +#else +#define BIT_OFFSET(n, type) ((4 - sizeof(type) - (n)) * 8) +#endif + /* Subword methods require the same approach for both TILEPro and TILE-Gx. We load the background data for the word, insert the desired subword piece, then compare-and-exchange it into place. */ @@ -150,7 +156,7 @@ __atomic_compare_exchange_##size(volatile type* ptr, type* guess, \ { \ pre_atomic_barrier(models); \ unsigned int *p = (unsigned int *)((unsigned long)ptr & ~3UL); \ - const int shift = ((unsigned long)ptr & 3UL) * 8; \ + const int shift = BIT_OFFSET((unsigned long)ptr & 3UL, type); \ const unsigned int valmask = (1 << (sizeof(type) * 8)) - 1; \ const unsigned int bgmask = ~(valmask << shift); \ unsigned int oldword = *p; \ @@ -177,7 +183,7 @@ proto \ { \ top \ unsigned int *p = (unsigned int *)((unsigned long)ptr & ~3UL); \ - const int shift = ((unsigned long)ptr & 3UL) * 8; \ + const int shift = BIT_OFFSET((unsigned long)ptr & 3UL, type); \ const unsigned int valmask = (1 << (sizeof(type) * 8)) - 1; \ const unsigned int bgmask = ~(valmask << shift); \ unsigned int oldword, xword = *p; \ |