mirror of
https://github.com/amadvance/snapraid.git
synced 2026-10-26 02:49:02 -04:00
Beautifies the code.
This commit is contained in:
Andrea Mazzoleni
parent
0583799ad0
commit
876bddcf4c
30 changed files with 649 additions and 630 deletions
|
|
@ -51,54 +51,54 @@
|
|||
//
|
||||
// Google's CityHash has similar specs to SpookyHash, and CityHash is faster
|
||||
// on new Intel boxes. MD4 and MD5 also have similar specs, but they are orders
|
||||
// of magnitude slower. CRCs are two or more times slower, but unlike
|
||||
// SpookyHash, they have nice math for combining the CRCs of pieces to form
|
||||
// the CRCs of wholes. There are also cryptographic hashes, but those are even
|
||||
// of magnitude slower. CRCs are two or more times slower, but unlike
|
||||
// SpookyHash, they have nice math for combining the CRCs of pieces to form
|
||||
// the CRCs of wholes. There are also cryptographic hashes, but those are even
|
||||
// slower than MD5.
|
||||
//
|
||||
|
||||
#define Mix(data, s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11) \
|
||||
s0 += data[0]; s2 ^= s10; s11^= s0; s0 = util_rotl64(s0,11); s11 += s1; \
|
||||
s1 += data[1]; s3 ^= s11; s0 ^= s1; s1 = util_rotl64(s1,32); s0 += s2; \
|
||||
s2 += data[2]; s4 ^= s0; s1 ^= s2; s2 = util_rotl64(s2,43); s1 += s3; \
|
||||
s3 += data[3]; s5 ^= s1; s2 ^= s3; s3 = util_rotl64(s3,31); s2 += s4; \
|
||||
s4 += data[4]; s6 ^= s2; s3 ^= s4; s4 = util_rotl64(s4,17); s3 += s5; \
|
||||
s5 += data[5]; s7 ^= s3; s4 ^= s5; s5 = util_rotl64(s5,28); s4 += s6; \
|
||||
s6 += data[6]; s8 ^= s4; s5 ^= s6; s6 = util_rotl64(s6,39); s5 += s7; \
|
||||
s7 += data[7]; s9 ^= s5; s6 ^= s7; s7 = util_rotl64(s7,57); s6 += s8; \
|
||||
s8 += data[8]; s10^= s6; s7 ^= s8; s8 = util_rotl64(s8,55); s7 += s9; \
|
||||
s9 += data[9]; s11^= s7; s8 ^= s9; s9 = util_rotl64(s9,54); s8 += s10; \
|
||||
s10+= data[10]; s0 ^= s8; s9 ^= s10; s10= util_rotl64(s10,22); s9 += s11; \
|
||||
s11+= data[11]; s1 ^= s9; s10^= s11; s11= util_rotl64(s11,46); s10 += s0;
|
||||
s0 += data[0]; s2 ^= s10; s11 ^= s0; s0 = util_rotl64(s0, 11); s11 += s1; \
|
||||
s1 += data[1]; s3 ^= s11; s0 ^= s1; s1 = util_rotl64(s1, 32); s0 += s2; \
|
||||
s2 += data[2]; s4 ^= s0; s1 ^= s2; s2 = util_rotl64(s2, 43); s1 += s3; \
|
||||
s3 += data[3]; s5 ^= s1; s2 ^= s3; s3 = util_rotl64(s3, 31); s2 += s4; \
|
||||
s4 += data[4]; s6 ^= s2; s3 ^= s4; s4 = util_rotl64(s4, 17); s3 += s5; \
|
||||
s5 += data[5]; s7 ^= s3; s4 ^= s5; s5 = util_rotl64(s5, 28); s4 += s6; \
|
||||
s6 += data[6]; s8 ^= s4; s5 ^= s6; s6 = util_rotl64(s6, 39); s5 += s7; \
|
||||
s7 += data[7]; s9 ^= s5; s6 ^= s7; s7 = util_rotl64(s7, 57); s6 += s8; \
|
||||
s8 += data[8]; s10 ^= s6; s7 ^= s8; s8 = util_rotl64(s8, 55); s7 += s9; \
|
||||
s9 += data[9]; s11 ^= s7; s8 ^= s9; s9 = util_rotl64(s9, 54); s8 += s10; \
|
||||
s10 += data[10]; s0 ^= s8; s9 ^= s10; s10 = util_rotl64(s10, 22); s9 += s11; \
|
||||
s11 += data[11]; s1 ^= s9; s10 ^= s11; s11 = util_rotl64(s11, 46); s10 += s0;
|
||||
|
||||
#define EndPartial(h0, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11) \
|
||||
h11+= h1; h2 ^= h11; h1 = util_rotl64(h1,44); \
|
||||
h0 += h2; h3 ^= h0; h2 = util_rotl64(h2,15); \
|
||||
h1 += h3; h4 ^= h1; h3 = util_rotl64(h3,34); \
|
||||
h2 += h4; h5 ^= h2; h4 = util_rotl64(h4,21); \
|
||||
h3 += h5; h6 ^= h3; h5 = util_rotl64(h5,38); \
|
||||
h4 += h6; h7 ^= h4; h6 = util_rotl64(h6,33); \
|
||||
h5 += h7; h8 ^= h5; h7 = util_rotl64(h7,10); \
|
||||
h6 += h8; h9 ^= h6; h8 = util_rotl64(h8,13); \
|
||||
h7 += h9; h10^= h7; h9 = util_rotl64(h9,38); \
|
||||
h8 += h10; h11^= h8; h10= util_rotl64(h10,53); \
|
||||
h9 += h11; h0 ^= h9; h11= util_rotl64(h11,42); \
|
||||
h10+= h0; h1 ^= h10; h0 = util_rotl64(h0,54);
|
||||
h11 += h1; h2 ^= h11; h1 = util_rotl64(h1, 44); \
|
||||
h0 += h2; h3 ^= h0; h2 = util_rotl64(h2, 15); \
|
||||
h1 += h3; h4 ^= h1; h3 = util_rotl64(h3, 34); \
|
||||
h2 += h4; h5 ^= h2; h4 = util_rotl64(h4, 21); \
|
||||
h3 += h5; h6 ^= h3; h5 = util_rotl64(h5, 38); \
|
||||
h4 += h6; h7 ^= h4; h6 = util_rotl64(h6, 33); \
|
||||
h5 += h7; h8 ^= h5; h7 = util_rotl64(h7, 10); \
|
||||
h6 += h8; h9 ^= h6; h8 = util_rotl64(h8, 13); \
|
||||
h7 += h9; h10 ^= h7; h9 = util_rotl64(h9, 38); \
|
||||
h8 += h10; h11 ^= h8; h10 = util_rotl64(h10, 53); \
|
||||
h9 += h11; h0 ^= h9; h11 = util_rotl64(h11, 42); \
|
||||
h10 += h0; h1 ^= h10; h0 = util_rotl64(h0, 54);
|
||||
|
||||
#define End(data, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10,h11) \
|
||||
#define End(data, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11) \
|
||||
h0 += data[0]; h1 += data[1]; h2 += data[2]; h3 += data[3]; \
|
||||
h4 += data[4]; h5 += data[5]; h6 += data[6]; h7 += data[7]; \
|
||||
h8 += data[8]; h9 += data[9]; h10+= data[10]; h11+= data[11]; \
|
||||
EndPartial(h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11); \
|
||||
EndPartial(h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11); \
|
||||
EndPartial(h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
|
||||
h8 += data[8]; h9 += data[9]; h10 += data[10]; h11 += data[11]; \
|
||||
EndPartial(h0, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11); \
|
||||
EndPartial(h0, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11); \
|
||||
EndPartial(h0, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11);
|
||||
|
||||
// number of uint64_t's in internal state
|
||||
#define sc_numVars 12
|
||||
|
||||
// size of the internal state
|
||||
#define sc_blockSize (sc_numVars*8)
|
||||
|
||||
#define sc_blockSize (sc_numVars * 8)
|
||||
|
||||
//
|
||||
// sc_const: a constant which:
|
||||
// * is not zero
|
||||
|
|
@ -113,6 +113,7 @@ void SpookyHash128(const void* message, size_t length, const uint8_t* seed, uint
|
|||
uint64_t h0, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11;
|
||||
uint64_t buf[sc_numVars];
|
||||
uint64_t* end;
|
||||
|
||||
union {
|
||||
const uint8_t* p8;
|
||||
uint64_t* p64;
|
||||
|
|
@ -136,35 +137,35 @@ void SpookyHash128(const void* message, size_t length, const uint8_t* seed, uint
|
|||
h2 = h5 = h8 = h11 = sc_const;
|
||||
|
||||
u.p8 = message;
|
||||
end = u.p64 + (length/sc_blockSize)*sc_numVars;
|
||||
end = u.p64 + (length / sc_blockSize) * sc_numVars;
|
||||
|
||||
/* body */
|
||||
|
||||
while (u.p64 < end) {
|
||||
#if WORDS_BIGENDIAN
|
||||
for(i=0;i<sc_numVars;++i)
|
||||
for (i = 0; i < sc_numVars; ++i)
|
||||
buf[i] = util_swap64(u.p64[i]);
|
||||
Mix(buf,h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
|
||||
Mix(buf, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11);
|
||||
#else
|
||||
Mix(u.p64,h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
|
||||
Mix(u.p64, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11);
|
||||
#endif
|
||||
u.p64 += sc_numVars;
|
||||
}
|
||||
|
||||
/* tail */
|
||||
|
||||
remainder = (length - ((const uint8_t *)end-(const uint8_t *)message));
|
||||
remainder = (length - ((const uint8_t*)end - (const uint8_t*)message));
|
||||
memcpy(buf, end, remainder);
|
||||
memset(((uint8_t *)buf)+remainder, 0, sc_blockSize-remainder);
|
||||
((uint8_t *)buf)[sc_blockSize-1] = remainder;
|
||||
memset(((uint8_t*)buf) + remainder, 0, sc_blockSize - remainder);
|
||||
((uint8_t*)buf)[sc_blockSize - 1] = remainder;
|
||||
|
||||
/* finalization */
|
||||
#if WORDS_BIGENDIAN
|
||||
for(i=0;i<sc_numVars;++i)
|
||||
for (i = 0; i < sc_numVars; ++i)
|
||||
buf[i] = util_swap64(buf[i]);
|
||||
#endif
|
||||
|
||||
End(buf,h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
|
||||
End(buf, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11);
|
||||
|
||||
#if WORDS_BIGENDIAN
|
||||
h0 = util_swap64(h0);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue