diff options
author | tron <tron@openttd.org> | 2005-10-05 07:20:26 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-10-05 07:20:26 +0000 |
commit | ae4a1f3675bab50b93e443dcca07fd297fcdc58d (patch) | |
tree | 8281c38dbbb38386dacf57d352e00b62be0edc77 /macros.h | |
parent | 102cf2615f8ffb4e260680a5f2b3b7d9f2a7a130 (diff) | |
download | openttd-ae4a1f3675bab50b93e443dcca07fd297fcdc58d.tar.xz |
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
Diffstat (limited to 'macros.h')
-rw-r--r-- | macros.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -145,11 +145,11 @@ static inline void swap_tile(TileIndex *a, TileIndex *b) { TileIndex t = *a; *a #endif /// Fetch n bits starting at bit s from x -#define GB(x, s, n) (((x) >> (s)) & ((1 << (n)) - 1)) +#define GB(x, s, n) (((x) >> (s)) & ((1U << (n)) - 1)) /// Set n bits starting at bit s in x to d -#define SB(x, s, n, d) ((x) = ((x) & ~(((1 << (n)) - 1) << (s))) | ((d) << (s))) +#define SB(x, s, n, d) ((x) = ((x) & ~(((1U << (n)) - 1) << (s))) | ((d) << (s))) /// Add i to the n bits starting at bit s in x -#define AB(x, s, n, i) ((x) = ((x) & ~(((1 << (n)) - 1) << (s))) | (((x) + ((i) << (s))) & (((1 << (n)) - 1) << (s)))) +#define AB(x, s, n, i) ((x) = ((x) & ~(((1U << (n)) - 1) << (s))) | (((x) + ((i) << (s))) & (((1U << (n)) - 1) << (s)))) /** * ROtate x Left/Right by n (must be >= 0) |