Fix showing incorrect diff when diffing weak stripped symbol with an addend

LagoLunatic · LagoLunatic · commit eb062273b463 · 2025-03-04T21:19:45.000-05:00
This is a regression that was introduced by encounter#158 diffing addends in addition to symbol names. But it's not really a bug in that PR, rather it seems like I simply never added the offset into the addend when creating a fake pool relocation for an extern symbol. So this commit fixes that root issue instead.
diff --git a/objdiff-core/src/arch/ppc.rs b/objdiff-core/src/arch/ppc.rs
@@ -645,7 +645,7 @@ fn make_fake_pool_reloc(
         // example, dCcD_Cyl in The Wind Waker). So just showing that vtable symbol plus an addend
         // to represent the offset into it works fine in this case.
         target_symbol = pool_reloc.relocation.target_symbol;
-        addend = pool_reloc.relocation.addend;
+        addend = pool_reloc.relocation.addend + offset_from_pool;
     }
     Some(Relocation {
         flags: RelocationFlags::Elf(elf::R_PPC_NONE),

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ fn make_fake_pool_reloc(`
`645`	`645`	`// example, dCcD_Cyl in The Wind Waker). So just showing that vtable symbol plus an addend`
`646`	`646`	`// to represent the offset into it works fine in this case.`
`647`	`647`	`target_symbol = pool_reloc.relocation.target_symbol;`
`648`		`- addend = pool_reloc.relocation.addend;`
	`648`	`+ addend = pool_reloc.relocation.addend + offset_from_pool;`
`649`	`649`	`}`
`650`	`650`	`Some(Relocation {`
`651`	`651`	`flags: RelocationFlags::Elf(elf::R_PPC_NONE),`