cpp/openttd-patchpack/source Changeset - r28499:cf7f5ff835c8

Changeset - r28499:cf7f5ff835c8

Parent rev.

Child rev.

[Not reviewed]

master

0 7 0

Rubidium - 11 months ago 2024-01-17 19:58:06
rubidium@openttd.org

Codechange: replace ROR/ROL with std::rotr/rotl

7 files changed with 10 insertions and 41 deletions:

src/3rdparty/md5/md5.cpp

src/core/bitmath_func.hpp

src/core/random_func.cpp

src/newgrf_spritegroup.cpp

src/saveload/oldloader.cpp

src/stdafx.h

src/strgen/strgen_base.cpp

0 comments (0 inline, 0 general)

src/3rdparty/md5/md5.cpp

➞

Show inline comments

@@ @@ -127,35 +127,35 @@ @@
 #define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
 static inline void Md5Set1(const uint32_t *X, uint32_t *a, const uint32_t *b, const uint32_t *c, const uint32_t *d, const uint8_t k, const uint8_t s, const uint32_t Ti)
+{
 	uint32_t t = (*b & *c) | (~*b & *d);
 	t += *a + X[k] + Ti;
-	*a = ROL(t, s) + *b;
+	*a = std::rotl(t, s) + *b;
+}
 static inline void Md5Set2(const uint32_t *X, uint32_t *a, const uint32_t *b, const uint32_t *c, const uint32_t *d, const uint8_t k, const uint8_t s, const uint32_t Ti)
+{
 	uint32_t t = (*b & *d) | (*c & ~*d);
 	t += *a + X[k] + Ti;
-	*a = ROL(t, s) + *b;
+	*a = std::rotl(t, s) + *b;
+}
 static inline void Md5Set3(const uint32_t *X, uint32_t *a, const uint32_t *b, const uint32_t *c, const uint32_t *d, const uint8_t k, const uint8_t s, const uint32_t Ti)
+{
 	uint32_t t = *b ^ *c ^ *d;
 	t += *a + X[k] + Ti;
-	*a = ROL(t, s) + *b;
+	*a = std::rotl(t, s) + *b;
+}
 static inline void Md5Set4(const uint32_t *X, uint32_t *a, const uint32_t *b, const uint32_t *c, const uint32_t *d, const uint8_t k, const uint8_t s, const uint32_t Ti)
+{
 	uint32_t t = *c ^ (*b | ~*d);
 	t += *a + X[k] + Ti;
-	*a = ROL(t, s) + *b;
+	*a = std::rotl(t, s) + *b;
+}
 Md5::Md5()
