fix hashing

Author: vanhauser-thc

accel/tcg/tcg-runtime.c

@@ -33,6 +33,7 @@
 #include "tcg/tcg.h"
 
 #include "qemuafl/common.h"
+#include "qemu/xxhash.h"
 
 void HELPER(afl_entry_routine)(CPUArchState *env) {
 
@@ -282,7 +283,7 @@ void HELPER(afl_cmplog_rtn)(CPUArchState *env) {
   uintptr_t k = 0;
 #endif
 
-  k = (uintptr_t)(XXH64((u8 *)&k, sizeof(uintptr_t), HASH_CONST));
+  k = (uintptr_t)(qemu_xxhash64_4((uint64_t)k, 0, 0, HASH_CONST));
   k &= (CMP_MAP_W - 1);
 
   u32 hits = 0;

accel/tcg/translate-all.c

@@ -65,6 +65,7 @@
 
 #include "qemuafl/common.h"
 #include "tcg/tcg-op.h"
+#include "qemu/xxhash.h"
 
 #include <math.h>
 
@@ -106,7 +107,7 @@ static void afl_gen_trace(target_ulong cur_loc) {
 
   // cur_loc = (cur_loc >> 4) ^ (cur_loc << 8);
   // cur_loc &= MAP_SIZE - 1;
-  cur_loc = (uintptr_t)(XXH64((u8 *)&cur_loc, sizeof(uintptr_t), HASH_CONST));
+  cur_loc = (uintptr_t)(qemu_xxhash64_4((uint64_t)cur_loc, 0, 0, HASH_CONST));
   cur_loc &= (MAP_SIZE - 1);
 
   /* Implement probabilistic instrumentation by looking at scrambled block

qemuafl/common.h

@@ -38,10 +38,6 @@
 #include "imported/types.h"
 #include "imported/cmplog.h"
 
-#define XXH_INLINE_ALL
-#include "xxhash.h"
-#undef XXH_INLINE_ALL
-
 #include "api.h"
 
 #define AFL_G2H g2h_untagged

qemuafl/cpu-translate.h

@@ -35,6 +35,8 @@
 #include "tcg/tcg.h"
 #include "tcg/tcg-op.h"
 
+#include "qemu/xxhash.h"
+
 #if TARGET_LONG_BITS == 64
   #define _DEFAULT_MO MO_64
 #else
@@ -48,7 +50,7 @@ static void afl_gen_compcov(target_ulong cur_loc, TCGv arg1, TCGv arg2,
 
   if (__afl_cmp_map) {
 
-    cur_loc = (uintptr_t)(XXH64((u8 *)&cur_loc, sizeof(uintptr_t), HASH_CONST));
+    cur_loc = (uintptr_t)(qemu_xxhash64_4((uint64_t)cur_loc, 0, 0, HASH_CONST));
     cur_loc &= (CMP_MAP_W - 1);
 
     TCGv cur_loc_v = tcg_const_tl(cur_loc);
@@ -78,7 +80,7 @@ static void afl_gen_compcov(target_ulong cur_loc, TCGv arg1, TCGv arg2,
 
     if (!is_imm && afl_compcov_level < 2) return;
 
-    cur_loc = (uintptr_t)(XXH64((u8 *)&cur_loc, sizeof(uintptr_t), HASH_CONST));
+    cur_loc = (uintptr_t)(qemu_xxhash64_4((uint64_t)cur_loc, 0, 0, HASH_CONST));
     cur_loc &= (MAP_SIZE - 1);
 
     TCGv cur_loc_v = tcg_const_tl(cur_loc);