N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Hash: Fix casts and signedness on integer values

Browse source
This commit is contained in:
Paul "Dettorer" Hervot 2015-11-29 09:39:01 +01:00 committed by Paul Dettorer Hervot
parent 7ab94baadd
commit b2a9d05cd4
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/common/hash.cpp
View file

@ -36,7 +36,7 @@ static FORCE_INLINE u64 fmix64(u64 k) {
// platforms (MurmurHash3_x64_128). It was taken from: // platforms (MurmurHash3_x64_128). It was taken from:
// https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp // https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp
void MurmurHash3_128(const void* key, int len, u32 seed, void* out) { void MurmurHash3_128(const void* key, int len, u32 seed, void* out) {
const u8 * data = (const u8*)key; const u8* data = static_cast<const u8*>(key);
const int nblocks = len / 16; const int nblocks = len / 16;
u64 h1 = seed; u64 h1 = seed;
@ -47,7 +47,7 @@ void MurmurHash3_128(const void* key, int len, u32 seed, void* out) {
// Body // Body
const u64 * blocks = (const u64 *)(data); const u64* blocks = reinterpret_cast<const u64*>(data);
for (int i = 0; i < nblocks; i++) { for (int i = 0; i < nblocks; i++) {
u64 k1 = getblock64(blocks,i*2+0); u64 k1 = getblock64(blocks,i*2+0);
@ -64,35 +64,36 @@ void MurmurHash3_128(const void* key, int len, u32 seed, void* out) {
// Tail // Tail
const u8 * tail = (const u8*)(data + nblocks*16); const u8* tail = static_cast<const u8*>(data + nblocks*16);
u64 k1 = 0; u64 k1 = 0;
u64 k2 = 0; u64 k2 = 0;
switch (len & 15) { switch (len & 15) {
case 15: k2 ^= ((u64)tail[14]) << 48; case 15: k2 ^= static_cast<u64>(tail[14]) << 48;
case 14: k2 ^= ((u64)tail[13]) << 40; case 14: k2 ^= static_cast<u64>(tail[13]) << 40;
case 13: k2 ^= ((u64)tail[12]) << 32; case 13: k2 ^= static_cast<u64>(tail[12]) << 32;
case 12: k2 ^= ((u64)tail[11]) << 24; case 12: k2 ^= static_cast<u64>(tail[11]) << 24;
case 11: k2 ^= ((u64)tail[10]) << 16; case 11: k2 ^= static_cast<u64>(tail[10]) << 16;
case 10: k2 ^= ((u64)tail[ 9]) << 8; case 10: k2 ^= static_cast<u64>(tail[ 9]) << 8;
case 9: k2 ^= ((u64)tail[ 8]) << 0; case 9: k2 ^= static_cast<u64>(tail[ 8]) << 0;
k2 *= c2; k2 = _rotl64(k2,33); k2 *= c1; h2 ^= k2; k2 *= c2; k2 = _rotl64(k2,33); k2 *= c1; h2 ^= k2;
case 8: k1 ^= ((u64)tail[ 7]) << 56; case 8: k1 ^= static_cast<u64>(tail[ 7]) << 56;
case 7: k1 ^= ((u64)tail[ 6]) << 48; case 7: k1 ^= static_cast<u64>(tail[ 6]) << 48;
case 6: k1 ^= ((u64)tail[ 5]) << 40; case 6: k1 ^= static_cast<u64>(tail[ 5]) << 40;
case 5: k1 ^= ((u64)tail[ 4]) << 32; case 5: k1 ^= static_cast<u64>(tail[ 4]) << 32;
case 4: k1 ^= ((u64)tail[ 3]) << 24; case 4: k1 ^= static_cast<u64>(tail[ 3]) << 24;
case 3: k1 ^= ((u64)tail[ 2]) << 16; case 3: k1 ^= static_cast<u64>(tail[ 2]) << 16;
case 2: k1 ^= ((u64)tail[ 1]) << 8; case 2: k1 ^= static_cast<u64>(tail[ 1]) << 8;
case 1: k1 ^= ((u64)tail[ 0]) << 0; case 1: k1 ^= static_cast<u64>(tail[ 0]) << 0;
k1 *= c1; k1 = _rotl64(k1,31); k1 *= c2; h1 ^= k1; k1 *= c1; k1 = _rotl64(k1,31); k1 *= c2; h1 ^= k1;
}; };
// Finalization // Finalization
h1 ^= len; h2 ^= len; h1 ^= static_cast<u64>(len);
h2 ^= static_cast<u64>(len);
h1 += h2; h1 += h2;
h2 += h1; h2 += h1;
@ -103,8 +104,8 @@ void MurmurHash3_128(const void* key, int len, u32 seed, void* out) {
h1 += h2; h1 += h2;
h2 += h1; h2 += h1;
((u64*)out)[0] = h1; static_cast<u64*>(out)[0] = h1;
((u64*)out)[1] = h2; static_cast<u64*>(out)[1] = h2;
} }
} // namespace Common } // namespace Common