darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-04-03 16:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

More cleanup

Browse source
This commit is contained in:
Dale Weiler 2013-12-15 01:45:36 -05:00
parent 7e88247ed5
commit 26ab792f9c
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
hash.c
View file

@ -118,7 +118,6 @@ static GMQCC_FORCEINLINE uint32_t hash_murmur_mix32(uint32_t hash) {
H = HASH_ROTL32(H, 13); \
H = H * 5 + 0xE6546B64; \
} while (0)
#define HASH_MURMUR_BYTES(COUNT, H, C, N, PTR, LENGTH) \
do { \
int i = COUNT; \
@ -132,6 +131,13 @@ static GMQCC_FORCEINLINE uint32_t hash_murmur_mix32(uint32_t hash) {
} \
} \
} while (0)
#define HASH_MURMUR_TAIL(P, Z, H, C, N, PTR, LEN) \
do { \
LEN -= LEN/4*4; \
HASH_MURMUR_BYTES(LEN, H, C, N, PTR, LEN); \
*P = H; \
*Z = ((C) & ~0xFF) | (N); \
} while (0)
#if PLATFORM_BYTE_ORDER == GMQCC_BYTE_ORDER_LITTLE
static GMQCC_FORCEINLINE void hash_murmur_process(uint32_t *ph1, uint32_t *carry, const void *key, int length) {
@ -151,13 +157,7 @@ static GMQCC_FORCEINLINE void hash_murmur_process(uint32_t *ph1, uint32_t *carry
uint32_t k1 = HASH_MURMUR_SAFEREAD(ptr);
HASH_MURMUR_BLOCK(h1, k1);
}
length -= length/4*4;
HASH_MURMUR_BYTES(length, h1, c, n, ptr, length);
*ph1 = h1;
*carry = (c & ~0xFF) | n;
HASH_MURMUR_TAIL(ph1, carry, h1, c, n, ptr, length);
}
#else
static GMQCC_FORCEINLINE void hash_murmur_process(uint32_t *ph1, uint32_t *carry, const void *key, int length) {
@ -196,12 +196,7 @@ static GMQCC_FORCEINLINE void hash_murmur_process(uint32_t *ph1, uint32_t *carry
NEXT(3, 8, 24);
#undef NEXT
}
length -= length/4*4;
HASH_MURMUR_BYTES(length, h1, c, n, ptr, length);
*ph1 = h1;
*carry = (c & ~0xFF) | n;
HASH_MURMUR_TAIL(ph1, carry, h1, c, n, ptr, length);
}
#endif
@ -242,3 +237,12 @@ size_t hash(const char *key) {
return hash_murmur((const void *)key, s-a);
}
#undef HASH_ROTL32
#undef HASH_MURMUR_MASK1
#undef HASH_MURMUR_MASK2
#undef HASH_MURMUR_SEED
#undef HASH_MURMUR_SAFEREAD
#undef HASH_MURMUR_BLOCK
#undef HASH_MURMUR_BYTES
#undef HASH_MURMUR_TAIL