encounter/objdiff
1
0
Fork 0
mirror of https://github.com/encounter/objdiff.git synced 2025-06-07 07:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply clippy suggestion

Browse Source
This commit is contained in:
Luke Street 2025-03-19 19:00:01 -06:00
parent d8fdfaa2c0
commit 485b259c32
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
use alloc::{boxed::Box, format, string::String, vec::Vec}; use alloc::{boxed::Box, format, string::String, vec::Vec};
use core::cmp::Ordering;
use anyhow::{Context, Result, anyhow, bail}; use anyhow::{Context, Result, anyhow, bail};
use iced_x86::{ use iced_x86::{
@ -100,28 +101,30 @@ impl Arch for ArchX86 {
'outer: while decoder.can_decode() { 'outer: while decoder.can_decode() {
let address = decoder.ip(); let address = decoder.ip();
while let Some(reloc) = reloc_iter.peek() { while let Some(reloc) = reloc_iter.peek() {
if reloc.address < address { match reloc.address.cmp(&address) {
reloc_iter.next(); Ordering::Less => {
} else if reloc.address == address {
// If the instruction starts at a relocation, it's inline data
let size = self.reloc_size(reloc.flags).with_context(|| {
format!("Unsupported inline x86 relocation {:?}", reloc.flags)
})?;
if decoder.set_position(decoder.position() + size).is_ok() {
decoder.set_ip(address + size as u64);
out.push(ScannedInstruction {
ins_ref: InstructionRef {
address,
size: size as u8,
opcode: DATA_OPCODE,
},
branch_dest: None,
});
reloc_iter.next(); reloc_iter.next();
continue 'outer;
} }
} else { Ordering::Equal => {
break; // If the instruction starts at a relocation, it's inline data
let size = self.reloc_size(reloc.flags).with_context(|| {
format!("Unsupported inline x86 relocation {:?}", reloc.flags)
})?;
if decoder.set_position(decoder.position() + size).is_ok() {
decoder.set_ip(address + size as u64);
out.push(ScannedInstruction {
ins_ref: InstructionRef {
address,
size: size as u8,
opcode: DATA_OPCODE,
},
branch_dest: None,
});
reloc_iter.next();
continue 'outer;
}
}
Ordering::Greater => break,
} }
} }
decoder.decode_out(&mut instruction); decoder.decode_out(&mut instruction);