summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/bitmath_func.hpp30
-rw-r--r--src/core/endian_func.hpp45
2 files changed, 74 insertions, 1 deletions
diff --git a/src/core/bitmath_func.hpp b/src/core/bitmath_func.hpp
index 6f9c35806..9042e6a7e 100644
--- a/src/core/bitmath_func.hpp
+++ b/src/core/bitmath_func.hpp
@@ -291,4 +291,34 @@ template<typename T> static inline T ROR(const T x, const uint8 n)
for (i = 0; b != 0; i++, b >>= 1) \
if (b & 1)
+
+#if defined(__APPLE__)
+ /* Make endian swapping use Apple's macros to increase speed
+ * (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 BSWAP32(x) ((uint32)Endian32_Swap(x))
+ #define BSWAP16(x) ((uint16)Endian16_Swap(x))
+#else
+ /**
+ * Perform a 32 bits endianness bitswap on x.
+ * @param x the variable to bitswap
+ * @return the bitswapped value.
+ */
+ static inline uint32 BSWAP32(uint32 x)
+ {
+ return ((x >> 24) & 0xFF) | ((x >> 8) & 0xFF00) | ((x << 8) & 0xFF0000) | ((x << 24) & 0xFF000000);
+ }
+
+ /**
+ * Perform a 16 bits endianness bitswap on x.
+ * @param x the variable to bitswap
+ * @return the bitswapped value.
+ */
+ static inline uint16 BSWAP16(uint16 x)
+ {
+ return (x >> 8) | (x << 8);
+ }
+#endif /* __APPLE__ */
+
#endif /* BITMATH_FUNC_HPP */
diff --git a/src/core/endian_func.hpp b/src/core/endian_func.hpp
index 545e6b986..fa73f7f7e 100644
--- a/src/core/endian_func.hpp
+++ b/src/core/endian_func.hpp
@@ -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 */