From 25f73d62079b63e4420fd037ad9460004179b026 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Tue, 26 Aug 2014 15:53:49 -0400 Subject: Patch up rbendian.h for Win32 cross-compile MingW doesn't provide that stuff. Change-Id: Ifa8310ed00f4f79f06adb71db71e58b70e7d2b60 --- firmware/include/rbendian.h | 65 ++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/firmware/include/rbendian.h b/firmware/include/rbendian.h index 21d3cae68d..861db7d082 100644 --- a/firmware/include/rbendian.h +++ b/firmware/include/rbendian.h @@ -22,7 +22,10 @@ #define _RBENDIAN_H_ #include "config.h" + +#ifndef __MINGW32__ #include +#endif /* clear these out since we redefine them to be truely constant compatible */ #undef swap16 @@ -42,6 +45,34 @@ #undef htobe32 #undef htobe64 +/* static/generic endianness conversion */ +#define SWAP16_CONST(x) \ + ((typeof(x))( ((uint16_t)(x) >> 8) | ((uint16_t)(x) << 8) )) + +#define SWAP32_CONST(x) \ + ((typeof(x))( (((uint32_t)(x) & 0xff000000) >> 24) | \ + (((uint32_t)(x) & 0x00ff0000) >> 8) | \ + (((uint32_t)(x) & 0x0000ff00) << 8) | \ + (((uint32_t)(x) & 0x000000ff) << 24) )) + +#define SWAP64_CONST(x) \ + ((typeof(x))( (((uint64_t)(x) & 0xff00000000000000ull) >> 56) | \ + (((uint64_t)(x) & 0x00ff000000000000ull) >> 40) | \ + (((uint64_t)(x) & 0x0000ff0000000000ull) >> 24) | \ + (((uint64_t)(x) & 0x000000ff00000000ull) >> 8) | \ + (((uint64_t)(x) & 0x00000000ff000000ull) << 8) | \ + (((uint64_t)(x) & 0x0000000000ff0000ull) << 24) | \ + (((uint64_t)(x) & 0x000000000000ff00ull) << 40) | \ + (((uint64_t)(x) & 0x00000000000000ffull) << 56) )) + +#define SWAP_ODD_EVEN32_CONST(x) \ + ((typeof(x))( ((uint32_t)SWAP16_CONST((uint32_t)(x) >> 16) << 16) | \ + SWAP16_CONST((uint32_t)(x))) ) + +#define SWAW32_CONST(x) \ + ((typeof(x))( ((uint32_t)(x) << 16) | ((uint32_t)(x) >> 16) )) + + #ifndef __ENDIAN_H_NATIVE_RB #if defined (__bswap_16) @@ -52,11 +83,16 @@ #define __swap16_os(x) __swap16(x) #define __swap32_os(x) __swap32(x) #define __swap64_os(x) __swap64(x) +#elif defined (__MINGW32__) + /* kinda hacky but works */ + #define __swap16_os(x) SWAP16_CONST(x) + #define __swap32_os(x) SWAP32_CONST(x) + #define __swap64_os(x) SWAP64_CONST(x) #else #error "Missing OS swap defines." #endif -/* wrap these because they aren't compatible with compound initializers */ +/* wrap these because they aren't always compatible with compound initializers */ static FORCE_INLINE uint16_t swap16_hw(uint16_t x) { return __swap16_os(x); } static FORCE_INLINE uint32_t swap32_hw(uint32_t x) @@ -88,33 +124,6 @@ static inline uint32_t swaw32_hw(uint32_t value) } #endif /* Generic */ -/* static endianness conversion */ -#define SWAP16_CONST(x) \ - ((typeof(x))( ((uint16_t)(x) >> 8) | ((uint16_t)(x) << 8) )) - -#define SWAP32_CONST(x) \ - ((typeof(x))( (((uint32_t)(x) & 0xff000000) >> 24) | \ - (((uint32_t)(x) & 0x00ff0000) >> 8) | \ - (((uint32_t)(x) & 0x0000ff00) << 8) | \ - (((uint32_t)(x) & 0x000000ff) << 24) )) - -#define SWAP64_CONST(x) \ - ((typeof(x))( (((uint64_t)(x) & 0xff00000000000000ull) >> 56) | \ - (((uint64_t)(x) & 0x00ff000000000000ull) >> 40) | \ - (((uint64_t)(x) & 0x0000ff0000000000ull) >> 24) | \ - (((uint64_t)(x) & 0x000000ff00000000ull) >> 8) | \ - (((uint64_t)(x) & 0x00000000ff000000ull) << 8) | \ - (((uint64_t)(x) & 0x0000000000ff0000ull) << 24) | \ - (((uint64_t)(x) & 0x000000000000ff00ull) << 40) | \ - (((uint64_t)(x) & 0x00000000000000ffull) << 56) )) - -#define SWAP_ODD_EVEN32_CONST(x) \ - ((typeof(x))( ((uint32_t)SWAP16_CONST((uint32_t)(x) >> 16) << 16) | \ - SWAP16_CONST((uint32_t)(x))) ) - -#define SWAW32_CONST(x) \ - ((typeof(x))( ((uint32_t)(x) << 16) | ((uint32_t)(x) >> 16) )) - /* select best method based upon whether x is a constant expression */ #define swap16(x) \ ( __builtin_constant_p(x) ? SWAP16_CONST(x) : (typeof(x))swap16_hw(x) ) -- cgit v1.2.3