small fixes

This commit is contained in:
Alwin Berger 2022-02-27 23:15:59 +01:00
parent 5176828dbb
commit 8691c77eb2
3 changed files with 4 additions and 3 deletions

View File

@ -1,5 +1,6 @@
//! A singlethreaded QEMU fuzzer that can auto-restart. //! A singlethreaded QEMU fuzzer that can auto-restart.
use libafl::stats::SimpleStats;
use wcet_qemu_sys::sysstate::feedbacks::HitSysStateFeedback; use wcet_qemu_sys::sysstate::feedbacks::HitSysStateFeedback;
use wcet_qemu_sys::sysstate::MiniFreeRTOSSystemState; use wcet_qemu_sys::sysstate::MiniFreeRTOSSystemState;
use libafl::corpus::QueueCorpusScheduler; use libafl::corpus::QueueCorpusScheduler;
@ -73,7 +74,7 @@ use libafl_qemu::{
clock::ClockFeedback, clock::ClockFeedback,
clock::QemuClockIncreaseFeedback clock::QemuClockIncreaseFeedback
}; };
use wcet_qemu_sys::worst::{SortedFeedback,HitFeedback,HitImprovingFeedback,LenTimeMaximizerCorpusScheduler}; use wcet_qemu_sys::worst::{SortedFeedback,HitFeedback,HitImprovingFeedback,TimeStateMaximizerCorpusScheduler};
/// The fuzzer main /// The fuzzer main

View File

@ -337,7 +337,7 @@ fn fuzz(
ExitKind::Ok ExitKind::Ok
}; };
//======= Set System-State watchpoints //======= Set System-State watchpoints
let system_state_filter = QemuInstrumentationFilter::AllowList(vec![svh..svh+1,systick_handler..systick_handler+1,svc_handle..svc_handle+1]); let system_state_filter = QemuInstrumentationFilter::AllowList(vec![svh..svh+1]);
//======= Construct the executor, including the Helpers. The edges_observer still contains the ref to EDGES_MAP //======= Construct the executor, including the Helpers. The edges_observer still contains the ref to EDGES_MAP
let mut executor = QemuExecutor::new( let mut executor = QemuExecutor::new(

View File

@ -113,7 +113,7 @@ fn tcb_list_to_vec_cached(list: List_t, dump: &mut HashMap<u32,rtos_struct>) ->
fn refine_system_states(input: &mut Vec<FreeRTOSSystemStateRaw>) -> Vec<MiniFreeRTOSSystemState> { fn refine_system_states(input: &mut Vec<FreeRTOSSystemStateRaw>) -> Vec<MiniFreeRTOSSystemState> {
let mut ret = Vec::<MiniFreeRTOSSystemState>::new(); let mut ret = Vec::<MiniFreeRTOSSystemState>::new();
let mut start_tick : u64 = 0; let mut start_tick : u64 = 0;
for i in input.into_iter() { for mut i in input.drain(..) {
let mut collector = Vec::<MiniTCB>::new(); let mut collector = Vec::<MiniTCB>::new();
for j in i.prio_ready_lists.into_iter().rev() { for j in i.prio_ready_lists.into_iter().rev() {
let mut tmp = tcb_list_to_vec_cached(j,&mut i.dumping_ground).iter().map(|x| MiniTCB::from_tcb(x)).collect(); let mut tmp = tcb_list_to_vec_cached(j,&mut i.dumping_ground).iter().map(|x| MiniTCB::from_tcb(x)).collect();