PPC: Fix pooled relocation addends being added twice sometimes (#184)

LagoLunatic · web-flow · commit b9ba5796ed3a · 2025-03-30T22:00:36.000-06:00
diff --git a/objdiff-core/src/arch/ppc.rs b/objdiff-core/src/arch/ppc.rs
@@ -513,6 +513,7 @@ fn guess_data_type_from_load_store_inst_op(inst_op: ppc750cl::Opcode) -> Option<
     }
 }
 
+#[derive(Debug)]
 struct PoolReference {
     addr_src_gpr: ppc750cl::GPR,
     addr_offset: i16,
@@ -645,7 +646,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 + offset_from_pool;
+        addend = offset_from_pool;
     }
     Some(Relocation {
         flags: RelocationFlags::Elf(elf::R_PPC_NONE),

Original file line number	Diff line number	Diff line change
`@@ -513,6 +513,7 @@ fn guess_data_type_from_load_store_inst_op(inst_op: ppc750cl::Opcode) -> Option<`
`513`	`513`	`}`
`514`	`514`	`}`
`515`	`515`
	`516`	`+#[derive(Debug)]`
`516`	`517`	`struct PoolReference {`
`517`	`518`	`addr_src_gpr: ppc750cl::GPR,`
`518`	`519`	`addr_offset: i16,`
`@@ -645,7 +646,7 @@ fn make_fake_pool_reloc(`
`645`	`646`	`// example, dCcD_Cyl in The Wind Waker). So just showing that vtable symbol plus an addend`
`646`	`647`	`// to represent the offset into it works fine in this case.`
`647`	`648`	`target_symbol = pool_reloc.relocation.target_symbol;`
`648`		`- addend = pool_reloc.relocation.addend + offset_from_pool;`
	`649`	`+ addend = offset_from_pool;`
`649`	`650`	`}`
`650`	`651`	`Some(Relocation {`
`651`	`652`	`flags: RelocationFlags::Elf(elf::R_PPC_NONE),`