+{
 	count[0] = 0;
 	count[1] = 0;

src/core/bitmath_func.hpp

➞

Show inline comments

@@ @@ -285,44 +285,12 @@ inline bool HasExactlyOneBit(T value) @@
 template <typename T>
 inline bool HasAtMostOneBit(T value)
+{
 	return (value & (value - 1)) == 0;
+}
 /**
  * ROtate \a x Left by \a n
+ *
  * @note Assumes a byte has 8 bits
  * @param x The value which we want to rotate
  * @param n The number how many we want to rotate
  * @pre n < sizeof(T) * 8
  * @return A bit rotated number
  */
 template <typename T>
 inline T ROL(const T x, const uint8_t n)
+{
 	if (n == 0) return x;
 	return (T)(x << n | x >> (sizeof(x) * 8 - n));
+}
 /**
  * ROtate \a x Right by \a n
+ *
  * @note Assumes a byte has 8 bits
  * @param x The value which we want to rotate
  * @param n The number how many we want to rotate
  * @pre n < sizeof(T) * 8
  * @return A bit rotated number
  */
 template <typename T>
 inline T ROR(const T x, const uint8_t n)
+{
 	if (n == 0) return x;
 	return (T)(x >> n | x << (sizeof(x) * 8 - n));
+}
  /**
  * Iterable ensemble of each set bit in a value.
  * @tparam Tbitpos Type of the position variable.
  * @tparam Tbitset Type of the bitset value.
  */
 template <typename Tbitpos = uint, typename Tbitset = uint>

src/core/random_func.cpp

➞

Show inline comments

@@ @@ -30,14 +30,14 @@ Randomizer _random, _interactive_random; @@
  */
 uint32_t Randomizer::Next()
+{
 	const uint32_t s = this->state[0];
 	const uint32_t t = this->state[1];
 	this->state[0] = s + ROR(t ^ 0x1234567F, 7) + 1;
 	return this->state[1] = ROR(s, 3) - 1;
 	this->state[0] = s + std::rotr(t ^ 0x1234567F, 7) + 1;
 	return this->state[1] = std::rotr(s, 3) - 1;
+}
 /**
  * Generate the next pseudo random number scaled to \a limit, excluding \a limit
  * itself.
  * @param limit Limit of the range to be generated from.

src/newgrf_spritegroup.cpp

➞

Show inline comments

@@ @@ -166,13 +166,13 @@ static U EvalAdjustT(const Deterministic @@
 		case DSGA_OP_AND:  return last_value & value;
 		case DSGA_OP_OR:   return last_value | value;
 		case DSGA_OP_XOR:  return last_value ^ value;
 		case DSGA_OP_STO:  _temp_store.StoreValue((U)value, (S)last_value); return last_value;
 		case DSGA_OP_RST:  return value;
 		case DSGA_OP_STOP: scope->StorePSA((U)value, (S)last_value); return last_value;
-		case DSGA_OP_ROR:  return ROR<uint32_t>((U)last_value, (U)value & 0x1F); // mask 'value' to 5 bits, which should behave the same on all architectures.
+		case DSGA_OP_ROR:  return std::rotr<uint32_t>((U)last_value, (U)value & 0x1F); // mask 'value' to 5 bits, which should behave the same on all architectures.
 		case DSGA_OP_SCMP: return ((S)last_value == (S)value) ? 1 : ((S)last_value < (S)value ? 0 : 2);
 		case DSGA_OP_UCMP: return ((U)last_value == (U)value) ? 1 : ((U)last_value < (U)value ? 0 : 2);
 		case DSGA_OP_SHL:  return (uint32_t)(U)last_value << ((U)value & 0x1F); // Same behaviour as in ParamSet, mask 'value' to 5 bits, which should behave the same on all architectures.
 		case DSGA_OP_SHR:  return (uint32_t)(U)last_value >> ((U)value & 0x1F);
 		case DSGA_OP_SAR:  return (int32_t)(S)last_value >> ((U)value & 0x1F);
 		default:           return value;

src/saveload/oldloader.cpp

➞

Show inline comments

@@ @@ -209,13 +209,13 @@ static void InitLoading(LoadgameState *l @@
  */
 static bool VerifyOldNameChecksum(char *title, uint len)
+{
 	uint16_t sum = 0;
 	for (uint i = 0; i < len - HEADER_CHECKSUM_SIZE; i++) {
 		sum += title[i];
-		sum = ROL(sum, 1);
+		sum = std::rotl(sum, 1);
+	}
 	sum ^= 0xAAAA; // computed checksum
 	uint16_t sum2 = title[len - HEADER_CHECKSUM_SIZE]; // checksum in file
 	SB(sum2, 8, 8, title[len - HEADER_CHECKSUM_SIZE + 1]);

src/stdafx.h

➞

Show inline comments

@@ @@ -45,12 +45,13 @@ @@
 #	define __STDC_LIMIT_MACROS
 #	include <stdint.h>
 #endif
 #include <algorithm>
 #include <array>
 #include <bit>
 #include <cassert>
 #include <cctype>
 #include <cerrno>
 #include <climits>
 #include <cmath>
 #include <cstddef>

src/strgen/strgen_base.cpp

➞

Show inline comments

@@ @@ -112,13 +112,13 @@ LangString *StringData::Find(const std:: @@
  * @param s    The string hash.
  * @return The new hash.
  */
 uint StringData::VersionHashStr(uint hash, const char *s) const
+{
 	for (; *s != '\0'; s++) {
-		hash = ROL(hash, 3) ^ *s;
+		hash = std::rotl(hash, 3) ^ *s;
 		hash = (hash & 1 ? hash >> 1 ^ 0xDEADBEEF : hash >> 1);
+	}
 	return hash;
+}
 /**

0 comments (0 inline, 0 general)