Add "Relax shifted data diffs" option

Author: LagoLunatic

objdiff-core/src/diff/code.rs

@@ -236,7 +236,9 @@ fn reloc_eq(
         (Some(sl), Some(sr)) => {
             // Match if section and name or address match
             section_name_eq(left_obj, right_obj, *sl, *sr)
-                && (symbol_name_matches || address_eq(left, right))
+                && (symbol_name_matches
+                    || address_eq(left, right)
+                    || config.relax_shifted_data_diffs)
                 && (left.target.kind != ObjSymbolKind::Object
                     || right.target.name.starts_with("...")
                     || left.target.bytes == right.target.bytes)

objdiff-core/src/diff/mod.rs

@@ -160,6 +160,7 @@ const fn default_true() -> bool { true }
 #[serde(default)]
 pub struct DiffObjConfig {
     pub relax_reloc_diffs: bool,
+    pub relax_shifted_data_diffs: bool,
     #[serde(default = "default_true")]
     pub space_between_args: bool,
     pub combine_data_sections: bool,
@@ -184,6 +185,7 @@ impl Default for DiffObjConfig {
     fn default() -> Self {
         Self {
             relax_reloc_diffs: false,
+            relax_shifted_data_diffs: false,
             space_between_args: true,
             combine_data_sections: false,
             symbol_mappings: Default::default(),

objdiff-gui/src/app.rs

@@ -740,6 +740,18 @@ impl eframe::App for App {
                     {
                         state.queue_reload = true;
                     }
+                    if ui
+                        .checkbox(
+                            &mut state.config.diff_obj_config.relax_shifted_data_diffs,
+                            "Relax shifted data diffs",
+                        )
+                        .on_hover_text(
+                            "Ignores differences in addresses for symbols with matching data.",
+                        )
+                        .changed()
+                    {
+                        state.queue_reload = true;
+                    }
                     if ui
                         .checkbox(
                             &mut state.config.diff_obj_config.space_between_args,