Make objdiff-core no_std + huge WASM rework

objdiff-core/src/arch/arm.rs

@@ -1,14 +1,18 @@
-use std::{
+use alloc::{
     borrow::Cow,
-    collections::{BTreeMap, HashMap},
+    collections::BTreeMap,
+    format,
+    string::{String, ToString},
+    vec,
+    vec::Vec,
 };
 
 use anyhow::{bail, Result};
 use arm_attr::{enums::CpuArch, tag::Tag, BuildAttrs};
 use object::{
     elf::{self, SHT_ARM_ATTRIBUTES},
-    Endian, File, Object, ObjectSection, ObjectSymbol, Relocation, RelocationFlags, SectionIndex,
-    SectionKind, Symbol, SymbolKind,
+    Endian, File, Object, ObjectSection, ObjectSymbol, Relocation, RelocationFlags, SectionKind,
+    Symbol, SymbolKind,
 };
 use unarm::{
     args::{Argument, OffsetImm, OffsetReg, Register},
@@ -24,7 +28,7 @@ use crate::{
 
 pub struct ObjArchArm {
     /// Maps section index, to list of disasm modes (arm, thumb or data) sorted by address
-    disasm_modes: HashMap<SectionIndex, Vec<DisasmMode>>,
+    disasm_modes: BTreeMap<usize, Vec<DisasmMode>>,
     detected_version: Option<ArmVersion>,
     endianness: object::Endianness,
 }
@@ -78,7 +82,7 @@ impl ObjArchArm {
         Ok(None)
     }
 
-    fn elf_get_mapping_symbols(file: &File) -> HashMap<SectionIndex, Vec<DisasmMode>> {
+    fn elf_get_mapping_symbols(file: &File) -> BTreeMap<usize, Vec<DisasmMode>> {
         file.sections()
             .filter(|s| s.kind() == SectionKind::Text)
             .map(|s| {
@@ -89,7 +93,7 @@ impl ObjArchArm {
                     .filter_map(|s| DisasmMode::from_symbol(&s))
                     .collect();
                 mapping_symbols.sort_unstable_by_key(|x| x.address);
-                (s.index(), mapping_symbols)
+                (s.index().0, mapping_symbols)
             })
             .collect()
     }
@@ -121,7 +125,7 @@ impl ObjArch for ObjArchArm {
         let fallback_mappings = [DisasmMode { address: start_addr, mapping: ParseMode::Arm }];
         let mapping_symbols = self
             .disasm_modes
-            .get(&SectionIndex(section_index))
+            .get(&section_index)
             .map(|x| x.as_slice())
             .unwrap_or(&fallback_mappings);
         let first_mapping_idx = mapping_symbols

objdiff-core/src/arch/arm64.rs

@@ -1,4 +1,12 @@
-use std::{borrow::Cow, cmp::Ordering, collections::BTreeMap};
+use alloc::{
+    borrow::Cow,
+    collections::BTreeMap,
+    format,
+    string::{String, ToString},
+    vec,
+    vec::Vec,
+};
+use core::cmp::Ordering;
 
 use anyhow::{bail, Result};
 use object::{elf, File, Relocation, RelocationFlags};

objdiff-core/src/arch/mips.rs

@@ -1,4 +1,5 @@
-use std::{borrow::Cow, collections::BTreeMap, sync::Mutex};
+use alloc::{borrow::Cow, collections::BTreeMap, format, vec::Vec};
+use std::sync::Mutex;
 
 use anyhow::{anyhow, bail, Result};
 use object::{

objdiff-core/src/arch/mod.rs

@@ -1,4 +1,5 @@
-use std::{borrow::Cow, collections::BTreeMap, ffi::CStr};
+use alloc::{borrow::Cow, boxed::Box, collections::BTreeMap, format, string::String, vec::Vec};
+use core::ffi::CStr;
 
 use anyhow::{bail, Result};
 use byteorder::ByteOrder;

objdiff-core/src/arch/ppc.rs

@@ -1,6 +1,10 @@
-use std::{
+use alloc::{
     borrow::Cow,
-    collections::{BTreeMap, HashMap, HashSet},
+    collections::{BTreeMap, BTreeSet},
+    format,
+    string::{String, ToString},
+    vec,
+    vec::Vec,
 };
 
 use anyhow::{bail, ensure, Result};
@@ -479,7 +483,7 @@ fn get_offset_and_addr_gpr_for_possible_pool_reference(
 
 // Remove the relocation we're keeping track of in a particular register when an instruction reuses
 // that register to hold some other value, unrelated to pool relocation addresses.
-fn clear_overwritten_gprs(ins: Ins, gpr_pool_relocs: &mut HashMap<u8, ObjReloc>) {
+fn clear_overwritten_gprs(ins: Ins, gpr_pool_relocs: &mut BTreeMap<u8, ObjReloc>) {
     let mut def_args = Arguments::default();
     ins.parse_defs(&mut def_args);
     for arg in def_args {
@@ -576,11 +580,11 @@ fn generate_fake_pool_reloc_for_addr_mapping(
     func_address: u64,
     code: &[u8],
     relocations: &[ObjReloc],
-) -> HashMap<u32, ObjReloc> {
-    let mut visited_ins_addrs = HashSet::new();
-    let mut pool_reloc_for_addr = HashMap::new();
+) -> BTreeMap<u32, ObjReloc> {
+    let mut visited_ins_addrs = BTreeSet::new();
+    let mut pool_reloc_for_addr = BTreeMap::new();
     let mut ins_iters_with_gpr_state =
-        vec![(InsIter::new(code, func_address as u32), HashMap::new())];
+        vec![(InsIter::new(code, func_address as u32), BTreeMap::new())];
     let mut gpr_state_at_bctr = BTreeMap::new();
     while let Some((ins_iter, mut gpr_pool_relocs)) = ins_iters_with_gpr_state.pop() {
         for (cur_addr, ins) in ins_iter {

objdiff-core/src/arch/x86.rs

@@ -1,4 +1,12 @@
-use std::{borrow::Cow, collections::BTreeMap};
+use alloc::{
+    borrow::Cow,
+    boxed::Box,
+    collections::BTreeMap,
+    format,
+    string::{String, ToString},
+    vec,
+    vec::Vec,
+};
 
 use anyhow::{anyhow, bail, ensure, Result};
 use iced_x86::{