Update test snapshots for new cwextab

* Update diff.rs

* Fixes

* More fixes

* More fixes...

* Cargo fmt

* fmt

* Trim extra

* cargo +nightly fmt

* Update 'Copy ASM' button text to include emoji

Cargo.toml

@@ -14,7 +14,7 @@ default-members = [
 resolver = "3"
 
 [workspace.package]
-version = "3.4.0"
+version = "3.4.1"
 authors = ["Luke Street <luke@street.dev>"]
 edition = "2024"
 license = "MIT OR Apache-2.0"

deny.toml

@@ -75,6 +75,7 @@ ignore = [
     #{ crate = "a-crate-that-is-yanked@0.1.1", reason = "you can specify why you are ignoring the yanked crate" },
     { id = "RUSTSEC-2024-0436", reason = "Unmaintained paste crate is an indirect dependency" },
     { id = "RUSTSEC-2025-0052", reason = "Unmaintained async-std crate is an indirect dependency" },
+    { id = "RUSTSEC-2025-0119", reason = "Unmaintained number_prefix crate is an indirect dependency" },
 ]
 # If this is true, then cargo deny will use the git executable to fetch advisory database.
 # If this is false, then it uses a built-in git library.

objdiff-cli/Cargo.toml

@@ -16,19 +16,19 @@ publish = false
 anyhow = "1.0"
 argp = "0.4"
 crossterm = "0.29"
-enable-ansi-support = "0.2"
+enable-ansi-support = "0.3"
 memmap2 = "0.9"
 objdiff-core = { path = "../objdiff-core", features = ["all"] }
 prost = "0.14"
 ratatui = "0.29"
-rayon = "1.10"
+rayon = "1.11"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 supports-color = "3.0"
 time = { version = "0.3", features = ["formatting", "local-offset"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-typed-path = "0.11"
+typed-path = "0.12"
 
 [target.'cfg(target_env = "musl")'.dependencies]
 mimalloc = "0.1"

objdiff-cli/src/views/function_diff.rs

@@ -378,7 +378,6 @@ impl UiView for FunctionDiffUi {
                     }
                     // Reload
                     KeyCode::Char('r') => {
-                        result.redraw = true;
                         return EventControlFlow::Reload;
                     }
                     // Scroll right
@@ -400,7 +399,6 @@ impl UiView for FunctionDiffUi {
                                 FunctionRelocDiffs::DataValue => FunctionRelocDiffs::All,
                                 FunctionRelocDiffs::All => FunctionRelocDiffs::None,
                             };
-                        result.redraw = true;
                         return EventControlFlow::Reload;
                     }
                     // Toggle three-way diff

objdiff-core/Cargo.toml

@@ -135,10 +135,10 @@ num-traits = { version = "0.2", default-features = false, optional = true }
 object = { version = "0.37", default-features = false, features = ["read_core", "elf", "coff"] }
 pbjson = { version = "0.8", default-features = false, optional = true }
 prost = { version = "0.14", default-features = false, features = ["derive"], optional = true }
-regex = { version = "1.11", default-features = false, features = [], optional = true }
+regex = { version = "1.12", default-features = false, features = [], optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
 similar = { git = "https://github.com/encounter/similar.git", branch = "no_std", default-features = false, features = ["hashbrown"], optional = true }
-typed-path = { version = "0.11", default-features = false, optional = true }
+typed-path = { version = "0.12", default-features = false, optional = true }
 
 # config
 globset = { version = "0.4", default-features = false, optional = true }
@@ -155,13 +155,13 @@ powerpc = { version = "0.4", optional = true }
 rlwinmdec = { version = "1.1", optional = true }
 
 # mips
-rabbitizer = { version = "2.0.0-alpha.4", default-features = false, features = ["all_extensions"], optional = true }
+rabbitizer = { version = "2.0.0-alpha.7", default-features = false, features = ["all_extensions"], optional = true }
 
 # x86
 iced-x86 = { version = "1.21", default-features = false, features = ["decoder", "intel", "gas", "masm", "nasm", "exhaustive_enums", "no_std"], optional = true }
 
 # arm
-unarm = { version = "2.0", optional = true }
+unarm = { version = "2.1", optional = true }
 arm-attr = { version = "0.2", optional = true }
 
 # arm64
@@ -169,15 +169,15 @@ yaxpeax-arch = { version = "0.3", default-features = false, optional = true }
 yaxpeax-arm = { version = "0.3", default-features = false, optional = true }
 
 # build
-notify = { version = "8.1.0", optional = true }
+notify = { version = "8.2.0", optional = true }
-notify-debouncer-full = { version = "0.5.0", optional = true }
+notify-debouncer-full = { version = "0.6.0", optional = true }
 shell-escape = { version = "0.1", optional = true }
-tempfile = { version = "3.20", optional = true }
+tempfile = { version = "3.23", optional = true }
 time = { version = "0.3", optional = true }
 encoding_rs = { version = "0.8.35", optional = true }
 
 # demangler
-cpp_demangle = { version = "0.4", optional = true, default-features = false, features = ["alloc"] }
+cpp_demangle = { version = "0.5", optional = true, default-features = false, features = ["alloc"] }
 cwdemangle = { version = "1.0", optional = true }
 gnuv2_demangle = { version = "0.4", optional = true }
 msvc-demangler = { version = "0.11", optional = true }

objdiff-core/src/arch/arm.rs

@@ -224,7 +224,10 @@ impl Arch for ArchArm {
             }
 
             // Check how many bytes we can/should read
-            let num_code_bytes = if data.len() >= 4 {
+            let num_code_bytes = if mode == unarm::ParseMode::Data {
+                // 32-bit .word value should be aligned on a 4-byte boundary, otherwise use .hword
+                if address & 3 == 0 { 4 } else { 2 }
+            } else if data.len() >= 4 {
                 // Read 4 bytes even for Thumb, as the parser will determine if it's a 2 or 4 byte instruction
                 4
             } else if mode != unarm::ParseMode::Arm {

objdiff-core/src/diff/data.rs

@@ -37,12 +37,13 @@ pub fn diff_bss_symbol(
 
 pub fn symbol_name_matches(left_name: &str, right_name: &str) -> bool {
     // Match Metrowerks symbol$1234 against symbol$2345
-    if let Some((prefix, suffix)) = left_name.split_once('$') {
+    // and GCC symbol.1234 against symbol.2345
+    if let Some((prefix, suffix)) = left_name.split_once(['$', '.']) {
         if !suffix.chars().all(char::is_numeric) {
             return false;
         }
         right_name
-            .split_once('$')
+            .split_once(['$', '.'])
             .is_some_and(|(p, s)| p == prefix && s.chars().all(char::is_numeric))
     } else {
         left_name == right_name

objdiff-core/src/diff/demangler.rs

@@ -34,9 +34,7 @@ impl Demangler {
 
     fn demangle_itanium(name: &str) -> Option<String> {
         let name = name.trim_start_matches('.');
-        cpp_demangle::Symbol::new(name)
+        cpp_demangle::Symbol::new(name).ok().and_then(|s| s.demangle().ok())
-            .ok()
-            .and_then(|s| s.demangle(&cpp_demangle::DemangleOptions::default()).ok())
     }
 
     fn demangle_gnu_legacy(name: &str) -> Option<String> {

objdiff-core/tests/snapshots/arch_ppc__read_extab.snap

@@ -69,19 +69,19 @@ Object {
                                 action_param: 0,
                                 has_end_bit: true,
                                 bytes: [
+                                    130,
+                                    0,
                                     0,
                                     8,
                                     0,
                                     0,
-                                    0,
-                                    0,
                                 ],
                             },
                         ],
                         relocations: [
                             Relocation {
-                                offset: 20,
+                                offset: 18,
-                                address: 0,
+                                address: 524288,
                             },
                         ],
                     },

objdiff-gui/Cargo.toml

@@ -30,9 +30,9 @@ cfg-if = "1.0"
 const_format = "0.2"
 cwdemangle = "1.0"
 dirs = "6.0"
-egui = "0.32"
+egui = "0.33"
-egui_extras = "0.32"
+egui_extras = "0.33"
-egui-notify = "0.20"
+egui-notify = "0.21"
 filetime = "0.2"
 float-ord = "0.3"
 font-kit = "0.14"
@@ -40,21 +40,21 @@ globset = { version = "0.4", features = ["serde1"] }
 log = "0.4"
 objdiff-core = { path = "../objdiff-core", features = ["all"] }
 open = "5.3"
-png = "0.17"
+png = "0.18"
 pollster = "0.4"
-regex = "1.11"
+regex = "1.12"
 rfd = { version = "0.15" } #, default-features = false, features = ['xdg-portal']
 rlwinmdec = "1.1"
-ron = "0.10"
+ron = "0.12"
 serde = { version = "1.0", features = ["derive"] }
 time = { version = "0.3", features = ["formatting", "local-offset"] }
-typed-path = "0.11"
+typed-path = "0.12"
 winit = { version = "0.30", features = ["default"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Keep version in sync with egui
 [dependencies.eframe]
-version = "0.32"
+version = "0.33"
 features = [
     "default_fonts",
     "glow",
@@ -66,7 +66,7 @@ default-features = false
 
 # Keep version in sync with eframe
 [dependencies.wgpu]
-version = "25.0"
+version = "27.0"
 features = [
     "dx12",
     "metal",

objdiff-gui/src/main.rs

@@ -14,6 +14,7 @@ mod views;
 use std::{
     ffi::OsStr,
     fmt::Display,
+    io::Cursor,
     path::PathBuf,
     process::ExitCode,
     rc::Rc,
@@ -21,7 +22,7 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use anyhow::{Result, ensure};
+use anyhow::{Context, Result, ensure};
 use argp::{FromArgValue, FromArgs};
 use cfg_if::cfg_if;
 use objdiff_core::config::path::check_path_buf;
@@ -90,9 +91,9 @@ struct TopLevel {
 }
 
 fn load_icon() -> Result<egui::IconData> {
-    let decoder = png::Decoder::new(include_bytes!("../assets/icon_64.png").as_ref());
+    let decoder = png::Decoder::new(Cursor::new(include_bytes!("../assets/icon_64.png").as_ref()));
     let mut reader = decoder.read_info()?;
-    let mut buf = vec![0; reader.output_buffer_size()];
+    let mut buf = vec![0; reader.output_buffer_size().context("Buffer too large")?];
     let info = reader.next_frame(&mut buf)?;
     ensure!(info.bit_depth == png::BitDepth::Eight);
     ensure!(info.color_type == png::ColorType::Rgba);

objdiff-gui/src/views/diff.rs

@@ -1,12 +1,18 @@
+use std::cmp::Ordering;
+
 use egui::{Id, Layout, RichText, ScrollArea, TextEdit, Ui, Widget, text::LayoutJob};
 use objdiff_core::{
     build::BuildStatus,
     diff::{
         DiffObjConfig, ObjectDiff, SymbolDiff,
         data::BYTES_PER_ROW,
-        display::{ContextItem, HoverItem, HoverItemColor, SymbolFilter, SymbolNavigationKind},
+        display::{
+            ContextItem, DiffText, HoverItem, HoverItemColor, SymbolFilter, SymbolNavigationKind,
+            display_row,
         },
-    obj::{Object, Symbol},
+    },
+    obj::{InstructionArgValue, Object, Symbol},
+    util::ReallySigned,
 };
 use time::format_description;
 
@@ -64,6 +70,51 @@ impl<'a> DiffColumnContext<'a> {
     pub fn id(&self) -> Option<&str> { self.symbol.map(|(symbol, _, _)| symbol.name.as_str()) }
 }
 
+/// Obtains the assembly text for a given symbol diff, suitable for copying to clipboard.
+fn get_asm_text(
+    obj: &Object,
+    symbol_diff: &SymbolDiff,
+    symbol_idx: usize,
+    diff_config: &DiffObjConfig,
+) -> String {
+    let mut asm_text = String::new();
+
+    for ins_row in &symbol_diff.instruction_rows {
+        let mut line = String::new();
+        let result = display_row(obj, symbol_idx, ins_row, diff_config, |segment| {
+            let text = match segment.text {
+                DiffText::Basic(text) => text.to_string(),
+                DiffText::Line(num) => format!("{num} "),
+                DiffText::Address(addr) => format!("{addr:x}:"),
+                DiffText::Opcode(mnemonic, _op) => format!("{mnemonic} "),
+                DiffText::Argument(arg) => match arg {
+                    InstructionArgValue::Signed(v) => format!("{:#x}", ReallySigned(v)),
+                    InstructionArgValue::Unsigned(v) => format!("{v:#x}"),
+                    InstructionArgValue::Opaque(v) => v.into_owned(),
+                },
+                DiffText::BranchDest(addr) => format!("{addr:x}"),
+                DiffText::Symbol(sym) => sym.demangled_name.as_ref().unwrap_or(&sym.name).clone(),
+                DiffText::Addend(addend) => match addend.cmp(&0i64) {
+                    Ordering::Greater => format!("+{addend:#x}"),
+                    Ordering::Less => format!("-{:#x}", -addend),
+                    _ => String::new(),
+                },
+                DiffText::Spacing(n) => " ".repeat(n.into()),
+                DiffText::Eol => "\n".to_string(),
+            };
+            line.push_str(&text);
+            Ok(())
+        });
+
+        if result.is_ok() {
+            asm_text.push_str(line.trim_end());
+            asm_text.push('\n');
+        }
+    }
+
+    asm_text
+}
+
 #[must_use]
 pub fn diff_view_ui(
     ui: &mut Ui,
@@ -162,6 +213,17 @@ pub fn diff_view_ui(
                             ret = Some(DiffViewAction::CreateScratch(symbol.name.clone()));
                         }
                     }
+
+                    if state.current_view == View::FunctionDiff
+                        && let Some((_, symbol_diff, symbol_idx)) = left_ctx.symbol
+                        && let Some((obj, _)) = left_ctx.obj
+                        && ui
+                            .button("📋 Copy")
+                            .on_hover_text_at_pointer("Copy all rows to clipboard")
+                            .clicked()
+                    {
+                        ui.ctx().copy_text(get_asm_text(obj, symbol_diff, symbol_idx, diff_config));
+                    }
                 });
             }
 
@@ -208,16 +270,20 @@ pub fn diff_view_ui(
 
             // Third row
             if left_ctx.has_symbol() && right_ctx.has_symbol() {
+                ui.horizontal(|ui| {
                     if (state.current_view == View::FunctionDiff
                         && ui
                             .button("Change target")
-                        .on_hover_text_at_pointer("Choose a different symbol to use as the target")
+                            .on_hover_text_at_pointer(
+                                "Choose a different symbol to use as the target",
+                            )
                             .clicked()
                         || hotkeys::consume_change_target_shortcut(ui.ctx()))
                         && let Some(symbol_ref) = state.symbol_state.right_symbol.as_ref()
                     {
                         ret = Some(DiffViewAction::SelectingLeft(symbol_ref.clone()));
                     }
+                });
             } else if left_ctx.status.success && !left_ctx.has_symbol() {
                 ui.horizontal(|ui| {
                     let mut search = state.search.clone();
@@ -291,6 +357,15 @@ pub fn diff_view_ui(
                 {
                     ret = Some(DiffViewAction::OpenSourcePath);
                 }
+                if let Some((_, symbol_diff, symbol_idx)) = right_ctx.symbol
+                    && let Some((obj, _)) = right_ctx.obj
+                    && ui
+                        .button("📋 Copy")
+                        .on_hover_text_at_pointer("Copy all rows to clipboard")
+                        .clicked()
+                {
+                    ui.ctx().copy_text(get_asm_text(obj, symbol_diff, symbol_idx, diff_config));
+                }
             });
 
             // Second row

objdiff-gui/src/views/frame_history.rs

@@ -104,7 +104,7 @@ impl FrameHistory {
             ));
             let cpu_usage = to_screen.inverse().transform_pos(pointer_pos).y;
             let text = format!("{:.1} ms", 1e3 * cpu_usage);
-            shapes.push(ui.fonts(|f| {
+            shapes.push(ui.fonts_mut(|f| {
                 Shape::text(
                     f,
                     pos2(rect.left(), y),

objdiff-gui/src/views/function_diff.rs

@@ -217,7 +217,7 @@ fn asm_row_ui(
     if ins_diff.kind != InstructionDiffKind::None {
         ui.painter().rect_filled(ui.available_rect_before_wrap(), 0.0, ui.visuals().faint_bg_color);
     }
-    let space_width = ui.fonts(|f| f.glyph_width(&appearance.code_font, ' '));
+    let space_width = ui.fonts_mut(|f| f.glyph_width(&appearance.code_font, ' '));
     display_row(obj, symbol_idx, ins_diff, diff_config, |segment| {
         if let Some(action) =
             diff_text_ui(ui, segment, appearance, ins_view_state, column, space_width, &response_cb)

objdiff-wasm/Cargo.toml

@@ -22,8 +22,8 @@ std = ["objdiff-core/std"]
 
 [dependencies]
 log = { version = "0.4", default-features = false }
-regex = { version = "1.11", default-features = false, features = ["unicode-case"] }
+regex = { version = "1.12", default-features = false, features = ["unicode-case"] }
-wit-bindgen = { version = "0.44", default-features = false, features = ["macros"] }
+wit-bindgen = { version = "0.48", default-features = false, features = ["macros"] }
 xxhash-rust = { version = "0.8", default-features = false, features = ["xxh3"] }
 
 [dependencies.objdiff-core]

objdiff-wasm/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "objdiff-wasm",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "objdiff-wasm",
-      "version": "3.4.0",
+      "version": "3.4.1",
       "license": "MIT OR Apache-2.0",
       "devDependencies": {
         "@biomejs/biome": "^1.9.3",

objdiff-wasm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "objdiff-wasm",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "A local diffing tool for decompilation projects.",
   "author": {
     "name": "Luke Street",

objdiff-wasm/src/api.rs

@@ -469,7 +469,8 @@ impl From<obj::SymbolFlagSet> for SymbolFlags {
     fn from(flags: obj::SymbolFlagSet) -> SymbolFlags {
         let mut out = SymbolFlags::empty();
         for flag in flags {
-            out |= match flag {
+            out = out
+                | match flag {
                     obj::SymbolFlag::Global => SymbolFlags::GLOBAL,
                     obj::SymbolFlag::Local => SymbolFlags::LOCAL,
                     obj::SymbolFlag::Weak => SymbolFlags::WEAK,