Remove std use from ppc flow analysis

Author: stravant

objdiff-core/src/arch/ppc/flow_analysis.rs

@@ -5,9 +5,9 @@ use crate::{
 };
 use itertools::Itertools;
 use ppc750cl::Simm;
-use std::collections::BTreeMap;
-use std::ffi::CStr;
-use std::ops::{Index, IndexMut};
+use alloc::collections::{BTreeMap, BTreeSet};
+use core::ffi::CStr;
+use core::ops::{Index, IndexMut};
 
 fn is_store_instruction(op: ppc750cl::Opcode) -> bool {
     use ppc750cl::Opcode;
@@ -59,7 +59,7 @@ pub fn guess_data_type_from_load_store_inst_op(inst_op: ppc750cl::Opcode) -> Opt
     }
 }
 
-#[derive(Default, PartialEq, Eq, Copy, Hash, Clone, Debug)]
+#[derive(Default, PartialEq, Eq, Copy, Clone, Debug, PartialOrd, Ord)]
 enum RegisterContent {
     #[default]
     Unknown,
@@ -71,8 +71,8 @@ enum RegisterContent {
     Symbol(usize),
 }
 
-impl std::fmt::Display for RegisterContent {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+impl core::fmt::Display for RegisterContent {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         match self {
             RegisterContent::Unknown => write!(f, "unknown"),
             RegisterContent::Variable => write!(f, "variable"),
@@ -93,7 +93,7 @@ impl std::fmt::Display for RegisterContent {
     }
 }
 
-#[derive(Clone, PartialEq, Eq, Hash)]
+#[derive(Clone, PartialEq, Eq, Ord, PartialOrd)]
 struct RegisterState {
     gpr: [RegisterContent; 32],
     fpr: [RegisterContent; 32],
@@ -380,8 +380,7 @@ pub fn ppc_data_flow_analysis(
     relocations: &[Relocation],
 ) -> Box<dyn FlowAnalysisResult> {
     use ppc750cl::InsIter;
-    use std::collections::HashSet;
-    use std::collections::VecDeque;
+    use alloc::collections::VecDeque;
     let instructions = InsIter::new(code, func_symbol.address as u32)
         .map(|(_addr, ins)| (ins.op, ins.basic().args))
         .collect_vec();
@@ -397,7 +396,7 @@ pub fn ppc_data_flow_analysis(
 
     // Execute the instructions against abstract data
     let mut failsafe_counter = 0;
-    let mut taken_branches = HashSet::<(usize, RegisterState)>::new();
+    let mut taken_branches = BTreeSet::<(usize, RegisterState)>::new();
     let mut register_state_at = Vec::<RegisterState>::new();
     let mut completed_first_pass = false;
     register_state_at.resize_with(instructions.len(), RegisterState::new);

objdiff-core/src/arch/ppc/mod.rs

@@ -662,7 +662,7 @@ fn make_fake_pool_reloc(
 // and returns a Vec of "fake pool relocations" that simulate what a relocation for that instruction
 // would look like if data hadn't been pooled.
 // This method tries to follow the function's proper control flow. It keeps track of a queue of
-// states it hasn't traversed yet, where each state holds an instruction address and a HashMap of
+// states it hasn't traversed yet, where each state holds an instruction address and a map of
 // which registers hold which pool relocations at that point.
 // When a conditional or unconditional branch is encountered, the destination of the branch is added
 // to the queue. Conditional branches will traverse both the path where the branch is taken and the

objdiff-core/src/obj/mod.rs

@@ -13,7 +13,6 @@ use core::{
     fmt,
     num::{NonZeroU32, NonZeroU64},
 };
-use std::collections::HashMap;
 
 use flagset::{FlagSet, flags};
 
@@ -270,7 +269,7 @@ pub struct Object {
     pub path: Option<std::path::PathBuf>,
     #[cfg(feature = "std")]
     pub timestamp: Option<filetime::FileTime>,
-    pub flow_analysis_results: HashMap<u64, Box<dyn FlowAnalysisResult>>,
+    pub flow_analysis_results: BTreeMap<u64, Box<dyn FlowAnalysisResult>>,
 }
 
 impl Default for Object {
@@ -285,7 +284,7 @@ impl Default for Object {
             path: None,
             #[cfg(feature = "std")]
             timestamp: None,
-            flow_analysis_results: HashMap::<u64, Box<dyn FlowAnalysisResult>>::new(),
+            flow_analysis_results: BTreeMap::<u64, Box<dyn FlowAnalysisResult>>::new(),
         }
     }
 }

objdiff-core/src/util.rs

@@ -5,8 +5,6 @@ use anyhow::{Result, ensure};
 use num_traits::PrimInt;
 use object::{Endian, Object};
 
-use std::hash::{Hash, Hasher};
-
 // https://stackoverflow.com/questions/44711012/how-do-i-format-a-signed-integer-to-a-sign-aware-hexadecimal-representation
 pub struct ReallySigned<N: PrimInt>(pub N);
 
@@ -72,9 +70,14 @@ impl PartialEq for RawFloat {
     }
 }
 impl Eq for RawFloat {}
-impl Hash for RawFloat {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.0.to_bits().hash(state)
+impl Ord for RawFloat {
+    fn cmp(&self, other: &Self) -> core::cmp::Ordering {
+        self.0.to_bits().cmp(&other.0.to_bits())
+    }
+}
+impl PartialOrd for RawFloat {
+    fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
+        Some(self.cmp(other))
     }
 }
 
@@ -88,8 +91,13 @@ impl PartialEq for RawDouble {
     }
 }
 impl Eq for RawDouble {}
-impl Hash for RawDouble {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.0.to_bits().hash(state)
+impl Ord for RawDouble {
+    fn cmp(&self, other: &Self) -> core::cmp::Ordering {
+        self.0.to_bits().cmp(&other.0.to_bits())
+    }
+}
+impl PartialOrd for RawDouble {
+    fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
+        Some(self.cmp(other))
     }
 }