dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cpp-11' into crashlog_improvements

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-08-26 22:21:56 +01:00
parent 1b5da1f2aa 6c546a2145
commit 312595b737
4 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/bitmath_func.hpp
View File

@@ -365,13 +365,32 @@ static inline T ROR(const T x, const uint8 n)
* (since it will use hardware swapping if available). * (since it will use hardware swapping if available).
* Even though they should return uint16 and uint32, we get * Even though they should return uint16 and uint32, we get
* warnings if we don't cast those (why?) */ * warnings if we don't cast those (why?) */
#define BSWAP64(x) ((uint64)CFSwapInt64(x))
#define BSWAP32(x) ((uint32)CFSwapInt32(x)) #define BSWAP32(x) ((uint32)CFSwapInt32(x))
#define BSWAP16(x) ((uint16)CFSwapInt16(x)) #define BSWAP16(x) ((uint16)CFSwapInt16(x))
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
/* MSVC has intrinsics for swapping, resulting in faster code */ /* MSVC has intrinsics for swapping, resulting in faster code */
#define BSWAP64(x) (_byteswap_uint64(x))
#define BSWAP32(x) (_byteswap_ulong(x)) #define BSWAP32(x) (_byteswap_ulong(x))
#define BSWAP16(x) (_byteswap_ushort(x)) #define BSWAP16(x) (_byteswap_ushort(x))
#else #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. * Perform a 32 bits endianness bitswap on x.
* @param x the variable to bitswap * @param x the variable to bitswap

8
src/core/endian_func.hpp
View File

@@ -19,25 +19,33 @@
#if TTD_ENDIAN == TTD_BIG_ENDIAN #if TTD_ENDIAN == TTD_BIG_ENDIAN
#define FROM_BE16(x) (x) #define FROM_BE16(x) (x)
#define FROM_BE32(x) (x) #define FROM_BE32(x) (x)
#define FROM_BE64(x) (x)
#define TO_BE16(x) (x) #define TO_BE16(x) (x)
#define TO_BE32(x) (x) #define TO_BE32(x) (x)
#define TO_BE32X(x) (x) #define TO_BE32X(x) (x)
#define TO_BE64(x) (x)
#define FROM_LE16(x) BSWAP16(x) #define FROM_LE16(x) BSWAP16(x)
#define FROM_LE32(x) BSWAP32(x) #define FROM_LE32(x) BSWAP32(x)
#define FROM_LE64(x) BSWAP64(x)
#define TO_LE16(x) BSWAP16(x) #define TO_LE16(x) BSWAP16(x)
#define TO_LE32(x) BSWAP32(x) #define TO_LE32(x) BSWAP32(x)
#define TO_LE32X(x) BSWAP32(x) #define TO_LE32X(x) BSWAP32(x)
#define TO_LE64(x) BSWAP64(x)
#else #else
#define FROM_BE16(x) BSWAP16(x) #define FROM_BE16(x) BSWAP16(x)
#define FROM_BE32(x) BSWAP32(x) #define FROM_BE32(x) BSWAP32(x)
#define FROM_BE64(x) BSWAP64(x)
#define TO_BE16(x) BSWAP16(x) #define TO_BE16(x) BSWAP16(x)
#define TO_BE32(x) BSWAP32(x) #define TO_BE32(x) BSWAP32(x)
#define TO_BE32X(x) BSWAP32(x) #define TO_BE32X(x) BSWAP32(x)
#define TO_BE64(x) BSWAP64(x)
#define FROM_LE16(x) (x) #define FROM_LE16(x) (x)
#define FROM_LE32(x) (x) #define FROM_LE32(x) (x)
#define FROM_LE64(x) (x)
#define TO_LE16(x) (x) #define TO_LE16(x) (x)
#define TO_LE32(x) (x) #define TO_LE32(x) (x)
#define TO_LE32X(x) (x) #define TO_LE32X(x) (x)
#define TO_LE64(x) (x)
#endif /* TTD_ENDIAN == TTD_BIG_ENDIAN */ #endif /* TTD_ENDIAN == TTD_BIG_ENDIAN */
static inline uint16 ReadLE16Aligned(const void *x) static inline uint16 ReadLE16Aligned(const void *x)

2
src/scope.h
View File

@@ -12,6 +12,8 @@
#ifndef SCOPE_H #ifndef SCOPE_H
#define SCOPE_H #define SCOPE_H
#include <utility>
template <typename T> template <typename T>
class scope_exit_obj { class scope_exit_obj {
T f; T f;

10
src/stdafx.h
View File

@@ -426,6 +426,16 @@ assert_compile(SIZE_MAX >= UINT32_MAX);
#define unlikely(x) (x) #define unlikely(x) (x)
#endif /* __GNUC__ || __clang__ */ #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 usererror(const char *str, ...) WARN_FORMAT(1, 2);
void NORETURN CDECL error(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 *extra, const char *str, ...) WARN_FORMAT(5, 6); void NORETURN CDECL assert_msg_error(int line, const char *file, const char *expr, const char *extra, const char *str, ...) WARN_FORMAT(5, 6);