Update all dependencies

Highlights registers, instructions, arguments, symbols or addresses on click.

Resolves #7

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "objdiff"
-version = "0.4.3"
+version = "0.5.0"
 edition = "2021"
-rust-version = "1.65"
+rust-version = "1.70"
 authors = ["Luke Street <luke@street.dev>"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/encounter/objdiff"
@@ -22,46 +22,46 @@ default = []
 wgpu = ["eframe/wgpu"]
 
 [dependencies]
-anyhow = "1.0.71"
-byteorder = "1.4.3"
-bytes = "1.4.0"
+anyhow = "1.0.75"
+byteorder = "1.5.0"
+bytes = "1.5.0"
 cfg-if = "1.0.0"
 const_format = "0.2.31"
 cwdemangle = "0.1.6"
 dirs = "5.0.1"
-eframe = { version = "0.22.0", features = ["persistence"] }
-egui = "0.22.0"
-egui_extras = "0.22.0"
-flagset = "0.4.3"
+eframe = { version = "0.23.0", features = ["persistence"] }
+egui = "0.23.0"
+egui_extras = "0.23.0"
+flagset = "0.4.4"
 globset = { version = "0.4.13", features = ["serde1"] }
-log = "0.4.19"
-memmap2 = "0.7.1"
-notify = "6.0.1"
-object = { version = "0.31.1", features = ["read_core", "std", "elf"], default-features = false }
-png = "0.17.9"
+log = "0.4.20"
+memmap2 = "0.9.0"
+notify = "6.1.1"
+object = { version = "0.32.1", features = ["read_core", "std", "elf"], default-features = false }
+png = "0.17.10"
 ppc750cl = { git = "https://github.com/terorie/ppc750cl", rev = "9ae36eef34aa6d74e00972c7671f547a2acfd0aa" }
-rabbitizer = "1.7.4"
-rfd = { version = "0.11.4" } #, default-features = false, features = ['xdg-portal']
-ron = "0.8.0"
-semver = "1.0.17"
+rabbitizer = "1.7.10"
+rfd = { version = "0.12.0" } #, default-features = false, features = ['xdg-portal']
+ron = "0.8.1"
+semver = "1.0.19"
 serde = { version = "1", features = ["derive"] }
-serde_json = "1.0.104"
+serde_json = "1.0.107"
 serde_yaml = "0.9.25"
-tempfile = "3.6.0"
-thiserror = "1.0.41"
-time = { version = "0.3.22", features = ["formatting", "local-offset"] }
-toml = "0.7.6"
+tempfile = "3.8.0"
+thiserror = "1.0.49"
+time = { version = "0.3.29", features = ["formatting", "local-offset"] }
+toml = "0.8.2"
 twox-hash = "1.6.3"
 
 # For Linux static binaries, use rustls
 [target.'cfg(target_os = "linux")'.dependencies]
-reqwest = { version = "0.11.18", default-features = false, features = ["blocking", "json", "rustls"] }
-self_update = { version = "0.37.0", default-features = false, features = ["rustls"] }
+reqwest = { version = "0.11.22", default-features = false, features = ["blocking", "json", "rustls"] }
+self_update = { version = "0.38.0", default-features = false, features = ["rustls"] }
 
 # For all other platforms, use native TLS
 [target.'cfg(not(target_os = "linux"))'.dependencies]
-reqwest = "0.11.18"
-self_update = "0.37.0"
+reqwest = "0.11.22"
+self_update = "0.38.0"
 
 [target.'cfg(windows)'.dependencies]
 path-slash = "0.2.1"
@@ -83,5 +83,5 @@ console_error_panic_hook = "0.1.7"
 tracing-wasm = "0.2"
 
 [build-dependencies]
-anyhow = "1.0.71"
-vergen = { version = "8.2.4", features = ["build", "cargo", "git", "gitcl"] }
+anyhow = "1.0.75"
+vergen = { version = "8.2.5", features = ["build", "cargo", "git", "gitcl"] }

src/app.rs

@@ -54,23 +54,39 @@ pub struct ObjectConfig {
 #[inline]
 fn bool_true() -> bool { true }
 
+#[inline]
+fn default_watch_patterns() -> Vec<Glob> {
+    DEFAULT_WATCH_PATTERNS.iter().map(|s| Glob::new(s).unwrap()).collect()
+}
+
 #[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub struct AppConfig {
     // TODO: https://github.com/ron-rs/ron/pull/455
     // #[serde(flatten)]
     // pub version: AppConfigVersion,
     pub version: u32,
+    #[serde(default)]
     pub custom_make: Option<String>,
+    #[serde(default)]
     pub selected_wsl_distro: Option<String>,
+    #[serde(default)]
     pub project_dir: Option<PathBuf>,
+    #[serde(default)]
     pub target_obj_dir: Option<PathBuf>,
+    #[serde(default)]
     pub base_obj_dir: Option<PathBuf>,
+    #[serde(default)]
     pub selected_obj: Option<ObjectConfig>,
+    #[serde(default)]
     pub build_target: bool,
     #[serde(default = "bool_true")]
     pub rebuild_on_changes: bool,
+    #[serde(default)]
     pub auto_update_check: bool,
+    #[serde(default = "default_watch_patterns")]
     pub watch_patterns: Vec<Glob>,
+    #[serde(default)]
+    pub recent_projects: Vec<PathBuf>,
 
     #[serde(skip)]
     pub objects: Vec<ProjectObject>,
@@ -102,6 +118,7 @@ impl Default for AppConfig {
             rebuild_on_changes: true,
             auto_update_check: true,
             watch_patterns: DEFAULT_WATCH_PATTERNS.iter().map(|s| Glob::new(s).unwrap()).collect(),
+            recent_projects: vec![],
             objects: vec![],
             object_nodes: vec![],
             watcher_change: false,
@@ -115,6 +132,11 @@ impl Default for AppConfig {
 
 impl AppConfig {
     pub fn set_project_dir(&mut self, path: PathBuf) {
+        self.recent_projects.retain(|p| p != &path);
+        if self.recent_projects.len() > 9 {
+            self.recent_projects.truncate(9);
+        }
+        self.recent_projects.insert(0, path.clone());
         self.project_dir = Some(path);
         self.target_obj_dir = None;
         self.base_obj_dir = None;
@@ -351,6 +373,23 @@ impl eframe::App for App {
         egui::TopBottomPanel::top("top_panel").show(ctx, |ui| {
             egui::menu::bar(ui, |ui| {
                 ui.menu_button("File", |ui| {
+                    let recent_projects = if let Ok(guard) = config.read() {
+                        guard.recent_projects.clone()
+                    } else {
+                        vec![]
+                    };
+                    if recent_projects.is_empty() {
+                        ui.add_enabled(false, egui::Button::new("Recent Projects…"));
+                    } else {
+                        ui.menu_button("Recent Projects…", |ui| {
+                            for path in recent_projects {
+                                if ui.button(format!("{}", path.display())).clicked() {
+                                    config.write().unwrap().set_project_dir(path);
+                                    ui.close_menu();
+                                }
+                            }
+                        });
+                    }
                     if ui.button("Appearance…").clicked() {
                         *show_appearance_config = !*show_appearance_config;
                         ui.close_menu();

src/obj/mips.rs

@@ -91,6 +91,7 @@ pub fn process_code(
             reloc: reloc.cloned(),
             branch_dest,
             line,
+            orig: None,
         });
         cur_addr += 4;
     }

src/obj/mod.rs

@@ -37,6 +37,7 @@ pub struct ObjSection {
     pub data_diff: Vec<ObjDataDiff>,
     pub match_percent: f32,
 }
+
 #[derive(Debug, Clone)]
 pub enum ObjInsArg {
     PpcArg(ppc750cl::Argument),
@@ -46,6 +47,40 @@ pub enum ObjInsArg {
     RelocWithBase,
     BranchOffset(i32),
 }
+
+// TODO derive PartialEq on ppc750cl::Argument so this isn't necessary
+impl PartialEq for ObjInsArg {
+    fn eq(&self, other: &Self) -> bool {
+        match (self, other) {
+            (ObjInsArg::PpcArg(a), ObjInsArg::PpcArg(b)) => {
+                use ppc750cl::Argument;
+                match (a, b) {
+                    (Argument::GPR(a), Argument::GPR(b)) => a == b,
+                    (Argument::FPR(a), Argument::FPR(b)) => a == b,
+                    (Argument::SR(a), Argument::SR(b)) => a == b,
+                    (Argument::SPR(a), Argument::SPR(b)) => a == b,
+                    (Argument::CRField(a), Argument::CRField(b)) => a == b,
+                    (Argument::CRBit(a), Argument::CRBit(b)) => a == b,
+                    (Argument::GQR(a), Argument::GQR(b)) => a == b,
+                    (Argument::Uimm(a), Argument::Uimm(b)) => a == b,
+                    (Argument::Simm(a), Argument::Simm(b)) => a == b,
+                    (Argument::Offset(a), Argument::Offset(b)) => a == b,
+                    (Argument::BranchDest(a), Argument::BranchDest(b)) => a == b,
+                    (Argument::Bit(a), Argument::Bit(b)) => a == b,
+                    (Argument::OpaqueU(a), Argument::OpaqueU(b)) => a == b,
+                    (_, _) => false,
+                }
+            }
+            (ObjInsArg::MipsArg(a), ObjInsArg::MipsArg(b)) => a == b,
+            (ObjInsArg::MipsArgWithBase(a), ObjInsArg::MipsArgWithBase(b)) => a == b,
+            (ObjInsArg::Reloc, ObjInsArg::Reloc) => true,
+            (ObjInsArg::RelocWithBase, ObjInsArg::RelocWithBase) => true,
+            (ObjInsArg::BranchOffset(a), ObjInsArg::BranchOffset(b)) => a == b,
+            (_, _) => false,
+        }
+    }
+}
+
 #[derive(Debug, Copy, Clone)]
 pub struct ObjInsArgDiff {
     /// Incrementing index for coloring
@@ -86,6 +121,8 @@ pub struct ObjIns {
     pub branch_dest: Option<u32>,
     /// Line info
     pub line: Option<u32>,
+    /// Original (unsimplified) instruction
+    pub orig: Option<String>,
 }
 #[derive(Debug, Clone, Default)]
 pub struct ObjInsDiff {

src/obj/ppc.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use anyhow::Result;
-use ppc750cl::{disasm_iter, Argument};
+use ppc750cl::{disasm_iter, Argument, Ins, SimplifiedIns};
 
 use crate::obj::{ObjIns, ObjInsArg, ObjReloc, ObjRelocKind};
 
@@ -40,7 +40,7 @@ pub fn process_code(
                 _ => ins.code,
             };
         }
-        let simplified = ins.simplified();
+        let simplified = ins.clone().simplified();
         let mut args: Vec<ObjInsArg> = simplified
             .args
             .iter()
@@ -86,10 +86,21 @@ pub fn process_code(
             mnemonic: format!("{}{}", simplified.mnemonic, simplified.suffix),
             args,
             reloc: reloc.cloned(),
-            op: 0,
+            op: ins.op as u8,
             branch_dest: None,
             line,
+            orig: Some(format!("{}", basic_form(ins))),
         });
     }
     Ok((ops, insts))
 }
+
+// TODO make public in ppc750cl
+fn basic_form(ins: Ins) -> SimplifiedIns {
+    SimplifiedIns {
+        mnemonic: ins.op.mnemonic(),
+        suffix: ins.suffix(),
+        args: ins.fields().iter().flat_map(|field| field.argument()).collect(),
+        ins,
+    }
+}

src/views/symbol_diff.rs

@@ -13,7 +13,7 @@ use crate::{
         Job, JobQueue, JobResult,
     },
     obj::{ObjInfo, ObjSection, ObjSectionKind, ObjSymbol, ObjSymbolFlags},
-    views::{appearance::Appearance, write_text},
+    views::{appearance::Appearance, function_diff::FunctionViewState, write_text},
 };
 
 pub struct SymbolReference {
@@ -35,6 +35,7 @@ pub struct DiffViewState {
     pub build: Option<Box<ObjDiffResult>>,
     pub current_view: View,
     pub symbol_state: SymbolViewState,
+    pub function_state: FunctionViewState,
     pub search: String,
     pub queue_build: bool,
     pub build_running: bool,