Merge branch 'jgrpp' into jgrpp-nrt

# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp

src/core/bitmath_func.cpp

@@ -55,6 +55,13 @@ uint8 FindFirstBit(uint32 x)
 	return pos;
 }
 
+uint8 FindFirstBit64(uint64 x)
+{
+	if (x == 0) return 0;
+	if ((x & 0x00000000ffffffffULL) != 0) return FindFirstBit(x);
+	return FindFirstBit(x >> 32) + 32;
+}
+
 #endif
 
 /**

src/core/bitmath_func.hpp

@@ -198,6 +198,13 @@ inline uint8 FindFirstBit(uint32 x)
 	return __builtin_ctz(x);
 }
 
+inline uint8 FindFirstBit64(uint64 x)
+{
+	if (x == 0) return 0;
+
+	return __builtin_ctzll(x);
+}
+
 #else
 
 /** Lookup table to check which bit is set in a 6 bit variable */
@@ -216,6 +223,7 @@ extern const uint8 _ffb_64[64];
 #define FIND_FIRST_BIT(x) _ffb_64[(x)]
 
 uint8 FindFirstBit(uint32 x);
+uint8 FindFirstBit64(uint64 x);
 
 #endif
 
@@ -395,14 +403,14 @@ 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) ((uint64)CFSwapInt64(x))
-	#define BSWAP32(x) ((uint32)CFSwapInt32(x))
-	#define BSWAP16(x) ((uint16)CFSwapInt16(x))
+	#define BSWAP64(x) ((uint64)CFSwapInt64((uint64)x))
+	#define BSWAP32(x) ((uint32)CFSwapInt32((uint32)x))
+	#define BSWAP16(x) ((uint16)CFSwapInt16((uint16)x))
 #elif defined(_MSC_VER)
 	/* MSVC has intrinsics for swapping, resulting in faster code */
-	#define BSWAP64(x) (_byteswap_uint64(x))
-	#define BSWAP32(x) (_byteswap_ulong(x))
-	#define BSWAP16(x) (_byteswap_ushort(x))
+	#define BSWAP64(x) ((uint64)_byteswap_uint64((uint64)x))
+	#define BSWAP32(x) ((uint32)_byteswap_ulong((uint32)x))
+	#define BSWAP16(x) ((uint16)_byteswap_ushort((uint16)x))
 #else
 	/**
 	 * Perform a 64 bits endianness bitswap on x.
@@ -430,7 +438,7 @@ static inline T ROR(const T x, const uint8 n)
 	{
 #if !defined(__ICC) && (defined(__GNUC__) || defined(__clang__))
 		/* GCC >= 4.3 provides a builtin, resulting in faster code */
-		return (uint32)__builtin_bswap32((int32)x);
+		return (uint32)__builtin_bswap32((uint32)x);
 #else
 		return ((x >> 24) & 0xFF) | ((x >> 8) & 0xFF00) | ((x << 8) & 0xFF0000) | ((x << 24) & 0xFF000000);
 #endif /* __GNUC__ || __clang__ */
@@ -443,7 +451,12 @@ static inline T ROR(const T x, const uint8 n)
 	 */
 	static inline uint16 BSWAP16(uint16 x)
 	{
+#if !defined(__ICC) && (defined(__GNUC__) || defined(__clang__))
+		/* GCC >= 4.3 provides a builtin, resulting in faster code */
+		return (uint16)__builtin_bswap16((uint16)x);
+#else
 		return (x >> 8) | (x << 8);
+#endif /* __GNUC__ || __clang__ */
 	}
 #endif /* __APPLE__ */
 

src/core/checksum_func.hpp

@@ -0,0 +1,33 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file checksum_func.hpp Checksum utility functions. */
+
+#ifndef CHECKSUM_FUNC_HPP
+#define CHECKSUM_FUNC_HPP
+
+#include "bitmath_func.hpp"
+
+struct SimpleChecksum64 {
+	uint64 state = 0;
+
+	void Update(uint64 input)
+	{
+		this->state = ROL(this->state, 1) ^ input ^ 0x123456789ABCDEF7ULL;
+	}
+};
+
+extern SimpleChecksum64 _state_checksum;
+
+inline void UpdateStateChecksum(uint64 input)
+{
+	_state_checksum.Update(input);
+}
+
+#endif /* CHECKSUM_FUNC_HPP */

src/core/random_func.hpp

@@ -12,6 +12,8 @@
 #ifndef RANDOM_FUNC_HPP
 #define RANDOM_FUNC_HPP
 
+#include "bitmath_func.hpp"
+
 #if defined(__APPLE__)
 	/* Apple already has Random declared */
 	#define Random OTTD_Random