From 3d0359c0f5c1774c6aae79a502977ddf687958b9 Mon Sep 17 00:00:00 2001 From: "Emilio G. Cota" Date: Tue, 18 Dec 2018 06:08:58 -0500 Subject: [PATCH] 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 Backports commit b7c2cd08a6f68010ad27c9c0bf2fde02fb743a0e from qemu --- qemu/include/qemu/xxhash.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu/include/qemu/xxhash.h b/qemu/include/qemu/xxhash.h index fe35dde3..076f1f60 100644 --- a/qemu/include/qemu/xxhash.h +++ b/qemu/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;