diff options
| author | Dominik Maier <domenukk@gmail.com> | 2020-02-12 12:00:38 +0100 |
|---|---|---|
| committer | Dominik Maier <domenukk@gmail.com> | 2020-02-12 12:00:38 +0100 |
| commit | 5a114fd840305dff0692ccfb3c3aca0475f9ca8f (patch) | |
| tree | edb9483260e6858617cb90bab1e3c5fd952cff8d /qemu_mode/patches/cpu-exec.diff | |
| parent | 9db58da8b7be0f47209cba3b2d49247e3f1e13cf (diff) | |
| parent | 54bbddec602feef0bd4e3bdc066c50779825d178 (diff) | |
| download | afl++-5a114fd840305dff0692ccfb3c3aca0475f9ca8f.tar.gz | |
Merge branch 'master' of github.com:vanhauser-thc/AFLplusplus
Diffstat (limited to 'qemu_mode/patches/cpu-exec.diff')
| -rw-r--r-- | qemu_mode/patches/cpu-exec.diff | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/qemu_mode/patches/cpu-exec.diff b/qemu_mode/patches/cpu-exec.diff index cd35eef6..844be58c 100644 --- a/qemu_mode/patches/cpu-exec.diff +++ b/qemu_mode/patches/cpu-exec.diff @@ -1,5 +1,5 @@ diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c -index 870027d4..841ba557 100644 +index 870027d4..0bc87dfc 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -36,6 +36,8 @@ @@ -11,16 +11,7 @@ index 870027d4..841ba557 100644 /* -icount align implementation. */ typedef struct SyncClocks { -@@ -144,6 +146,8 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb) - int tb_exit; - uint8_t *tb_ptr = itb->tc.ptr; - -+ AFL_QEMU_CPU_SNIPPET2; -+ - qemu_log_mask_and_addr(CPU_LOG_EXEC, itb->pc, - "Trace %d: %p [" - TARGET_FMT_lx "/" TARGET_FMT_lx "/%#x] %s\n", -@@ -397,11 +401,13 @@ static inline TranslationBlock *tb_find(CPUState *cpu, +@@ -397,11 +399,13 @@ static inline TranslationBlock *tb_find(CPUState *cpu, TranslationBlock *tb; target_ulong cs_base, pc; uint32_t flags; @@ -34,7 +25,7 @@ index 870027d4..841ba557 100644 mmap_unlock(); /* We add the TB in the virtual pc hash table for the fast lookup */ atomic_set(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)], tb); -@@ -418,6 +424,10 @@ static inline TranslationBlock *tb_find(CPUState *cpu, +@@ -418,6 +422,10 @@ static inline TranslationBlock *tb_find(CPUState *cpu, /* See if we can patch the calling TB. */ if (last_tb) { tb_add_jump(last_tb, tb_exit, tb); |