From cd7e234445c859eb0a88b75a0e3a8fb5b8d4b38e Mon Sep 17 00:00:00 2001 From: Andrea Fioraldi Date: Wed, 18 Mar 2020 21:07:31 +0100 Subject: try to fix regression due to rtn cmplog --- qemu_mode/patches/afl-qemu-tcg-runtime-inl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qemu_mode/patches/afl-qemu-tcg-runtime-inl.h') diff --git a/qemu_mode/patches/afl-qemu-tcg-runtime-inl.h b/qemu_mode/patches/afl-qemu-tcg-runtime-inl.h index 04fcde4e..52444c20 100644 --- a/qemu_mode/patches/afl-qemu-tcg-runtime-inl.h +++ b/qemu_mode/patches/afl-qemu-tcg-runtime-inl.h @@ -171,7 +171,7 @@ static int area_is_mapped(void *ptr, size_t len) { } -void HELPER(afl_cmplog_rtn)(CPUX86State *env) { +void HELPER(afl_cmplog_rtn)(CPUArchState *env) { #if defined(TARGET_X86_64) -- cgit 1.4.1 From 2e4fda6d4cc9ec40f81f5a72b874281efa714188 Mon Sep 17 00:00:00 2001 From: Andrea Fioraldi Date: Wed, 18 Mar 2020 21:18:55 +0100 Subject: fix #261 --- qemu_mode/patches/afl-qemu-tcg-runtime-inl.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'qemu_mode/patches/afl-qemu-tcg-runtime-inl.h') diff --git a/qemu_mode/patches/afl-qemu-tcg-runtime-inl.h b/qemu_mode/patches/afl-qemu-tcg-runtime-inl.h index 52444c20..b7cd71bb 100644 --- a/qemu_mode/patches/afl-qemu-tcg-runtime-inl.h +++ b/qemu_mode/patches/afl-qemu-tcg-runtime-inl.h @@ -199,7 +199,12 @@ void HELPER(afl_cmplog_rtn)(CPUArchState *env) { if (!area_is_mapped(ptr1, 32) || !area_is_mapped(ptr2, 32)) return; +#if defined(TARGET_X86_64) || defined(TARGET_I386) uintptr_t k = (uintptr_t)env->eip; +#else + uintptr_t k = 0; +#endif + k = (k >> 4) ^ (k << 8); k &= CMP_MAP_W - 1; -- cgit 1.4.1