From: Walter Lee Date: Sat, 25 Jan 2014 22:48:44 +0000 (+0000) Subject: backport: atomic.c (BIT_OFFSET): Define. X-Git-Tag: releases/gcc-4.7.4~289 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9221c11fb2ca9ff93cc3ba0ebaef5f45781ccc3c;p=thirdparty%2Fgcc.git backport: atomic.c (BIT_OFFSET): Define. 2014-01-25 Walter Lee Backport from mainline 2014-01-25 Walter Lee * config/tilepro/atomic.c (BIT_OFFSET): Define. (__atomic_subword_cmpxchg): Use BIT_OFFSET. (__atomic_subword): Ditto. From-SVN: r207106 --- diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index fe85a23ba120..f5db8569544a 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,12 @@ +2014-01-25 Walter Lee + + Backport from mainline + 2014-01-25 Walter Lee + + * config/tilepro/atomic.c (BIT_OFFSET): Define. + (__atomic_subword_cmpxchg): Use BIT_OFFSET. + (__atomic_subword): Ditto. + 2014-01-25 Walter Lee Backport from mainline diff --git a/libgcc/config/tilepro/atomic.c b/libgcc/config/tilepro/atomic.c index 3e1edd3946a4..7188962ae778 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; \