Skip to content

objdiff-cli diff: Support "Relax relocation diffs" #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2024
Merged

objdiff-cli diff: Support "Relax relocation diffs" #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion objdiff-cli/src/cmd/diff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ pub struct Args {
#[argp(option, short = 'u')]
/// Unit name within project
unit: Option<String>,
#[argp(switch, short = 'x')]
/// Relax relocation diffs
relax_reloc_diffs: bool,
#[argp(positional)]
/// Function symbol to diff
symbol: String,
Expand Down Expand Up @@ -144,6 +147,7 @@ pub fn run(args: Args) -> Result<()> {
.context("Failed to parse time format")?;
let mut state = Box::new(FunctionDiffUi {
redraw: true,
relax_reloc_diffs: args.relax_reloc_diffs,
click_xy: None,
left_highlight: HighlightKind::None,
right_highlight: HighlightKind::None,
Expand Down Expand Up @@ -216,6 +220,7 @@ fn find_function(obj: &ObjInfo, name: &str) -> Option<ObjSymbol> {
#[allow(dead_code)]
struct FunctionDiffUi {
redraw: bool,
relax_reloc_diffs: bool,
click_xy: Option<(u16, u16)>,
left_highlight: HighlightKind,
right_highlight: HighlightKind,
Expand Down Expand Up @@ -472,6 +477,12 @@ impl FunctionDiffUi {
self.scroll_x = self.scroll_x.saturating_sub(1);
self.redraw = true;
}
// Toggle relax relocation diffs
KeyCode::Char('x') => {
self.relax_reloc_diffs = !self.relax_reloc_diffs;
self.redraw = true;
return FunctionDiffResult::Reload;
}
_ => {}
}
}
Expand Down Expand Up @@ -630,7 +641,7 @@ impl FunctionDiffUi {
.as_deref()
.map(|p| obj::elf::read(p).with_context(|| format!("Loading {}", p.display())))
.transpose()?;
let config = diff::DiffObjConfig::default();
let config = diff::DiffObjConfig { relax_reloc_diffs: self.relax_reloc_diffs };
diff::diff_objs(&config, target.as_mut(), base.as_mut())?;

let left_sym = target.as_ref().and_then(|o| find_function(o, &self.symbol_name));
Expand Down