Bleh

Author: CelestialAmber

objdiff-core/src/arch/arm.rs

@@ -162,7 +162,7 @@ impl ArchArm {
 }
 
 impl Arch for ArchArm {
-    fn post_init(&mut self, sections: &[Section], symbols: &[Symbol]) {
+    fn post_init(&mut self, sections: &[Section], symbols: &[Symbol], _symbol_indices: &[usize]) {
         self.disasm_modes = Self::get_mapping_symbols(sections, symbols);
     }
 

objdiff-core/src/arch/mod.rs

@@ -340,7 +340,7 @@ impl dyn Arch {
 
 pub trait Arch: Any + Debug + Send + Sync {
     /// Finishes arch-specific initialization that must be done after sections have been combined.
-    fn post_init(&mut self, _sections: &[Section], _symbols: &[Symbol]) {}
+    fn post_init(&mut self, _sections: &[Section], _symbols: &[Symbol], _symbol_indices: &[usize]) {}
 
     /// Generate a list of instructions references (offset, size, opcode) from the given code.
     ///

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

@@ -472,6 +472,18 @@ impl Arch for ArchPpc {
         }
         Ok(next_address.saturating_sub(symbol.address))
     }
+
+    fn post_init(&mut self, _sections: &[Section], _symbols: &[Symbol], symbol_indices: &[usize]) {
+        // Change the indices used as keys from the original symbol indices to the new symbol array indices
+        if let Some(extab) = self.extab.as_ref() {
+            let new_map: BTreeMap<usize, ExceptionInfo> = extab.iter().map(|e| {
+                (symbol_indices[*e.0 + 1], e.1.clone())
+            }).collect();
+
+            self.extab.replace(new_map);
+        }
+
+    }
 }
 
 impl ArchPpc {

objdiff-core/src/obj/read.rs

@@ -1089,7 +1089,7 @@ pub fn parse(data: &[u8], config: &DiffObjConfig, diff_side: DiffSide) -> Result
         combine_sections(&mut sections, &mut symbols, config)?;
     }
     add_section_symbols(&sections, &mut symbols);
-    arch.post_init(&sections, &symbols);
+    arch.post_init(&sections, &symbols, &symbol_indices);
     let mut obj = Object {
         arch,
         endianness: obj_file.endianness(),