Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r2596) Add macros ROL and ROR to ROtate values Left/Right. Also shorten the parameter names for GB and SB to increase readability

Browse Source
This commit is contained in:
tron 2005-07-17 09:41:28 +00:00
parent de19186be3
commit e7fa78d60b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
macros.h
View File

@ -153,9 +153,16 @@ static inline void swap_tile(TileIndex *a, TileIndex *b) { TileIndex t = *a; *a
} }
#endif #endif
// Fetch count bits starting at bit start from value /// Fetch n bits starting at bit s from x
#define GB(value, start, count) (((value) >> (start)) & ((1 << (count)) - 1)) #define GB(x, s, n) (((x) >> (s)) & ((1 << (n)) - 1))
// Set count bits in value starting at bit start to data /// Set n bits in x starting at bit s to d
#define SB(value, start, count, data) ((value) = ((value) & ~(((1 << (count)) - 1) << (start))) | ((data) << (start))) #define SB(x, s, n, d) ((x) = ((x) & ~(((1 << (n)) - 1) << (s))) | ((d) << (s)))
/**
* ROtate x Left/Right by n (must be >= 0)
* @note Assumes a byte has 8 bits
*/
#define ROL(x, n) ((x) << (n) | (x) >> (sizeof(x) * 8 - (n)))
#define ROR(x, n) ((x) >> (n) | (x) << (sizeof(x) * 8 - (n)))
#endif /* MACROS_H */ #endif /* MACROS_H */

5
misc.c
View File

@ -19,11 +19,6 @@ extern void InitNewsItemStructs(void);
char _name_array[512][32]; char _name_array[512][32];
static inline uint32 ROR(uint32 x, int n)
{
return (x >> n) + (x << ((sizeof(x)*8)-n));
}
#ifndef MERSENNE_TWISTER #ifndef MERSENNE_TWISTER
#ifdef RANDOM_DEBUG #ifdef RANDOM_DEBUG