gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r20838) -Fix [FS#4136]: Cast '1' in bitmath functions to width of result before shifting.

Browse Source
This commit is contained in:
alberth 2010-09-22 20:59:24 +00:00
parent ce83378e3d
commit b3270caaf1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/bitmath_func.hpp
View File

@ -31,7 +31,7 @@
template <typename T> template <typename T>
static FORCEINLINE uint GB(const T x, const uint8 s, const uint8 n) static FORCEINLINE uint GB(const T x, const uint8 s, const uint8 n)
{ {
return (x >> s) & ((1U << n) - 1); return (x >> s) & (((T)1U << n) - 1);
} }
/** /**
@ -55,7 +55,7 @@ static FORCEINLINE uint GB(const T x, const uint8 s, const uint8 n)
template <typename T, typename U> template <typename T, typename U>
static FORCEINLINE T SB(T &x, const uint8 s, const uint8 n, const U d) static FORCEINLINE T SB(T &x, const uint8 s, const uint8 n, const U d)
{ {
x &= (T)(~(((1U << n) - 1) << s)); x &= (T)(~((((T)1U << n) - 1) << s));
x |= (T)(d << s); x |= (T)(d << s);
return x; return x;
} }
@ -78,7 +78,7 @@ static FORCEINLINE T SB(T &x, const uint8 s, const uint8 n, const U d)
template <typename T, typename U> template <typename T, typename U>
static FORCEINLINE T AB(T &x, const uint8 s, const uint8 n, const U i) static FORCEINLINE T AB(T &x, const uint8 s, const uint8 n, const U i)
{ {
const T mask = (T)(((1U << n) - 1) << s); const T mask = ((((T)1U << n) - 1) << s);
x = (T)((x & ~mask) | ((x + (i << s)) & mask)); x = (T)((x & ~mask) | ((x + (i << s)) & mask));
return x; return x;
} }
@ -114,7 +114,7 @@ static FORCEINLINE bool HasBit(const T x, const uint8 y)
template <typename T> template <typename T>
static FORCEINLINE T SetBit(T &x, const uint8 y) static FORCEINLINE T SetBit(T &x, const uint8 y)
{ {
return x = (T)(x | (T)(1U << y)); return x = (T)(x | ((T)1U << y));
} }
/** /**
@ -172,7 +172,7 @@ static FORCEINLINE T ClrBit(T &x, const uint8 y)
template <typename T> template <typename T>
static FORCEINLINE T ToggleBit(T &x, const uint8 y) static FORCEINLINE T ToggleBit(T &x, const uint8 y)
{ {
return x = (T)(x ^ (T)(1U << y)); return x = (T)(x ^ ((T)1U << y));
} }