encounter/objdiff
1
0
Fork 0
mirror of https://github.com/encounter/objdiff.git synced 2025-12-19 09:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add PPC COFF tests; fix IMAGE_REL_PPC_PAIR handling

Browse Source
This commit is contained in:
Luke Street
2025-07-17 21:19:06 -06:00
parent 3385f58341
commit 0fb7f3901c
13 changed files with 4485 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
objdiff-core/src/arch/x86.rs
View File

@@ -232,14 +232,14 @@ impl Arch for ArchX86 {
address: u64,
_relocation: &object::Relocation,
flags: RelocationFlags,
) -> Result<i64> {
) -> Result<Option<i64>> {
match self.arch {
Architecture::X86 => match flags {
RelocationFlags::Coff(pe::IMAGE_REL_I386_DIR32 | pe::IMAGE_REL_I386_REL32)
| RelocationFlags::Elf(elf::R_386_32 | elf::R_386_PC32) => {
let data =
section.data()?[address as usize..address as usize + 4].try_into()?;
Ok(self.endianness.read_i32_bytes(data) as i64)
Ok(Some(self.endianness.read_i32_bytes(data) as i64))
}
flags => bail!("Unsupported x86 implicit relocation {flags:?}"),
},
@@ -248,13 +248,13 @@ impl Arch for ArchX86 {
| RelocationFlags::Elf(elf::R_X86_64_32 | elf::R_X86_64_PC32) => {
let data =
section.data()?[address as usize..address as usize + 4].try_into()?;
Ok(self.endianness.read_i32_bytes(data) as i64)
Ok(Some(self.endianness.read_i32_bytes(data) as i64))
}
RelocationFlags::Coff(pe::IMAGE_REL_AMD64_ADDR64)
| RelocationFlags::Elf(elf::R_X86_64_64) => {
let data =
section.data()?[address as usize..address as usize + 8].try_into()?;
Ok(self.endianness.read_i64_bytes(data))
Ok(Some(self.endianness.read_i64_bytes(data)))
}
flags => bail!("Unsupported x86-64 implicit relocation {flags:?}"),
},