From fc4b72274e9ae698b51385392f8065d2fb6e91cc Mon Sep 17 00:00:00 2001
From: Alwin Berger <alwin.berger@tu-dortmund.de>
Date: Fri, 8 Apr 2022 00:53:05 +0200
Subject: [PATCH] remember branches from app to os

---
 fuzzers/wcet_qemu_sys/src/sysstate/helpers.rs | 4 ++--
 libafl_qemu/src/edges.rs                      | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fuzzers/wcet_qemu_sys/src/sysstate/helpers.rs b/fuzzers/wcet_qemu_sys/src/sysstate/helpers.rs
index 30c4b4fa52..8b80ce6f86 100644
--- a/fuzzers/wcet_qemu_sys/src/sysstate/helpers.rs
+++ b/fuzzers/wcet_qemu_sys/src/sysstate/helpers.rs
@@ -103,7 +103,7 @@ where
     sysstate.current_tcb = freertos::emu_lookup::lookup(emulator,curr_tcb_addr);
 
     unsafe {
-        match SAVED_JUMP {
+        match SAVED_JUMP.take() {
             Some(s) => {
                 let meta = state
                     .metadata_mut()
@@ -112,7 +112,7 @@ where
                 for (k,v) in meta.map.iter() {
                     if *v==s {
                         // println!("Jump Saved {:x}",k.1);
-                        sysstate.last_pc = Some(k.1);   /* Currently save APP entry points */
+                        sysstate.last_pc = Some(k.0);   /* Currently save APP entry points */
                         break;
                     }
                 }
diff --git a/libafl_qemu/src/edges.rs b/libafl_qemu/src/edges.rs
index 545d337470..aa2e0c79ba 100644
--- a/libafl_qemu/src/edges.rs
+++ b/libafl_qemu/src/edges.rs
@@ -64,10 +64,12 @@ impl QemuEdgeCoverageHelper {
         match &self.app_range {
             None => false,
             Some(s) => {
-                // println!("must_save {} {:x} {:x}",s.contains(&src) != s.contains(&dst),src,dst);
-                // s.contains(&src) && !s.contains(&dst)
+                // if src != 0 {
+                //     println!("must_save {} {:x} {:x}",s.contains(&src) && !s.contains(&dst),src,dst);
+                // }
+                s.contains(&src) && !s.contains(&dst)
                 // println!("must_save {} {:x} {:x}",src==0&&dst!=0x9cc,src,dst);
-                src==0&&dst!=0x9cc
+                // src==0&&dst!=0x9cc
             },
         }
     }