SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change qemu signature (again) (#2529)

Browse Source
This commit is contained in:
Dongjia "toka" Zhang 2024-09-18 14:48:53 +02:00 committed by GitHub
parent 4c5df53c6d
commit cf87895aaa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libafl_qemu/src/modules/calls.rs
View File

@ -414,9 +414,9 @@ where
fn pre_exec<ET>( fn pre_exec<ET>(
&mut self, &mut self,
_state: &mut S,
emulator_modules: &mut EmulatorModules<ET, S>, emulator_modules: &mut EmulatorModules<ET, S>,
input: &S::Input, input: &S::Input,
_state: &mut S,
) where ) where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
@ -428,10 +428,10 @@ where
fn post_exec<OT, ET>( fn post_exec<OT, ET>(
&mut self, &mut self,
_state: &mut S,
emulator_modules: &mut EmulatorModules<ET, S>, emulator_modules: &mut EmulatorModules<ET, S>,
input: &S::Input, input: &S::Input,
observers: &mut OT, observers: &mut OT,
_state: &mut S,
exit_kind: &mut ExitKind, exit_kind: &mut ExitKind,
) where ) where
OT: ObserversTuple<S>, OT: ObserversTuple<S>,

6
libafl_qemu/src/modules/cmplog.rs
View File

@ -81,7 +81,7 @@ impl<S> EmulatorModule<S> for CmpLogModule
where where
S: Unpin + UsesInput + HasMetadata, S: Unpin + UsesInput + HasMetadata,
{ {
fn first_exec<ET>(&mut self, emulator_modules: &mut EmulatorModules<ET, S>, _state: &mut S) fn first_exec<ET>(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules<ET, S>)
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
@ -124,7 +124,7 @@ where
{ {
const HOOKS_DO_SIDE_EFFECTS: bool = false; const HOOKS_DO_SIDE_EFFECTS: bool = false;
fn first_exec<ET>(&mut self, emulator_modules: &mut EmulatorModules<ET, S>, _state: &mut S) fn first_exec<ET>(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules<ET, S>)
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
@ -363,7 +363,7 @@ impl<S> EmulatorModule<S> for CmpLogRoutinesModule
where where
S: Unpin + UsesInput, S: Unpin + UsesInput,
{ {
fn first_exec<ET>(&mut self, emulator_modules: &mut EmulatorModules<ET, S>, _state: &mut S) fn first_exec<ET>(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules<ET, S>)
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {

6
libafl_qemu/src/modules/edges.rs
View File

@ -157,7 +157,7 @@ impl<S> EmulatorModule<S> for EdgeCoverageModule
where where
S: Unpin + UsesInput + HasMetadata, S: Unpin + UsesInput + HasMetadata,
{ {
fn first_exec<ET>(&mut self, emulator_modules: &mut EmulatorModules<ET, S>, _state: &mut S) fn first_exec<ET>(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules<ET, S>)
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
@ -308,7 +308,7 @@ where
{ {
const HOOKS_DO_SIDE_EFFECTS: bool = false; const HOOKS_DO_SIDE_EFFECTS: bool = false;
fn first_exec<ET>(&mut self, emulator_modules: &mut EmulatorModules<ET, S>, _state: &mut S) fn first_exec<ET>(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules<ET, S>)
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
@ -454,7 +454,7 @@ where
{ {
const HOOKS_DO_SIDE_EFFECTS: bool = false; const HOOKS_DO_SIDE_EFFECTS: bool = false;
fn first_exec<ET>(&mut self, emulator_modules: &mut EmulatorModules<ET, S>, _state: &mut S) fn first_exec<ET>(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules<ET, S>)
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {

12
libafl_qemu/src/modules/mod.rs
View File

@ -48,7 +48,7 @@ where
{ {
} }
fn first_exec<ET>(&mut self, _emulator_modules: &mut EmulatorModules<ET, S>, _state: &mut S) fn first_exec<ET>(&mut self, _state: &mut S, _emulator_modules: &mut EmulatorModules<ET, S>)
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
@ -56,9 +56,9 @@ where
fn pre_exec<ET>( fn pre_exec<ET>(
&mut self, &mut self,
_state: &mut S,
_emulator_modules: &mut EmulatorModules<ET, S>, _emulator_modules: &mut EmulatorModules<ET, S>,
_input: &S::Input, _input: &S::Input,
_state: &mut S,
) where ) where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
@ -66,10 +66,10 @@ where
fn post_exec<OT, ET>( fn post_exec<OT, ET>(
&mut self, &mut self,
_state: &mut S,
_emulator_modules: &mut EmulatorModules<ET, S>, _emulator_modules: &mut EmulatorModules<ET, S>,
_input: &S::Input, _input: &S::Input,
_observers: &mut OT, _observers: &mut OT,
_state: &mut S,
_exit_kind: &mut ExitKind, _exit_kind: &mut ExitKind,
) where ) where
OT: ObserversTuple<S>, OT: ObserversTuple<S>,
@ -178,7 +178,7 @@ where
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
self.0.first_exec(emulator_modules, state); self.0.first_exec(state, emulator_modules);
self.1.first_exec_all(emulator_modules, state); self.1.first_exec_all(emulator_modules, state);
} }
@ -190,7 +190,7 @@ where
) where ) where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
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); self.1.pre_exec_all(emulator_modules, input, state);
} }
@ -206,7 +206,7 @@ where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
self.0 self.0
.post_exec(emulator_modules, input, observers, state, exit_kind); .post_exec(state, emulator_modules, input, observers, exit_kind);
self.1 self.1
.post_exec_all(emulator_modules, input, observers, state, exit_kind); .post_exec_all(emulator_modules, input, observers, state, exit_kind);
} }

6
libafl_qemu/src/modules/usermode/asan.rs
View File

@ -940,7 +940,7 @@ where
} }
} }
fn first_exec<ET>(&mut self, emulator_modules: &mut EmulatorModules<ET, S>, _state: &mut S) fn first_exec<ET>(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules<ET, S>)
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
@ -977,9 +977,9 @@ where
fn pre_exec<ET>( fn pre_exec<ET>(
&mut self, &mut self,
_state: &mut S,
emulator_modules: &mut EmulatorModules<ET, S>, emulator_modules: &mut EmulatorModules<ET, S>,
_input: &S::Input, _input: &S::Input,
_state: &mut S,
) where ) where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
@ -991,10 +991,10 @@ where
fn post_exec<OT, ET>( fn post_exec<OT, ET>(
&mut self, &mut self,
_state: &mut S,
emulator_modules: &mut EmulatorModules<ET, S>, emulator_modules: &mut EmulatorModules<ET, S>,
_input: &S::Input, _input: &S::Input,
_observers: &mut OT, _observers: &mut OT,
_state: &mut S,
exit_kind: &mut ExitKind, exit_kind: &mut ExitKind,
) where ) where
OT: ObserversTuple<S>, OT: ObserversTuple<S>,

2
libafl_qemu/src/modules/usermode/asan_guest.rs
View File

@ -273,7 +273,7 @@ impl<S> EmulatorModule<S> for AsanGuestModule
where where
S: Unpin + UsesInput, S: Unpin + UsesInput,
{ {
fn first_exec<ET>(&mut self, emulator_modules: &mut EmulatorModules<ET, S>, _state: &mut S) fn first_exec<ET>(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules<ET, S>)
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
S: Unpin + UsesInput, S: Unpin + UsesInput,

4
libafl_qemu/src/modules/usermode/drcov.rs
View File

@ -100,7 +100,7 @@ where
); );
} }
fn first_exec<ET>(&mut self, emulator_modules: &mut EmulatorModules<ET, S>, _state: &mut S) fn first_exec<ET>(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules<ET, S>)
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {
@ -121,10 +121,10 @@ where
fn post_exec<OT, ET>( fn post_exec<OT, ET>(
&mut self, &mut self,
_state: &mut S,
_emulator_modules: &mut EmulatorModules<ET, S>, _emulator_modules: &mut EmulatorModules<ET, S>,
_input: &S::Input, _input: &S::Input,
_observers: &mut OT, _observers: &mut OT,
_state: &mut S,
_exit_kind: &mut ExitKind, _exit_kind: &mut ExitKind,
) where ) where
OT: ObserversTuple<S>, OT: ObserversTuple<S>,

2
libafl_qemu/src/modules/usermode/injections.rs
View File

@ -267,7 +267,7 @@ where
emulator_modules.syscalls(Hook::Function(syscall_hook::<ET, S>)); emulator_modules.syscalls(Hook::Function(syscall_hook::<ET, S>));
} }
fn first_exec<ET>(&mut self, emulator_modules: &mut EmulatorModules<ET, S>, _state: &mut S) fn first_exec<ET>(&mut self, _state: &mut S, emulator_modules: &mut EmulatorModules<ET, S>)
where where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {

2
libafl_qemu/src/modules/usermode/snapshot.rs
View File

@ -691,9 +691,9 @@ where
fn pre_exec<ET>( fn pre_exec<ET>(
&mut self, &mut self,
_state: &mut S,
emulator_modules: &mut EmulatorModules<ET, S>, emulator_modules: &mut EmulatorModules<ET, S>,
_input: &S::Input, _input: &S::Input,
_state: &mut S,
) where ) where
ET: EmulatorModuleTuple<S>, ET: EmulatorModuleTuple<S>,
{ {