diff options
Diffstat (limited to 'src/runtime/hash64.go')
| -rw-r--r-- | src/runtime/hash64.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/runtime/hash64.go b/src/runtime/hash64.go index 2864a4b963..bd16b7cd96 100644 --- a/src/runtime/hash64.go +++ b/src/runtime/hash64.go @@ -50,32 +50,32 @@ func memhashFallback(p unsafe.Pointer, seed, s uintptr) uintptr { seed1 := seed seed2 := seed for ; l > 48; l -= 48 { - seed = mix(r8(p)^m2, r8(add(p, 8))^seed) - seed1 = mix(r8(add(p, 16))^m3, r8(add(p, 24))^seed1) - seed2 = mix(r8(add(p, 32))^m4, r8(add(p, 40))^seed2) + seed = mix(r8(p)^hashkey[1]^m2, r8(add(p, 8))^seed) + seed1 = mix(r8(add(p, 16))^hashkey[2]^m3, r8(add(p, 24))^seed1) + seed2 = mix(r8(add(p, 32))^hashkey[3]^m4, r8(add(p, 40))^seed2) p = add(p, 48) } seed ^= seed1 ^ seed2 } for ; l > 16; l -= 16 { - seed = mix(r8(p)^m2, r8(add(p, 8))^seed) + seed = mix(r8(p)^hashkey[1]^m2, r8(add(p, 8))^seed) p = add(p, 16) } a = r8(add(p, l-16)) b = r8(add(p, l-8)) } - return mix(m5^s, mix(a^m2, b^seed)) + return mix(m5^s, mix(a^hashkey[1]^m2, b^seed)) } func memhash32Fallback(p unsafe.Pointer, seed uintptr) uintptr { a := r4(p) - return mix(m5^4, mix(a^m2, a^seed^hashkey[0]^m1)) + return mix(m5^4, mix(a^hashkey[1]^m2, a^seed^hashkey[0]^m1)) } func memhash64Fallback(p unsafe.Pointer, seed uintptr) uintptr { a := r8(p) - return mix(m5^8, mix(a^m2, a^seed^hashkey[0]^m1)) + return mix(m5^8, mix(a^hashkey[1]^m2, a^seed^hashkey[0]^m1)) } func mix(a, b uintptr) uintptr { |