Highlight: Consider reg offsets and signed immediates equivalent

Fixes #32
This commit is contained in:
Luke Street 2023-11-22 00:07:21 -05:00
parent 74e89130a8
commit 0ec7bf078b
2 changed files with 25 additions and 1 deletions

View File

@ -50,6 +50,30 @@ pub enum ObjInsArg {
BranchOffset(i32), BranchOffset(i32),
} }
impl ObjInsArg {
pub fn loose_eq(&self, other: &ObjInsArg) -> bool {
match (self, other) {
(ObjInsArg::PpcArg(a), ObjInsArg::PpcArg(b)) => {
a == b
|| match (a, b) {
// Consider Simm and Offset equivalent
(ppc750cl::Argument::Simm(simm), ppc750cl::Argument::Offset(off))
| (ppc750cl::Argument::Offset(off), ppc750cl::Argument::Simm(simm)) => {
simm.0 == off.0
}
_ => false,
}
}
(ObjInsArg::MipsArg(a), ObjInsArg::MipsArg(b)) => a == b,
(ObjInsArg::MipsArgWithBase(a), ObjInsArg::MipsArgWithBase(b)) => a == b,
(ObjInsArg::Reloc, ObjInsArg::Reloc) => true,
(ObjInsArg::RelocWithBase, ObjInsArg::RelocWithBase) => true,
(ObjInsArg::BranchOffset(a), ObjInsArg::BranchOffset(b)) => a == b,
_ => false,
}
}
}
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
pub struct ObjInsArgDiff { pub struct ObjInsArgDiff {
/// Incrementing index for coloring /// Incrementing index for coloring

View File

@ -194,7 +194,7 @@ fn write_ins(
HighlightKind::Address(v) => { HighlightKind::Address(v) => {
matches!(arg, ObjInsArg::BranchOffset(offset) if (offset + ins.address as i32 - base_addr as i32) as u32 == *v) matches!(arg, ObjInsArg::BranchOffset(offset) if (offset + ins.address as i32 - base_addr as i32) as u32 == *v)
} }
HighlightKind::Arg(v) => v == arg, HighlightKind::Arg(v) => v.loose_eq(arg),
_ => false, _ => false,
}; };
let color = if highlighted_arg { let color = if highlighted_arg {