forked from mirror/OpenTTD
(svn r11694) -Codechange: move more endianness related stuff to endian_func.hpp.
This commit is contained in:
@@ -5,6 +5,49 @@
|
||||
#ifndef ENDIAN_FUNC_H
|
||||
#define ENDIAN_FUNC_H
|
||||
|
||||
#include "bitmath_func.hpp"
|
||||
|
||||
#if defined(ARM) || defined(__arm__) || defined(__alpha__)
|
||||
#define OTTD_ALIGNMENT
|
||||
#endif
|
||||
|
||||
/* Windows has always LITTLE_ENDIAN */
|
||||
#if defined(WIN32) || defined(__OS2__) || defined(WIN64)
|
||||
#define TTD_LITTLE_ENDIAN
|
||||
#elif !defined(TESTING)
|
||||
/* Else include endian[target/host].h, which has the endian-type, autodetected by the Makefile */
|
||||
#if defined(STRGEN)
|
||||
#include "/endian_host.h"
|
||||
#else
|
||||
#include "endian_target.h"
|
||||
#endif
|
||||
#endif /* WIN32 || __OS2__ || WIN64 */
|
||||
|
||||
/* Setup alignment and conversion macros */
|
||||
#if defined(TTD_BIG_ENDIAN)
|
||||
#define TO_BE32X(x) (x)
|
||||
#define FROM_BE32(x) (x)
|
||||
#define TO_BE32(x) (x)
|
||||
#define FROM_BE16(x) (x)
|
||||
#define TO_BE16(x) (x)
|
||||
#define TO_LE32X(x) BSWAP32(x)
|
||||
static inline uint32 FROM_LE32(uint32 x) { return BSWAP32(x); }
|
||||
static inline uint32 TO_LE32(uint32 x) { return BSWAP32(x); }
|
||||
static inline uint16 FROM_LE16(uint16 x) { return BSWAP16(x); }
|
||||
static inline uint16 TO_LE16(uint16 x) { return BSWAP16(x); }
|
||||
#else
|
||||
#define TO_BE32X(x) BSWAP32(x)
|
||||
static inline uint32 FROM_BE32(uint32 x) { return BSWAP32(x); }
|
||||
static inline uint32 TO_BE32(uint32 x) { return BSWAP32(x); }
|
||||
static inline uint16 FROM_BE16(uint16 x) { return BSWAP16(x); }
|
||||
static inline uint16 TO_BE16(uint16 x) { return BSWAP16(x); }
|
||||
#define TO_LE32X(x) (x)
|
||||
#define FROM_LE32(x) (x)
|
||||
#define TO_LE32(x) (x)
|
||||
#define FROM_LE16(x) (x)
|
||||
#define TO_LE16(x) (x)
|
||||
#endif /* TTD_BIG_ENDIAN */
|
||||
|
||||
static inline uint16 ReadLE16Aligned(const void *x)
|
||||
{
|
||||
return FROM_LE16(*(const uint16*)x);
|
||||
@@ -19,4 +62,4 @@ static inline uint16 ReadLE16Unaligned(const void *x)
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif /* ENDIAN_FUNC_H */
|
||||
#endif /* ENDIAN_FUNC_HPP */
|
||||
|
Reference in New Issue
Block a user