mirror of https://github.com/encounter/objdiff.git
432 lines
14 KiB
Rust
432 lines
14 KiB
Rust
mod code;
|
|
mod data;
|
|
pub mod display;
|
|
|
|
use std::collections::HashSet;
|
|
|
|
use anyhow::Result;
|
|
|
|
use crate::{
|
|
diff::{
|
|
code::{diff_code, no_diff_code},
|
|
data::{diff_bss_symbol, diff_data, no_diff_bss_symbol},
|
|
},
|
|
obj::{ObjInfo, ObjIns, ObjSectionKind, SymbolRef},
|
|
};
|
|
|
|
#[derive(Debug, Copy, Clone, Default, Eq, PartialEq, serde::Deserialize, serde::Serialize)]
|
|
pub enum X86Formatter {
|
|
#[default]
|
|
Intel,
|
|
Gas,
|
|
Nasm,
|
|
Masm,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Default, Eq, PartialEq, serde::Deserialize, serde::Serialize)]
|
|
#[serde(default)]
|
|
pub struct DiffObjConfig {
|
|
pub relax_reloc_diffs: bool,
|
|
pub space_between_args: bool,
|
|
pub x86_formatter: X86Formatter,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub struct ObjSectionDiff {
|
|
pub symbols: Vec<ObjSymbolDiff>,
|
|
pub data_diff: Vec<ObjDataDiff>,
|
|
pub match_percent: Option<f32>,
|
|
}
|
|
|
|
impl ObjSectionDiff {
|
|
fn merge(&mut self, other: ObjSectionDiff) {
|
|
// symbols ignored
|
|
self.data_diff = other.data_diff;
|
|
self.match_percent = other.match_percent;
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Default)]
|
|
pub struct ObjSymbolDiff {
|
|
pub diff_symbol: Option<SymbolRef>,
|
|
pub instructions: Vec<ObjInsDiff>,
|
|
pub match_percent: Option<f32>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Default)]
|
|
pub struct ObjInsDiff {
|
|
pub ins: Option<ObjIns>,
|
|
/// Diff kind
|
|
pub kind: ObjInsDiffKind,
|
|
/// Branches from instruction
|
|
pub branch_from: Option<ObjInsBranchFrom>,
|
|
/// Branches to instruction
|
|
pub branch_to: Option<ObjInsBranchTo>,
|
|
/// Arg diffs
|
|
pub arg_diff: Vec<Option<ObjInsArgDiff>>,
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone, Eq, PartialEq, Default)]
|
|
pub enum ObjInsDiffKind {
|
|
#[default]
|
|
None,
|
|
OpMismatch,
|
|
ArgMismatch,
|
|
Replace,
|
|
Delete,
|
|
Insert,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Default)]
|
|
pub struct ObjDataDiff {
|
|
pub data: Vec<u8>,
|
|
pub kind: ObjDataDiffKind,
|
|
pub len: usize,
|
|
pub symbol: String,
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone, Eq, PartialEq, Default)]
|
|
pub enum ObjDataDiffKind {
|
|
#[default]
|
|
None,
|
|
Replace,
|
|
Delete,
|
|
Insert,
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub struct ObjInsArgDiff {
|
|
/// Incrementing index for coloring
|
|
pub idx: usize,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub struct ObjInsBranchFrom {
|
|
/// Source instruction indices
|
|
pub ins_idx: Vec<usize>,
|
|
/// Incrementing index for coloring
|
|
pub branch_idx: usize,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub struct ObjInsBranchTo {
|
|
/// Target instruction index
|
|
pub ins_idx: usize,
|
|
/// Incrementing index for coloring
|
|
pub branch_idx: usize,
|
|
}
|
|
|
|
#[derive(Default)]
|
|
pub struct ObjDiff {
|
|
pub sections: Vec<ObjSectionDiff>,
|
|
pub common: Vec<ObjSymbolDiff>,
|
|
}
|
|
|
|
impl ObjDiff {
|
|
pub fn new_from_obj(obj: &ObjInfo) -> Self {
|
|
let mut result = Self {
|
|
sections: Vec::with_capacity(obj.sections.len()),
|
|
common: Vec::with_capacity(obj.common.len()),
|
|
};
|
|
for section in &obj.sections {
|
|
let mut symbols = Vec::with_capacity(section.symbols.len());
|
|
for _ in §ion.symbols {
|
|
symbols.push(ObjSymbolDiff {
|
|
diff_symbol: None,
|
|
instructions: vec![],
|
|
match_percent: None,
|
|
});
|
|
}
|
|
result.sections.push(ObjSectionDiff {
|
|
symbols,
|
|
data_diff: vec![ObjDataDiff {
|
|
data: section.data.clone(),
|
|
kind: ObjDataDiffKind::None,
|
|
len: section.data.len(),
|
|
symbol: section.name.clone(),
|
|
}],
|
|
match_percent: None,
|
|
});
|
|
}
|
|
for _ in &obj.common {
|
|
result.common.push(ObjSymbolDiff {
|
|
diff_symbol: None,
|
|
instructions: vec![],
|
|
match_percent: None,
|
|
});
|
|
}
|
|
result
|
|
}
|
|
|
|
#[inline]
|
|
pub fn section_diff(&self, section_idx: usize) -> &ObjSectionDiff {
|
|
&self.sections[section_idx]
|
|
}
|
|
|
|
#[inline]
|
|
pub fn section_diff_mut(&mut self, section_idx: usize) -> &mut ObjSectionDiff {
|
|
&mut self.sections[section_idx]
|
|
}
|
|
|
|
#[inline]
|
|
pub fn symbol_diff(&self, symbol_ref: SymbolRef) -> &ObjSymbolDiff {
|
|
&self.section_diff(symbol_ref.section_idx).symbols[symbol_ref.symbol_idx]
|
|
}
|
|
|
|
#[inline]
|
|
pub fn symbol_diff_mut(&mut self, symbol_ref: SymbolRef) -> &mut ObjSymbolDiff {
|
|
&mut self.section_diff_mut(symbol_ref.section_idx).symbols[symbol_ref.symbol_idx]
|
|
}
|
|
}
|
|
|
|
#[derive(Default)]
|
|
pub struct DiffObjsResult {
|
|
pub left: Option<ObjDiff>,
|
|
pub right: Option<ObjDiff>,
|
|
pub prev: Option<ObjDiff>,
|
|
}
|
|
|
|
pub fn diff_objs(
|
|
config: &DiffObjConfig,
|
|
left: Option<&ObjInfo>,
|
|
right: Option<&ObjInfo>,
|
|
prev: Option<&ObjInfo>,
|
|
) -> Result<DiffObjsResult> {
|
|
let symbol_matches = matching_symbols(left, right, prev)?;
|
|
let section_matches = matching_sections(left, right)?;
|
|
let mut left = left.map(|p| (p, ObjDiff::new_from_obj(p)));
|
|
let mut right = right.map(|p| (p, ObjDiff::new_from_obj(p)));
|
|
let mut prev = prev.map(|p| (p, ObjDiff::new_from_obj(p)));
|
|
|
|
for symbol_match in symbol_matches {
|
|
match symbol_match {
|
|
SymbolMatch {
|
|
left: Some(left_symbol_ref),
|
|
right: Some(right_symbol_ref),
|
|
prev: prev_symbol_ref,
|
|
section_kind,
|
|
} => {
|
|
let (left_obj, left_out) = left.as_mut().unwrap();
|
|
let (right_obj, right_out) = right.as_mut().unwrap();
|
|
match section_kind {
|
|
ObjSectionKind::Code => {
|
|
let (left_diff, right_diff) = diff_code(
|
|
left_obj,
|
|
right_obj,
|
|
left_symbol_ref,
|
|
right_symbol_ref,
|
|
config,
|
|
)?;
|
|
*left_out.symbol_diff_mut(left_symbol_ref) = left_diff;
|
|
*right_out.symbol_diff_mut(right_symbol_ref) = right_diff;
|
|
|
|
if let Some(prev_symbol_ref) = prev_symbol_ref {
|
|
let (prev_obj, prev_out) = prev.as_mut().unwrap();
|
|
let (_, prev_diff) = diff_code(
|
|
right_obj,
|
|
prev_obj,
|
|
right_symbol_ref,
|
|
prev_symbol_ref,
|
|
config,
|
|
)?;
|
|
*prev_out.symbol_diff_mut(prev_symbol_ref) = prev_diff;
|
|
}
|
|
}
|
|
ObjSectionKind::Data => {
|
|
// TODO diff data symbol
|
|
}
|
|
ObjSectionKind::Bss => {
|
|
let (left_diff, right_diff) = diff_bss_symbol(
|
|
left_obj,
|
|
right_obj,
|
|
left_symbol_ref,
|
|
right_symbol_ref,
|
|
)?;
|
|
*left_out.symbol_diff_mut(left_symbol_ref) = left_diff;
|
|
*right_out.symbol_diff_mut(right_symbol_ref) = right_diff;
|
|
}
|
|
}
|
|
}
|
|
SymbolMatch { left: Some(left_symbol_ref), right: None, prev: _, section_kind } => {
|
|
let (left_obj, left_out) = left.as_mut().unwrap();
|
|
match section_kind {
|
|
ObjSectionKind::Code => {
|
|
*left_out.symbol_diff_mut(left_symbol_ref) =
|
|
no_diff_code(left_obj, left_symbol_ref, config)?;
|
|
}
|
|
ObjSectionKind::Data => {}
|
|
ObjSectionKind::Bss => {
|
|
*left_out.symbol_diff_mut(left_symbol_ref) =
|
|
no_diff_bss_symbol(left_obj, left_symbol_ref);
|
|
}
|
|
}
|
|
}
|
|
SymbolMatch { left: None, right: Some(right_symbol_ref), prev: _, section_kind } => {
|
|
let (right_obj, right_out) = right.as_mut().unwrap();
|
|
match section_kind {
|
|
ObjSectionKind::Code => {
|
|
*right_out.symbol_diff_mut(right_symbol_ref) =
|
|
no_diff_code(right_obj, right_symbol_ref, config)?;
|
|
}
|
|
ObjSectionKind::Data => {}
|
|
ObjSectionKind::Bss => {
|
|
*right_out.symbol_diff_mut(right_symbol_ref) =
|
|
no_diff_bss_symbol(right_obj, right_symbol_ref);
|
|
}
|
|
}
|
|
}
|
|
SymbolMatch { left: None, right: None, .. } => {
|
|
// Should not happen
|
|
}
|
|
}
|
|
}
|
|
|
|
for section_match in section_matches {
|
|
if let SectionMatch {
|
|
left: Some(left_section_idx),
|
|
right: Some(right_section_idx),
|
|
section_kind,
|
|
} = section_match
|
|
{
|
|
let (left_obj, left_out) = left.as_mut().unwrap();
|
|
let (right_obj, right_out) = right.as_mut().unwrap();
|
|
let left_section = &left_obj.sections[left_section_idx];
|
|
let right_section = &right_obj.sections[right_section_idx];
|
|
match section_kind {
|
|
ObjSectionKind::Code => {
|
|
// TODO?
|
|
}
|
|
ObjSectionKind::Data => {
|
|
let (left_diff, right_diff) = diff_data(left_section, right_section)?;
|
|
left_out.section_diff_mut(left_section_idx).merge(left_diff);
|
|
right_out.section_diff_mut(right_section_idx).merge(right_diff);
|
|
}
|
|
ObjSectionKind::Bss => {
|
|
// TODO
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(DiffObjsResult {
|
|
left: left.map(|(_, o)| o),
|
|
right: right.map(|(_, o)| o),
|
|
prev: prev.map(|(_, o)| o),
|
|
})
|
|
}
|
|
|
|
#[derive(Copy, Clone, Eq, PartialEq)]
|
|
struct SymbolMatch {
|
|
left: Option<SymbolRef>,
|
|
right: Option<SymbolRef>,
|
|
prev: Option<SymbolRef>,
|
|
section_kind: ObjSectionKind,
|
|
}
|
|
|
|
#[derive(Copy, Clone, Eq, PartialEq)]
|
|
struct SectionMatch {
|
|
left: Option<usize>,
|
|
right: Option<usize>,
|
|
section_kind: ObjSectionKind,
|
|
}
|
|
|
|
/// Find matching symbols between each object.
|
|
fn matching_symbols(
|
|
left: Option<&ObjInfo>,
|
|
right: Option<&ObjInfo>,
|
|
prev: Option<&ObjInfo>,
|
|
) -> Result<Vec<SymbolMatch>> {
|
|
let mut matches = Vec::new();
|
|
let mut right_used = HashSet::new();
|
|
if let Some(left) = left {
|
|
for (section_idx, section) in left.sections.iter().enumerate() {
|
|
for (symbol_idx, symbol) in section.symbols.iter().enumerate() {
|
|
let symbol_match = SymbolMatch {
|
|
left: Some(SymbolRef { section_idx, symbol_idx }),
|
|
right: find_symbol(right, &symbol.name, section.kind),
|
|
prev: find_symbol(prev, &symbol.name, section.kind),
|
|
section_kind: section.kind,
|
|
};
|
|
matches.push(symbol_match);
|
|
if let Some(right) = symbol_match.right {
|
|
right_used.insert(right);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if let Some(right) = right {
|
|
for (section_idx, section) in right.sections.iter().enumerate() {
|
|
for (symbol_idx, symbol) in section.symbols.iter().enumerate() {
|
|
let symbol_ref = SymbolRef { section_idx, symbol_idx };
|
|
if right_used.contains(&symbol_ref) {
|
|
continue;
|
|
}
|
|
matches.push(SymbolMatch {
|
|
left: None,
|
|
right: Some(symbol_ref),
|
|
prev: find_symbol(prev, &symbol.name, section.kind),
|
|
section_kind: section.kind,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
Ok(matches)
|
|
}
|
|
|
|
fn find_symbol(
|
|
obj: Option<&ObjInfo>,
|
|
name: &str,
|
|
section_kind: ObjSectionKind,
|
|
) -> Option<SymbolRef> {
|
|
for (section_idx, section) in obj?.sections.iter().enumerate() {
|
|
if section.kind != section_kind {
|
|
continue;
|
|
}
|
|
let symbol_idx = match section.symbols.iter().position(|symbol| symbol.name == name) {
|
|
Some(symbol_idx) => symbol_idx,
|
|
None => continue,
|
|
};
|
|
return Some(SymbolRef { section_idx, symbol_idx });
|
|
}
|
|
None
|
|
}
|
|
|
|
/// Find matching sections between each object.
|
|
fn matching_sections(left: Option<&ObjInfo>, right: Option<&ObjInfo>) -> Result<Vec<SectionMatch>> {
|
|
let mut matches = Vec::new();
|
|
if let Some(left) = left {
|
|
for (section_idx, section) in left.sections.iter().enumerate() {
|
|
matches.push(SectionMatch {
|
|
left: Some(section_idx),
|
|
right: find_section(right, §ion.name, section.kind),
|
|
section_kind: section.kind,
|
|
});
|
|
}
|
|
}
|
|
if let Some(right) = right {
|
|
for (section_idx, section) in right.sections.iter().enumerate() {
|
|
if matches.iter().any(|m| m.right == Some(section_idx)) {
|
|
continue;
|
|
}
|
|
matches.push(SectionMatch {
|
|
left: None,
|
|
right: Some(section_idx),
|
|
section_kind: section.kind,
|
|
});
|
|
}
|
|
}
|
|
Ok(matches)
|
|
}
|
|
|
|
fn find_section(obj: Option<&ObjInfo>, name: &str, section_kind: ObjSectionKind) -> Option<usize> {
|
|
for (section_idx, section) in obj?.sections.iter().enumerate() {
|
|
if section.kind != section_kind {
|
|
continue;
|
|
}
|
|
if section.name == name {
|
|
return Some(section_idx);
|
|
}
|
|
}
|
|
None
|
|
}
|