TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix the INTEL_*() byte swapping functions

Browse source 
This fixes a regression from 6e96ff3e00
where WORDS_BIGENDIAN somehow was confused with WORDS_NEED_ALIGNMENT,
so that setting WORDS_NEED_ALIGNMENT resulted in assuming a big endian
machine. This completely broke the RPi build, which is little endian.

Fixes: 6e96ff3e00 ("Fix ambiguous use of INTEL_SHORT/INTEL_INT")
[Kp: added Fixes tag.]
This commit is contained in:
derhass 2015-04-05 16:48:31 +02:00 committed by Kp
parent ba39d232e7
commit e00b318bee
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/include/byteutil.h
View file

@ -61,14 +61,18 @@ static inline int32_t SWAPINT(const int32_t &i)
#define SWAPINT64(x) ((((x) & 0xff00000000000000LL)/(2^56)) | (((x) & 0x00ff000000000000LL)/(2^40)) | (((x) & 0x0000ff0000000000LL)/(2^24)) | (((x) & 0x000000ff00000000LL)/(2^8)) | (((x) & 0x00000000ff000000LL)*(2^8)) | (((x) & 0x0000000000ff0000LL)*(2^24)) | (((x) & 0x000000000000ff00LL)*(2^40)) | (((x) & 0x00000000000000ffLL)*(2^56)))
#endif
#ifndef WORDS_NEED_ALIGNMENT
#ifndef WORDS_BIGENDIAN
/* Always resolve F(a), so ambiguous calls are flagged even on little
* endian.
*/
#define byteutil_choose_endian(F,a) (static_cast<void>(static_cast<decltype(F(a))>(0)), a)
#else // ! WORDS_BIGENDIAN
#define byteutil_choose_endian(F,a) (F(a))
#endif // ! WORDS_BIGENDIAN
#ifndef WORDS_NEED_ALIGNMENT
#define byteutil_unaligned_copy(dt, d, s) (static_cast<dt &>(d) = *reinterpret_cast<const dt *>(s))
#else // ! WORDS_NEED_ALIGNMENT
#define byteutil_choose_endian(F,a) (F(a))
#define byteutil_unaligned_copy(dt, d, s) memcpy(&static_cast<dt &>(d), reinterpret_cast<const uint8_t *>(s), sizeof(d))
#endif // ! WORDS_NEED_ALIGNMENT