Draft

Author: stravant

objdiff-cli/src/views/function_diff.rs

@@ -570,6 +570,7 @@ impl FunctionDiffUi {
                     DiffTextColor::Normal => Color::Gray,
                     DiffTextColor::Dim => Color::DarkGray,
                     DiffTextColor::Bright => Color::White,
+                    DiffTextColor::DataFlow => Color::LightCyan,
                     DiffTextColor::Replace => Color::Cyan,
                     DiffTextColor::Delete => Color::Red,
                     DiffTextColor::Insert => Color::Green,

objdiff-core/Cargo.toml

@@ -174,7 +174,7 @@ time = { version = "0.3", optional = true }
 encoding_rs = "0.8.35"
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", optional = true }
+winapi = { version = "0.3", optional = true, features = ["winbase"] }
 
 # For Linux static binaries, use rustls
 [target.'cfg(target_os = "linux")'.dependencies]

objdiff-core/config-schema.json

@@ -25,6 +25,13 @@
         }
       ]
     },
+    {
+      "id": "showDataFlow",
+      "type": "boolean",
+      "default": true,
+      "name": "Show data flow",
+      "description": "When information is known about the value in a register, show that info instead of the register name"
+    },
     {
       "id": "spaceBetweenArgs",
       "type": "boolean",

objdiff-core/src/arch/mod.rs

@@ -1,18 +1,16 @@
 use alloc::{borrow::Cow, boxed::Box, format, string::String, vec::Vec};
-use core::{ffi::CStr, fmt, fmt::Debug};
+use core::{ffi::CStr, fmt::{self, Debug}};
 
 use anyhow::{Result, bail};
 use encoding_rs::SHIFT_JIS;
 use object::Endian as _;
 
 use crate::{
     diff::{
-        DiffObjConfig,
-        display::{ContextItem, HoverItem, InstructionPart},
+        display::{ContextItem, HoverItem, InstructionPart}, DiffObjConfig
     },
     obj::{
-        InstructionArg, InstructionRef, Object, ParsedInstruction, Relocation, RelocationFlags,
-        ResolvedInstructionRef, ResolvedSymbol, Section, Symbol, SymbolFlagSet, SymbolKind,
+        FlowAnalysisResult, InstructionArg, InstructionRef, Object, ParsedInstruction, Relocation, RelocationFlags, ResolvedInstructionRef, ResolvedSymbol, Section, Symbol, SymbolFlagSet, SymbolKind
     },
     util::ReallySigned,
 };
@@ -31,6 +29,7 @@ pub mod superh;
 pub mod x86;
 
 /// Represents the type of data associated with an instruction
+#[derive(PartialEq)]
 pub enum DataType {
     Int8,
     Int16,
@@ -325,14 +324,14 @@ pub trait Arch: Send + Sync + Debug {
     ) -> Result<()>;
 
     /// Generate a list of fake relocations from the given code that represent pooled data accesses.
-    fn generate_pooled_relocations(
+    fn data_flow_analysis(
         &self,
-        _address: u64,
+        _obj: &Object,
+        _symbol: &Symbol,
         _code: &[u8],
         _relocations: &[Relocation],
-        _symbols: &[Symbol],
-    ) -> Vec<Relocation> {
-        Vec::new()
+    ) -> (Vec<Relocation>, Option<Box<dyn FlowAnalysisResult>>) {
+        (Vec::new(), None)
     }
 
     fn implcit_addend(