From cf87895aaa8b0f344e026c6f1b43adbf7cacf96b Mon Sep 17 00:00:00 2001 From: "Dongjia \"toka\" Zhang" Date: Wed, 18 Sep 2024 14:48:53 +0200 Subject: [PATCH] Change qemu signature (again) (#2529) --- libafl_qemu/src/modules/calls.rs | 4 ++-- libafl_qemu/src/modules/cmplog.rs | 6 +++--- libafl_qemu/src/modules/edges.rs | 6 +++--- libafl_qemu/src/modules/mod.rs | 12 ++++++------ libafl_qemu/src/modules/usermode/asan.rs | 6 +++--- libafl_qemu/src/modules/usermode/asan_guest.rs | 2 +- libafl_qemu/src/modules/usermode/drcov.rs | 4 ++-- libafl_qemu/src/modules/usermode/injections.rs | 2 +- libafl_qemu/src/modules/usermode/snapshot.rs | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libafl_qemu/src/modules/calls.rs b/libafl_qemu/src/modules/calls.rs index 773f6afeff..5d4fd30ef4 100644 --- a/libafl_qemu/src/modules/calls.rs +++ b/libafl_qemu/src/modules/calls.rs @@ -414,9 +414,9 @@ where fn pre_exec( &mut self, + _state: &mut S, emulator_modules: &mut EmulatorModules, input: &S::Input, - _state: &mut S, ) where ET: EmulatorModuleTuple, { @@ -428,10 +428,10 @@ where fn post_exec( &mut self, + _state: &mut S, emulator_modules: &mut EmulatorModules, input: &S::Input, observers: &mut OT, - _state: &mut S, exit_kind: &mut ExitKind, ) where OT: ObserversTuple, diff --git a/libafl_qemu/src/modules/cmplog.rs b/libafl_qemu/src/modules/cmplog.rs index 03c0d0edda..165eb86fca 100644 --- a/libafl_qemu/src/modules/cmplog.rs +++ b/libafl_qemu/src/modules/cmplog.rs @@ -81,7 +81,7 @@ impl EmulatorModule for CmpLogModule where S: Unpin + UsesInput + HasMetadata, { - fn first_exec(&mut self, emulator_modules: &mut EmulatorModules, _state: &mut S) + fn first_exec(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules) where ET: EmulatorModuleTuple, { @@ -124,7 +124,7 @@ where { const HOOKS_DO_SIDE_EFFECTS: bool = false; - fn first_exec(&mut self, emulator_modules: &mut EmulatorModules, _state: &mut S) + fn first_exec(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules) where ET: EmulatorModuleTuple, { @@ -363,7 +363,7 @@ impl EmulatorModule for CmpLogRoutinesModule where S: Unpin + UsesInput, { - fn first_exec(&mut self, emulator_modules: &mut EmulatorModules, _state: &mut S) + fn first_exec(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules) where ET: EmulatorModuleTuple, { diff --git a/libafl_qemu/src/modules/edges.rs b/libafl_qemu/src/modules/edges.rs index f7b96031c7..28a7d8e6c8 100644 --- a/libafl_qemu/src/modules/edges.rs +++ b/libafl_qemu/src/modules/edges.rs @@ -157,7 +157,7 @@ impl EmulatorModule for EdgeCoverageModule where S: Unpin + UsesInput + HasMetadata, { - fn first_exec(&mut self, emulator_modules: &mut EmulatorModules, _state: &mut S) + fn first_exec(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules) where ET: EmulatorModuleTuple, { @@ -308,7 +308,7 @@ where { const HOOKS_DO_SIDE_EFFECTS: bool = false; - fn first_exec(&mut self, emulator_modules: &mut EmulatorModules, _state: &mut S) + fn first_exec(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules) where ET: EmulatorModuleTuple, { @@ -454,7 +454,7 @@ where { const HOOKS_DO_SIDE_EFFECTS: bool = false; - fn first_exec(&mut self, emulator_modules: &mut EmulatorModules, _state: &mut S) + fn first_exec(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules) where ET: EmulatorModuleTuple, { diff --git a/libafl_qemu/src/modules/mod.rs b/libafl_qemu/src/modules/mod.rs index 57a1623b6f..1ead41c795 100644 --- a/libafl_qemu/src/modules/mod.rs +++ b/libafl_qemu/src/modules/mod.rs @@ -48,7 +48,7 @@ where { } - fn first_exec(&mut self, _emulator_modules: &mut EmulatorModules, _state: &mut S) + fn first_exec(&mut self, _state: &mut S, _emulator_modules: &mut EmulatorModules) where ET: EmulatorModuleTuple, { @@ -56,9 +56,9 @@ where fn pre_exec( &mut self, + _state: &mut S, _emulator_modules: &mut EmulatorModules, _input: &S::Input, - _state: &mut S, ) where ET: EmulatorModuleTuple, { @@ -66,10 +66,10 @@ where fn post_exec( &mut self, + _state: &mut S, _emulator_modules: &mut EmulatorModules, _input: &S::Input, _observers: &mut OT, - _state: &mut S, _exit_kind: &mut ExitKind, ) where OT: ObserversTuple, @@ -178,7 +178,7 @@ where where ET: EmulatorModuleTuple, { - self.0.first_exec(emulator_modules, state); + self.0.first_exec(state, emulator_modules); self.1.first_exec_all(emulator_modules, state); } @@ -190,7 +190,7 @@ where ) where ET: EmulatorModuleTuple, { - self.0.pre_exec(emulator_modules, input, state); + self.0.pre_exec(state, emulator_modules, input); self.1.pre_exec_all(emulator_modules, input, state); } @@ -206,7 +206,7 @@ where ET: EmulatorModuleTuple, { self.0 - .post_exec(emulator_modules, input, observers, state, exit_kind); + .post_exec(state, emulator_modules, input, observers, exit_kind); self.1 .post_exec_all(emulator_modules, input, observers, state, exit_kind); } diff --git a/libafl_qemu/src/modules/usermode/asan.rs b/libafl_qemu/src/modules/usermode/asan.rs index ff010dea1a..15f356f380 100644 --- a/libafl_qemu/src/modules/usermode/asan.rs +++ b/libafl_qemu/src/modules/usermode/asan.rs @@ -940,7 +940,7 @@ where } } - fn first_exec(&mut self, emulator_modules: &mut EmulatorModules, _state: &mut S) + fn first_exec(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules) where ET: EmulatorModuleTuple, { @@ -977,9 +977,9 @@ where fn pre_exec( &mut self, + _state: &mut S, emulator_modules: &mut EmulatorModules, _input: &S::Input, - _state: &mut S, ) where ET: EmulatorModuleTuple, { @@ -991,10 +991,10 @@ where fn post_exec( &mut self, + _state: &mut S, emulator_modules: &mut EmulatorModules, _input: &S::Input, _observers: &mut OT, - _state: &mut S, exit_kind: &mut ExitKind, ) where OT: ObserversTuple, diff --git a/libafl_qemu/src/modules/usermode/asan_guest.rs b/libafl_qemu/src/modules/usermode/asan_guest.rs index 3528527210..bfb05a4ef0 100644 --- a/libafl_qemu/src/modules/usermode/asan_guest.rs +++ b/libafl_qemu/src/modules/usermode/asan_guest.rs @@ -273,7 +273,7 @@ impl EmulatorModule for AsanGuestModule where S: Unpin + UsesInput, { - fn first_exec(&mut self, emulator_modules: &mut EmulatorModules, _state: &mut S) + fn first_exec(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules) where ET: EmulatorModuleTuple, S: Unpin + UsesInput, diff --git a/libafl_qemu/src/modules/usermode/drcov.rs b/libafl_qemu/src/modules/usermode/drcov.rs index e3786802b3..2755560ac9 100644 --- a/libafl_qemu/src/modules/usermode/drcov.rs +++ b/libafl_qemu/src/modules/usermode/drcov.rs @@ -100,7 +100,7 @@ where ); } - fn first_exec(&mut self, emulator_modules: &mut EmulatorModules, _state: &mut S) + fn first_exec(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules) where ET: EmulatorModuleTuple, { @@ -121,10 +121,10 @@ where fn post_exec( &mut self, + _state: &mut S, _emulator_modules: &mut EmulatorModules, _input: &S::Input, _observers: &mut OT, - _state: &mut S, _exit_kind: &mut ExitKind, ) where OT: ObserversTuple, diff --git a/libafl_qemu/src/modules/usermode/injections.rs b/libafl_qemu/src/modules/usermode/injections.rs index 58de1ff3fd..dcc6fc0c9f 100644 --- a/libafl_qemu/src/modules/usermode/injections.rs +++ b/libafl_qemu/src/modules/usermode/injections.rs @@ -267,7 +267,7 @@ where emulator_modules.syscalls(Hook::Function(syscall_hook::)); } - fn first_exec(&mut self, emulator_modules: &mut EmulatorModules, _state: &mut S) + fn first_exec(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules) where ET: EmulatorModuleTuple, { diff --git a/libafl_qemu/src/modules/usermode/snapshot.rs b/libafl_qemu/src/modules/usermode/snapshot.rs index da126bca2f..ff5bbbe777 100644 --- a/libafl_qemu/src/modules/usermode/snapshot.rs +++ b/libafl_qemu/src/modules/usermode/snapshot.rs @@ -691,9 +691,9 @@ where fn pre_exec( &mut self, + _state: &mut S, emulator_modules: &mut EmulatorModules, _input: &S::Input, - _state: &mut S, ) where ET: EmulatorModuleTuple, {