From 3444fdd8ecacee879082bd373648b44cf7f4137b Mon Sep 17 00:00:00 2001
From: Alwin Berger <alwin.berger@tu-dortmund.de>
Date: Tue, 21 May 2024 12:32:00 +0200
Subject: [PATCH] fix interrupt shifter, isr tracer

---
 fuzzers/FRET/src/mutational.rs            | 2 +-
 fuzzers/FRET/src/systemstate/observers.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fuzzers/FRET/src/mutational.rs b/fuzzers/FRET/src/mutational.rs
index c0a73f15ac..b273c45bf8 100644
--- a/fuzzers/FRET/src/mutational.rs
+++ b/fuzzers/FRET/src/mutational.rs
@@ -83,7 +83,7 @@ where
                             t[j]=target_bytes[i*4+j];
                         }
                         if i == 0 || true {
-                            start_tick = u32::from_le_bytes(t)+FIRST_INT;
+                            start_tick = u32::saturating_add(u32::from_le_bytes(t),FIRST_INT);
                         } else {
                             start_tick = u32::saturating_add(start_tick,max(MINIMUM_INTER_ARRIVAL_TIME,u32::from_le_bytes(t)));
                         }
diff --git a/fuzzers/FRET/src/systemstate/observers.rs b/fuzzers/FRET/src/systemstate/observers.rs
index d303e6cffc..03e4771d68 100644
--- a/fuzzers/FRET/src/systemstate/observers.rs
+++ b/fuzzers/FRET/src/systemstate/observers.rs
@@ -298,7 +298,7 @@ fn add_abb_info(trace: &mut Vec<ExecInterval>, table: &HashMap<u64, ReducedFreeR
                                 if let Some(last) = open_abb_at_this_task_or_level.get(&(trace[i].level, if trace[i].level<2 {&curr_name} else {trace[i].start_capture.1.as_str()})) {
                                     wip_abb_trace.push(wip_abb_trace[*last].clone());
                                 } else {
-                                    wip_abb_trace.push(Rc::new(RefCell::new(AtomicBasicBlock{start: edges[i].1.unwrap(), ends: HashSet::new(), level: if trace[i].level<2 {trace[i].level} else {2}})))
+                                    wip_abb_trace.push(Rc::new(RefCell::new(AtomicBasicBlock{start: edges[i].1.unwrap_or(0), ends: HashSet::new(), level: if trace[i].level<2 {trace[i].level} else {2}})))
                                 }
                             } else {
                                 // generic case, continue a preempted block