summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio G. Cota2018-11-23 23:41:43 +0100
committerRichard Henderson2018-12-17 04:04:44 +0100
commitb7c2cd08a6f68010ad27c9c0bf2fde02fb743a0e (patch)
treee3d49bc0563bf2c24a4d9840ee623d7b5997bb98
parentinclude: move exec/tb-hash-xx.h to qemu/xxhash.h (diff)
downloadqemu-b7c2cd08a6f68010ad27c9c0bf2fde02fb743a0e.tar.gz
qemu-b7c2cd08a6f68010ad27c9c0bf2fde02fb743a0e.tar.xz
qemu-b7c2cd08a6f68010ad27c9c0bf2fde02fb743a0e.zip
xxhash: match output against the original xxhash32
Change the order in which we extract a/b and c/d to match the output of the upstream xxhash32. Tested with: https://github.com/cota/xxhash/tree/qemu Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Tested-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Emilio G. Cota <cota@braap.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-rw-r--r--include/qemu/xxhash.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/qemu/xxhash.h b/include/qemu/xxhash.h
index fe35dde328..076f1f6054 100644
--- a/include/qemu/xxhash.h
+++ b/include/qemu/xxhash.h
@@ -55,10 +55,10 @@ qemu_xxhash7(uint64_t ab, uint64_t cd, uint32_t e, uint32_t f, uint32_t g)
uint32_t v2 = QEMU_XXHASH_SEED + PRIME32_2;
uint32_t v3 = QEMU_XXHASH_SEED + 0;
uint32_t v4 = QEMU_XXHASH_SEED - PRIME32_1;
- uint32_t a = ab >> 32;
- uint32_t b = ab;
- uint32_t c = cd >> 32;
- uint32_t d = cd;
+ uint32_t a = ab;
+ uint32_t b = ab >> 32;
+ uint32_t c = cd;
+ uint32_t d = cd >> 32;
uint32_t h32;
v1 += a * PRIME32_2;