Combine "relax reloc diffs" with other reloc diff options

Author: LagoLunatic

objdiff-cli/src/cmd/report.rs

@@ -169,7 +169,10 @@ fn report_object(
         }
         _ => {}
     }
-    let diff_config = diff::DiffObjConfig { relax_reloc_diffs: true, ..Default::default() };
+    let diff_config = diff::DiffObjConfig {
+        function_reloc_diffs: diff::FunctionRelocDiffs::None,
+        ..Default::default()
+    };
     let mapping_config = diff::MappingConfig::default();
     let target = object
         .target_path

objdiff-cli/src/views/function_diff.rs

@@ -3,7 +3,7 @@ use crossterm::event::{Event, KeyCode, KeyEventKind, KeyModifiers, MouseButton,
 use objdiff_core::{
     diff::{
         display::{display_diff, DiffText, HighlightKind},
-        FunctionDataDiffs, ObjDiff, ObjInsDiffKind, ObjSymbolDiff,
+        FunctionRelocDiffs, ObjDiff, ObjInsDiffKind, ObjSymbolDiff,
     },
     obj::{ObjInfo, ObjSectionKind, ObjSymbol, SymbolRef},
 };
@@ -368,20 +368,14 @@ impl UiView for FunctionDiffUi {
                         self.scroll_x = self.scroll_x.saturating_sub(1);
                         result.redraw = true;
                     }
-                    // Toggle relax relocation diffs
+                    // Cycle through function relocation diff mode
                     KeyCode::Char('x') => {
-                        state.diff_obj_config.relax_reloc_diffs =
-                            !state.diff_obj_config.relax_reloc_diffs;
-                        result.redraw = true;
-                        return EventControlFlow::Reload;
-                    }
-                    // Cycle through function data diff mode
-                    KeyCode::Char('s') => {
-                        state.diff_obj_config.function_data_diffs =
-                            match state.diff_obj_config.function_data_diffs {
-                                FunctionDataDiffs::AddressOnly => FunctionDataDiffs::ValueOnly,
-                                FunctionDataDiffs::ValueOnly => FunctionDataDiffs::All,
-                                FunctionDataDiffs::All => FunctionDataDiffs::AddressOnly,
+                        state.diff_obj_config.function_reloc_diffs =
+                            match state.diff_obj_config.function_reloc_diffs {
+                                FunctionRelocDiffs::None => FunctionRelocDiffs::NameAddress,
+                                FunctionRelocDiffs::NameAddress => FunctionRelocDiffs::DataValue,
+                                FunctionRelocDiffs::DataValue => FunctionRelocDiffs::All,
+                                FunctionRelocDiffs::All => FunctionRelocDiffs::None,
                             };
                         result.redraw = true;
                         return EventControlFlow::Reload;

objdiff-core/config-schema.json

@@ -1,30 +1,27 @@
 {
   "properties": [
     {
-      "id": "relaxRelocDiffs",
-      "type": "boolean",
-      "default": false,
-      "name": "Relax relocation diffs",
-      "description": "Ignores differences in relocation targets. (Address, name, etc)"
-    },
-    {
-      "id": "functionDataDiffs",
+      "id": "functionRelocDiffs",
       "type": "choice",
-      "default": "address_only",
-      "name": "Function data diffs",
-      "description": "How data relocations will be diffed in the function view.",
+      "default": "name_address",
+      "name": "Function relocation diffs",
+      "description": "How relocation targets will be diffed in the function view.",
       "items": [
         {
-          "value": "address_only",
-          "name": "Address only"
+          "value": "none",
+          "name": "None"
+        },
+        {
+          "value": "name_address",
+          "name": "Name or address"
         },
         {
-          "value": "value_only",
-          "name": "Value only"
+          "value": "data_value",
+          "name": "Data value"
         },
         {
           "value": "all",
-          "name": "Value and address"
+          "name": "Name or address, data value"
         }
       ]
     },
@@ -214,8 +211,7 @@
       "id": "general",
       "name": "General",
       "properties": [
-        "relaxRelocDiffs",
-        "functionDataDiffs",
+        "functionRelocDiffs",
         "spaceBetweenArgs",
         "combineDataSections"
       ]

objdiff-core/src/diff/code.rs

@@ -3,7 +3,7 @@ use std::{cmp::max, collections::BTreeMap};
 use anyhow::{anyhow, Result};
 use similar::{capture_diff_slices_deadline, Algorithm};
 
-use super::FunctionDataDiffs;
+use super::FunctionRelocDiffs;
 use crate::{
     arch::ProcessCodeResult,
     diff::{
@@ -231,7 +231,7 @@ fn reloc_eq(
     if left.flags != right.flags {
         return false;
     }
-    if config.relax_reloc_diffs {
+    if config.function_reloc_diffs == FunctionRelocDiffs::None {
         return true;
     }
 
@@ -240,10 +240,10 @@ 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)
-                    || config.function_data_diffs == FunctionDataDiffs::ValueOnly)
-                && (config.function_data_diffs == FunctionDataDiffs::AddressOnly
+                && (config.function_reloc_diffs == FunctionRelocDiffs::DataValue
+                    || symbol_name_matches
+                    || address_eq(left, right))
+                && (config.function_reloc_diffs == FunctionRelocDiffs::NameAddress
                     || left.target.kind != ObjSymbolKind::Object
                     || left_obj.arch.display_ins_data(left_ins)
                         == left_obj.arch.display_ins_data(right_ins))
@@ -275,7 +275,7 @@ fn arg_eq(
             ObjInsArg::Arg(r) => l.loose_eq(r),
             // If relocations are relaxed, match if left is a constant and right is a reloc
             // Useful for instances where the target object is created without relocations
-            ObjInsArg::Reloc => config.relax_reloc_diffs,
+            ObjInsArg::Reloc => config.function_reloc_diffs == FunctionRelocDiffs::None,
             _ => false,
         },
         ObjInsArg::Reloc => {
@@ -296,7 +296,7 @@ fn arg_eq(
             }
             // If relocations are relaxed, match if left is a constant and right is a reloc
             // Useful for instances where the target object is created without relocations
-            ObjInsArg::Reloc => config.relax_reloc_diffs,
+            ObjInsArg::Reloc => config.function_reloc_diffs == FunctionRelocDiffs::None,
             _ => false,
         },
     }

objdiff-gui/src/app_config.rs

@@ -4,7 +4,10 @@ use eframe::Storage;
 use globset::Glob;
 use objdiff_core::{
     config::ScratchConfig,
-    diff::{ArmArchVersion, ArmR9Usage, DiffObjConfig, MipsAbi, MipsInstrCategory, X86Formatter},
+    diff::{
+        ArmArchVersion, ArmR9Usage, DiffObjConfig, FunctionRelocDiffs, MipsAbi, MipsInstrCategory,
+        X86Formatter,
+    },
 };
 
 use crate::app::{AppConfig, ObjectConfig, CONFIG_KEY};
@@ -147,7 +150,11 @@ impl Default for DiffObjConfigV1 {
 impl DiffObjConfigV1 {
     fn into_config(self) -> DiffObjConfig {
         DiffObjConfig {
-            relax_reloc_diffs: self.relax_reloc_diffs,
+            function_reloc_diffs: if self.relax_reloc_diffs {
+                FunctionRelocDiffs::None
+            } else {
+                FunctionRelocDiffs::default()
+            },
             space_between_args: self.space_between_args,
             combine_data_sections: self.combine_data_sections,
             x86_formatter: self.x86_formatter,
@@ -160,7 +167,6 @@ impl DiffObjConfigV1 {
             arm_sl_usage: self.arm_sl_usage,
             arm_fp_usage: self.arm_fp_usage,
             arm_ip_usage: self.arm_ip_usage,
-            ..Default::default()
         }
     }
 }