From 6862343eb3adcffb49b5158b016873bbac030a81 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 6 Jun 2018 01:38:05 +0100 Subject: [PATCH 1/3] Fix wrong type cast in Apple BSWAP64 macro --- src/core/bitmath_func.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/bitmath_func.hpp b/src/core/bitmath_func.hpp index fdcb310b06..a40c7dba6e 100644 --- a/src/core/bitmath_func.hpp +++ b/src/core/bitmath_func.hpp @@ -365,7 +365,7 @@ 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 BSWAP64(x) ((uint64)CFSwapInt64(x)) #define BSWAP32(x) ((uint32)CFSwapInt32(x)) #define BSWAP16(x) ((uint16)CFSwapInt16(x)) #elif defined(_MSC_VER) From 183a5cb11435901f1b1c7de26953491cb6b41bf0 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 6 Jun 2018 01:54:37 +0100 Subject: [PATCH 2/3] Add unaligned uint 16, 32, 64 typedefs --- src/stdafx.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/stdafx.h b/src/stdafx.h index 7fbd61f560..a145d645c2 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -456,6 +456,16 @@ assert_compile(SIZE_MAX >= UINT32_MAX); #define unlikely(x) (x) #endif /* __GNUC__ || __clang__ */ +#if defined(__GNUC__) || defined(__clang__) +__attribute__((aligned(1))) typedef uint16 unaligned_uint16; +__attribute__((aligned(1))) typedef uint32 unaligned_uint32; +__attribute__((aligned(1))) typedef uint64 unaligned_uint64; +#else +typedef uint16 unaligned_uint16; +typedef uint32 unaligned_uint32; +typedef uint64 unaligned_uint64; +#endif /* __GNUC__ || __clang__ */ + void NORETURN CDECL usererror(const char *str, ...) WARN_FORMAT(1, 2); void NORETURN CDECL error(const char *str, ...) WARN_FORMAT(1, 2); void NORETURN CDECL assert_msg_error(int line, const char *file, const char *expr, const char *str, ...) WARN_FORMAT(4, 5); From 616cbf580aeb91b7380f7378f4d6e5abe1c083ce Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 6 Jun 2018 01:55:51 +0100 Subject: [PATCH 3/3] Use unaligned typedefs in unaligned save/load accessors --- src/saveload/saveload_buffer.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/saveload/saveload_buffer.h b/src/saveload/saveload_buffer.h index 1ca754cead..a289e50f0c 100644 --- a/src/saveload/saveload_buffer.h +++ b/src/saveload/saveload_buffer.h @@ -79,7 +79,7 @@ struct ReadBuffer { inline int RawReadUint16() { #if OTTD_ALIGNMENT == 0 - int x = FROM_BE16(*((const uint16*) this->bufp)); + int x = FROM_BE16(*((const unaligned_uint16*) this->bufp)); this->bufp += 2; return x; #else @@ -91,7 +91,7 @@ struct ReadBuffer { inline uint32 RawReadUint32() { #if OTTD_ALIGNMENT == 0 - uint32 x = FROM_BE32(*((const uint32*) this->bufp)); + uint32 x = FROM_BE32(*((const unaligned_uint32*) this->bufp)); this->bufp += 4; return x; #else @@ -103,7 +103,7 @@ struct ReadBuffer { inline uint64 RawReadUint64() { #if OTTD_ALIGNMENT == 0 - uint64 x = FROM_BE64(*((const uint64*) this->bufp)); + uint64 x = FROM_BE64(*((const unaligned_uint64*) this->bufp)); this->bufp += 8; return x; #else @@ -219,7 +219,7 @@ struct MemoryDumper { inline void RawWriteUint16(uint16 v) { #if OTTD_ALIGNMENT == 0 - *((uint16 *) this->buf) = TO_BE16(v); + *((unaligned_uint16 *) this->buf) = TO_BE16(v); #else this->buf[0] = GB(v, 8, 8)); this->buf[1] = GB(v, 0, 8)); @@ -230,7 +230,7 @@ struct MemoryDumper { inline void RawWriteUint32(uint32 v) { #if OTTD_ALIGNMENT == 0 - *((uint32 *) this->buf) = TO_BE32(v); + *((unaligned_uint32 *) this->buf) = TO_BE32(v); #else this->buf[0] = GB(v, 24, 8)); this->buf[1] = GB(v, 16, 8)); @@ -243,7 +243,7 @@ struct MemoryDumper { inline void RawWriteUint64(uint64 v) { #if OTTD_ALIGNMENT == 0 - *((uint64 *) this->buf) = TO_BE64(v); + *((unaligned_uint64 *) this->buf) = TO_BE64(v); #else this->buf[0] = GB(v, 56, 8)); this->buf[1] = GB(v, 48, 8));