|
2 | 2 | // Licensed under the MIT License. |
3 | 3 |
|
4 | 4 | use chrono::DateTime; |
5 | | -#[cfg(feature = "intel_instructions")] |
6 | | -use iced_x86::{Code as IntelInstructionCode, Mnemonic as IntelInstructionMnemonic}; |
7 | 5 | use serde::{Deserialize, Serialize}; |
8 | 6 | use std::fmt; |
9 | 7 | use std::sync::{LockResult, RwLockReadGuard, RwLockWriteGuard}; |
@@ -135,33 +133,6 @@ pub enum EventData { |
135 | 133 | ToolName(String), |
136 | 134 | Region(String), |
137 | 135 | Role(Role), |
138 | | - InputsFuzzed(u64), |
139 | | - SatConstraints(u64), |
140 | | - UnsatConstraints(u64), |
141 | | - AverageVarsPerConstraint(u64), |
142 | | - MaxConstraintVars(u64), |
143 | | - AverageSymexTime(f64), |
144 | | - MaxSymexTime(u64), |
145 | | - AverageSolvingTime(f64), |
146 | | - MaxSolvingTime(u64), |
147 | | - UniqueCodeLocationCount(u64), |
148 | | - AverageInstructionsExecuted(f64), |
149 | | - MaxInstructionsExecuted(u64), |
150 | | - AverageTaintedInstructions(f64), |
151 | | - MaxTaintedInstructions(u64), |
152 | | - AverageMemoryTaintedInstructions(f64), |
153 | | - MaxMemoryTaintedInstructions(u64), |
154 | | - AveragePathLength(f64), |
155 | | - MaxPathLength(u64), |
156 | | - DivergenceRate(f64), |
157 | | - DivergencePathLength(u32), |
158 | | - DivergencePathExpectedIndex(u32), |
159 | | - DivergencePathActualIndex(u32), |
160 | | - #[cfg(feature = "intel_instructions")] |
161 | | - MissedInstructionCode(IntelInstructionCode), |
162 | | - #[cfg(feature = "intel_instructions")] |
163 | | - MissedInstructionMnemonic(IntelInstructionMnemonic), |
164 | | - SymexTimeout(u64), |
165 | 136 | } |
166 | 137 |
|
167 | 138 | impl EventData { |
@@ -199,43 +170,6 @@ impl EventData { |
199 | 170 | Self::ToolName(x) => ("tool_name", x.to_owned()), |
200 | 171 | Self::Region(x) => ("region", x.to_owned()), |
201 | 172 | Self::Role(x) => ("role", x.as_str().to_owned()), |
202 | | - #[cfg(feature = "intel_instructions")] |
203 | | - Self::MissedInstructionCode(x) => ("missed_instruction_code", format!("{:?}", x)), |
204 | | - #[cfg(feature = "intel_instructions")] |
205 | | - Self::MissedInstructionMnemonic(x) => { |
206 | | - ("missed_instruction_mnemonic", format!("{:?}", x)) |
207 | | - } |
208 | | - Self::InputsFuzzed(x) => ("inputs_fuzzed", x.to_string()), |
209 | | - Self::SatConstraints(x) => ("sat_constraints", x.to_string()), |
210 | | - Self::UnsatConstraints(x) => ("unsat_constraints", x.to_string()), |
211 | | - Self::AverageVarsPerConstraint(x) => ("average_vars_per_constraint", x.to_string()), |
212 | | - Self::MaxConstraintVars(x) => ("max_constraint_vars", x.to_string()), |
213 | | - Self::AverageSymexTime(x) => ("average_symex_time", x.to_string()), |
214 | | - Self::MaxSymexTime(x) => ("max_symex_time", x.to_string()), |
215 | | - Self::AverageSolvingTime(x) => ("average_solving_time", x.to_string()), |
216 | | - Self::MaxSolvingTime(x) => ("max_solving_time", x.to_string()), |
217 | | - Self::UniqueCodeLocationCount(x) => ("unique_code_locations_count", x.to_string()), |
218 | | - Self::AverageInstructionsExecuted(x) => { |
219 | | - ("average_instructions_executed", x.to_string()) |
220 | | - } |
221 | | - Self::MaxInstructionsExecuted(x) => ("max_instructions_executed", x.to_string()), |
222 | | - Self::AverageTaintedInstructions(x) => ("average_tainted_instructions", x.to_string()), |
223 | | - Self::MaxTaintedInstructions(x) => ("max_tainted_instructions", x.to_string()), |
224 | | - Self::AverageMemoryTaintedInstructions(x) => { |
225 | | - ("average_memory_tainted_instructions", x.to_string()) |
226 | | - } |
227 | | - Self::MaxMemoryTaintedInstructions(x) => { |
228 | | - ("max_memory_tainted_instructions", x.to_string()) |
229 | | - } |
230 | | - Self::AveragePathLength(x) => ("average_path_length", x.to_string()), |
231 | | - Self::MaxPathLength(x) => ("max_path_length", x.to_string()), |
232 | | - Self::DivergenceRate(x) => ("divergence_rate", x.to_string()), |
233 | | - Self::DivergencePathLength(x) => ("divergence_path_length", x.to_string()), |
234 | | - Self::DivergencePathExpectedIndex(x) => { |
235 | | - ("divergence_path_expected_index", x.to_string()) |
236 | | - } |
237 | | - Self::DivergencePathActualIndex(x) => ("divergence_path_actual_index", x.to_string()), |
238 | | - Self::SymexTimeout(x) => ("symex_timeout", x.to_string()), |
239 | 173 | } |
240 | 174 | } |
241 | 175 |
|
@@ -273,33 +207,6 @@ impl EventData { |
273 | 207 | Self::ToolName(_) => true, |
274 | 208 | Self::Region(_) => false, |
275 | 209 | Self::Role(_) => true, |
276 | | - Self::InputsFuzzed(_) => true, |
277 | | - Self::SatConstraints(_) => true, |
278 | | - Self::UnsatConstraints(_) => true, |
279 | | - Self::AverageVarsPerConstraint(_) => true, |
280 | | - Self::MaxConstraintVars(_) => true, |
281 | | - Self::AverageSymexTime(_) => true, |
282 | | - Self::MaxSymexTime(_) => true, |
283 | | - Self::AverageSolvingTime(_) => true, |
284 | | - Self::MaxSolvingTime(_) => true, |
285 | | - Self::UniqueCodeLocationCount(_) => true, |
286 | | - Self::AverageInstructionsExecuted(_) => true, |
287 | | - Self::MaxInstructionsExecuted(_) => true, |
288 | | - Self::AverageTaintedInstructions(_) => true, |
289 | | - Self::MaxTaintedInstructions(_) => true, |
290 | | - Self::AverageMemoryTaintedInstructions(_) => true, |
291 | | - Self::MaxMemoryTaintedInstructions(_) => true, |
292 | | - Self::AveragePathLength(_) => true, |
293 | | - Self::MaxPathLength(_) => true, |
294 | | - Self::DivergenceRate(_) => true, |
295 | | - Self::DivergencePathLength(_) => true, |
296 | | - Self::DivergencePathExpectedIndex(_) => true, |
297 | | - Self::DivergencePathActualIndex(_) => true, |
298 | | - #[cfg(feature = "intel_instructions")] |
299 | | - Self::MissedInstructionCode(_) => true, |
300 | | - #[cfg(feature = "intel_instructions")] |
301 | | - Self::MissedInstructionMnemonic(_) => true, |
302 | | - Self::SymexTimeout(_) => true, |
303 | 210 | } |
304 | 211 | } |
305 | 212 | } |
|
0 commit comments