Update all dependencies & use ppc750cl InsIter

objdiff-core/Cargo.toml

@@ -21,32 +21,32 @@ ppc = ["any-arch", "cwdemangle", "ppc750cl"]
 x86 = ["any-arch", "cpp_demangle", "iced-x86", "msvc-demangler"]
 
 [dependencies]
-anyhow = "1.0.81"
+anyhow = "1.0.82"
 byteorder = "1.5.0"
 filetime = "0.2.23"
 flagset = "0.4.5"
 log = "0.4.21"
 memmap2 = "0.9.4"
 num-traits = "0.2.18"
-object = { version = "0.34.0", features = ["read_core", "std", "elf", "pe"], default-features = false }
+object = { version = "0.35.0", features = ["read_core", "std", "elf", "pe"], default-features = false }
 serde = { version = "1", features = ["derive"] }
-similar = { version = "2.4.0", default-features = false }
+similar = { version = "2.5.0", default-features = false }
 
 # config
 globset = { version = "0.4.14", features = ["serde1"], optional = true }
 semver = { version = "1.0.22", optional = true }
-serde_json = { version = "1.0.114", optional = true }
-serde_yaml = { version = "0.9.32", optional = true }
+serde_json = { version = "1.0.116", optional = true }
+serde_yaml = { version = "0.9.34", optional = true }
 
 # dwarf
-gimli = { version = "0.28.1", default-features = false, features = ["read-all"], optional = true }
+gimli = { version = "0.29.0", default-features = false, features = ["read-all"], optional = true }
 
 # ppc
 cwdemangle = { version = "1.0.0", optional = true }
-ppc750cl = { git = "https://github.com/encounter/ppc750cl", rev = "d31bf75009e4efc102fc2b3b33fb7cd041859942", optional = true }
+ppc750cl = { git = "https://github.com/encounter/ppc750cl", rev = "6cbd7d888c7082c2c860f66cbb9848d633f753ed", optional = true }
 
 # mips
-rabbitizer = { version = "1.9.2", optional = true }
+rabbitizer = { version = "1.10.0", optional = true }
 
 # x86
 cpp_demangle = { version = "0.4.3", optional = true }

objdiff-core/src/arch/ppc.rs

@@ -2,7 +2,7 @@ use std::borrow::Cow;
 
 use anyhow::{bail, Result};
 use object::{elf, File, Relocation, RelocationFlags};
-use ppc750cl::{Argument, GPR};
+use ppc750cl::{Argument, GPR, InsIter};
 
 use crate::{
     arch::{ObjArch, ProcessCodeResult},
@@ -42,24 +42,21 @@ impl ObjArch for ObjArchPpc {
         let ins_count = code.len() / 4;
         let mut ops = Vec::<u16>::with_capacity(ins_count);
         let mut insts = Vec::<ObjIns>::with_capacity(ins_count);
-        let mut cur_addr = symbol.address as u32;
-        for chunk in code.chunks_exact(4) {
-            let mut code = u32::from_be_bytes(chunk.try_into()?);
+        for (cur_addr, mut ins) in InsIter::new(code, symbol.address as u32) {
             let reloc = section.relocations.iter().find(|r| (r.address as u32 & !3) == cur_addr);
             if let Some(reloc) = reloc {
                 // Zero out relocations
-                code = match reloc.flags {
-                    RelocationFlags::Elf { r_type: elf::R_PPC_EMB_SDA21 } => code & !0x1FFFFF,
-                    RelocationFlags::Elf { r_type: elf::R_PPC_REL24 } => code & !0x3FFFFFC,
-                    RelocationFlags::Elf { r_type: elf::R_PPC_REL14 } => code & !0xFFFC,
+                ins.code = match reloc.flags {
+                    RelocationFlags::Elf { r_type: elf::R_PPC_EMB_SDA21 } => ins.code & !0x1FFFFF,
+                    RelocationFlags::Elf { r_type: elf::R_PPC_REL24 } => ins.code & !0x3FFFFFC,
+                    RelocationFlags::Elf { r_type: elf::R_PPC_REL14 } => ins.code & !0xFFFC,
                     RelocationFlags::Elf {
                         r_type: elf::R_PPC_ADDR16_HI | elf::R_PPC_ADDR16_HA | elf::R_PPC_ADDR16_LO,
-                    } => code & !0xFFFF,
-                    _ => code,
+                    } => ins.code & !0xFFFF,
+                    _ => ins.code,
                 };
             }
 
-            let ins = ppc750cl::Ins::new(code);
             let orig = ins.basic().to_string();
             let simplified = ins.simplified();
 
@@ -149,7 +146,6 @@ impl ObjArch for ObjArchPpc {
                 line,
                 orig: Some(orig),
             });
-            cur_addr += 4;
         }
         Ok(ProcessCodeResult { ops, insts })
     }

objdiff-core/src/obj/read.rs

@@ -294,7 +294,7 @@ fn line_info(obj_file: &File<'_>) -> Result<Option<BTreeMap<u64, u64>>> {
     // DWARF 2+
     #[cfg(feature = "dwarf")]
     {
-        let dwarf_cow = gimli::Dwarf::load(|id| {
+        let dwarf_cow = gimli::DwarfSections::load(|id| {
             Ok::<_, gimli::Error>(
                 obj_file
                     .section_by_name(id.name())