From 9ca4e915baea6956c1cdb9e3a5ca420561286df5 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 28 May 2018 02:20:30 +0100 Subject: [PATCH] Add 64 bit byte swapping function --- src/core/bitmath_func.hpp | 19 +++++++++++++++++++ src/core/endian_func.hpp | 8 ++++++++ 2 files changed, 27 insertions(+) diff --git a/src/core/bitmath_func.hpp b/src/core/bitmath_func.hpp index 31e679b005..fdcb310b06 100644 --- a/src/core/bitmath_func.hpp +++ b/src/core/bitmath_func.hpp @@ -365,13 +365,32 @@ static inline T ROR(const T x, const uint8 n) * (since it will use hardware swapping if available). * Even though they should return uint16 and uint32, we get * warnings if we don't cast those (why?) */ + #define BSWAP64(x) ((uint32)CFSwapInt64(x)) #define BSWAP32(x) ((uint32)CFSwapInt32(x)) #define BSWAP16(x) ((uint16)CFSwapInt16(x)) #elif defined(_MSC_VER) /* MSVC has intrinsics for swapping, resulting in faster code */ + #define BSWAP64(x) (_byteswap_uint64(x)) #define BSWAP32(x) (_byteswap_ulong(x)) #define BSWAP16(x) (_byteswap_ushort(x)) #else + /** + * Perform a 64 bits endianness bitswap on x. + * @param x the variable to bitswap + * @return the bitswapped value. + */ + static inline uint64 BSWAP64(uint64 x) + { +#if !defined(__ICC) && (defined(__GNUC__) || defined(__clang__)) + /* GCC >= 4.3 provides a builtin, resulting in faster code */ + return (uint64)__builtin_bswap64((uint64)x); +#else + return ((x >> 56) & 0xFFULL) | ((x >> 40) & 0xFF00ULL) | ((x >> 24) & 0xFF0000ULL) | ((x >> 8) & 0xFF000000ULL) | + ((x << 8) & 0xFF00000000ULL) | ((x << 24) & 0xFF0000000000ULL) | ((x << 40) & 0xFF000000000000ULL) | ((x << 56) & 0xFF000000000000ULL); + ; +#endif /* __GNUC__ || __clang__ */ + } + /** * Perform a 32 bits endianness bitswap on x. * @param x the variable to bitswap diff --git a/src/core/endian_func.hpp b/src/core/endian_func.hpp index ab5b181500..48060bd1ad 100644 --- a/src/core/endian_func.hpp +++ b/src/core/endian_func.hpp @@ -19,25 +19,33 @@ #if TTD_ENDIAN == TTD_BIG_ENDIAN #define FROM_BE16(x) (x) #define FROM_BE32(x) (x) + #define FROM_BE64(x) (x) #define TO_BE16(x) (x) #define TO_BE32(x) (x) #define TO_BE32X(x) (x) + #define TO_BE64(x) (x) #define FROM_LE16(x) BSWAP16(x) #define FROM_LE32(x) BSWAP32(x) + #define FROM_LE64(x) BSWAP64(x) #define TO_LE16(x) BSWAP16(x) #define TO_LE32(x) BSWAP32(x) #define TO_LE32X(x) BSWAP32(x) + #define TO_LE64(x) BSWAP64(x) #else #define FROM_BE16(x) BSWAP16(x) #define FROM_BE32(x) BSWAP32(x) + #define FROM_BE64(x) BSWAP64(x) #define TO_BE16(x) BSWAP16(x) #define TO_BE32(x) BSWAP32(x) #define TO_BE32X(x) BSWAP32(x) + #define TO_BE64(x) BSWAP64(x) #define FROM_LE16(x) (x) #define FROM_LE32(x) (x) + #define FROM_LE64(x) (x) #define TO_LE16(x) (x) #define TO_LE32(x) (x) #define TO_LE32X(x) (x) + #define TO_LE64(x) (x) #endif /* TTD_ENDIAN == TTD_BIG_ENDIAN */ static inline uint16 ReadLE16Aligned(const void *x)