Limit left-panel scrollview to the file tree (#185 )

* Limit left-panel scrollview to the file tree Removes the redundant build button * Expand ScrollArea to full side panel width * Use auto_shrink(false) instead of set_width --------- Co-authored-by: Luke Street <luke@street.dev>
PPC: Fix pooled relocation addends being added twice sometimes (#184 )
2026-07-10 12:18:36 -07:00 · 2025-04-01 12:35:17 -06:00 · 2025-03-30 22:00:36 -06:00 · 2025-03-30 22:00:06 -06:00 · 2025-03-28 21:48:14 -06:00 · 2025-03-21 08:27:19 -06:00
99 changed files with 16639 additions and 1031 deletions
@@ -0,0 +1,2 @@
+[*.md]
+trim_trailing_whitespace = false
@@ -4,8 +4,8 @@ on:
  pull_request:
  push:
    paths-ignore:
-      - '*.md'
-      - 'LICENSE*'
+      - "*.md"
+      - "LICENSE*"
  workflow_dispatch:

 env:
@@ -32,9 +32,9 @@ jobs:
      - name: Cache Rust workspace
        uses: Swatinem/rust-cache@v2
      - name: Cargo check
-        run: cargo check --features all
+        run: cargo check --all-targets --all-features
      - name: Cargo clippy
-        run: cargo clippy --features all
+        run: cargo clippy --all-targets --all-features

  fmt:
    name: Format
@@ -72,7 +72,7 @@ jobs:
    name: Test
    strategy:
      matrix:
-        platform: [ ubuntu-latest, windows-latest, macos-latest ]
+        platform: [ubuntu-latest, windows-latest, macos-latest]
      fail-fast: false
    runs-on: ${{ matrix.platform }}
    steps:
@@ -148,7 +148,7 @@ jobs:
          python3 -m venv .venv
          . .venv/bin/activate
          echo PATH=$PATH >> $GITHUB_ENV
-          pip install ziglang==0.13.0 cargo-zigbuild==0.19.1
+          pip install ziglang==0.13.0.post1 cargo-zigbuild==0.19.8
      - name: Setup Rust toolchain
        uses: dtolnay/rust-toolchain@stable
        with:
@@ -159,7 +159,7 @@ jobs:
          key: ${{ matrix.target }}
      - name: Cargo build
        run: >
-          cargo ${{ matrix.build }} --profile ${{ env.BUILD_PROFILE }} --target ${{ matrix.target }} 
+          cargo ${{ matrix.build }} --profile ${{ env.BUILD_PROFILE }} --target ${{ matrix.target }}
          --bin ${{ env.CARGO_BIN_NAME }} --features ${{ matrix.features }}
      - name: Upload artifacts
        uses: actions/upload-artifact@v4
@@ -178,21 +178,26 @@ jobs:
      matrix:
        include:
          - platform: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
+            target: x86_64-unknown-linux-gnu.2.31
+            target_base: x86_64-unknown-linux-gnu
            name: linux-x86_64
            packages: libgtk-3-dev
+            build: zigbuild
            features: default
          - platform: windows-latest
            target: x86_64-pc-windows-msvc
            name: windows-x86_64
+            build: build
            features: default
          - platform: macos-latest
            target: x86_64-apple-darwin
            name: macos-x86_64
+            build: build
            features: default
          - platform: macos-latest
            target: aarch64-apple-darwin
            name: macos-arm64
+            build: build
            features: default
      fail-fast: false
    runs-on: ${{ matrix.platform }}
@@ -204,25 +209,32 @@ jobs:
          sudo apt-get -y install ${{ matrix.packages }}
      - name: Checkout
        uses: actions/checkout@v4
+      - name: Install cargo-zigbuild
+        if: matrix.build == 'zigbuild'
+        run: |
+          python3 -m venv .venv
+          . .venv/bin/activate
+          echo PATH=$PATH >> $GITHUB_ENV
+          pip install ziglang==0.13.0.post1 cargo-zigbuild==0.19.8
      - name: Setup Rust toolchain
        uses: dtolnay/rust-toolchain@stable
        with:
-          targets: ${{ matrix.target }}
+          targets: ${{ matrix.target_base || matrix.target }}
      - name: Cache Rust workspace
        uses: Swatinem/rust-cache@v2
        with:
          key: ${{ matrix.target }}
      - name: Cargo build
        run: >
-          cargo build --profile ${{ env.BUILD_PROFILE }} --target ${{ matrix.target }} 
+          cargo ${{ matrix.build }} --profile ${{ env.BUILD_PROFILE }} --target ${{ matrix.target }}
          --bin ${{ env.CARGO_BIN_NAME }} --features ${{ matrix.features }}
      - name: Upload artifacts
        uses: actions/upload-artifact@v4
        with:
          name: ${{ env.CARGO_BIN_NAME }}-${{ matrix.name }}
          path: |
-            target/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}
-            target/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}.exe
+            target/${{ matrix.target_base || matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}
+            target/${{ matrix.target_base || matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}.exe
          if-no-files-found: error

  build-wasm:
@@ -246,7 +258,7 @@ jobs:
    name: Release
    if: startsWith(github.ref, 'refs/tags/')
    runs-on: ubuntu-latest
-    needs: [ build-cli, build-gui ]
+    needs: [build-cli, build-gui]
    permissions:
      contents: write
    steps:
@@ -0,0 +1,36 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+        args: [--markdown-linebreak-ext=md]
+      - id: end-of-file-fixer
+      - id: fix-byte-order-marker
+      - id: check-yaml
+      - id: check-added-large-files
+  - repo: local
+    hooks:
+      - id: cargo-fmt
+        name: cargo fmt
+        description: Run cargo fmt on all project files.
+        language: system
+        entry: cargo
+        args: ["+nightly", "fmt", "--all"]
+        pass_filenames: false
+      - id: cargo clippy
+        name: cargo clippy
+        description: Run cargo clippy on all project files.
+        language: system
+        entry: cargo
+        args: ["+nightly", "clippy", "--all-targets", "--all-features"]
+        pass_filenames: false
+      - id: cargo-deny
+        name: cargo deny
+        description: Run cargo deny on all project files.
+        language: system
+        entry: cargo
+        args: ["deny", "check"]
+        pass_filenames: false
+        always_run: true
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4

 [[package]]
 name = "ab_glyph"
@@ -450,6 +450,18 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"

+[[package]]
+name = "auditable-serde"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7bf8143dfc3c0258df908843e169b5cc5fcf76c7718bd66135ef4a9cd558c5"
+dependencies = [
+ "semver",
+ "serde",
+ "serde_json",
+ "topological-sort",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -3268,7 +3280,7 @@ dependencies = [

 [[package]]
 name = "objdiff-cli"
-version = "3.0.0-alpha.1"
+version = "3.0.0-beta.5"
 dependencies = [
 "anyhow",
 "argp",
@@ -3291,7 +3303,7 @@ dependencies = [

 [[package]]
 name = "objdiff-core"
-version = "3.0.0-alpha.1"
+version = "3.0.0-beta.5"
 dependencies = [
 "anyhow",
 "arm-attr",
@@ -3344,13 +3356,12 @@ dependencies = [

 [[package]]
 name = "objdiff-gui"
-version = "3.0.0-alpha.1"
+version = "3.0.0-beta.5"
 dependencies = [
 "anyhow",
 "cfg-if",
 "const_format",
 "cwdemangle",
- "cwextab",
 "dirs 6.0.0",
 "eframe",
 "egui",
@@ -3370,8 +3381,6 @@ dependencies = [
 "rlwinmdec",
 "ron",
 "serde",
- "serde_json",
- "shell-escape",
 "tauri-winres",
 "time",
 "tracing-subscriber",
@@ -3383,7 +3392,7 @@ dependencies = [

 [[package]]
 name = "objdiff-wasm"
-version = "3.0.0-alpha.1"
+version = "3.0.0-beta.5"
 dependencies = [
 "log",
 "objdiff-core",
@@ -3391,6 +3400,7 @@ dependencies = [
 "talc",
 "wit-bindgen",
 "wit-deps",
+ "xxhash-rust",
 ]

 [[package]]
@@ -3897,7 +3907,7 @@ dependencies = [
 [[package]]
 name = "rabbitizer"
 version = "2.0.0-dev0"
-source = "git+https://github.com/Decompollaborate/rabbitizer.git?branch=🦀#706fd145b788ec3d068d55904dd112c7989e0412"
+source = "git+https://github.com/Decompollaborate/rabbitizer.git?branch=%F0%9F%A6%80#06dc8b6c826c3d60e112d4c2cd70aa54e308be12"
 dependencies = [
 "bitflags 2.9.0",
 ]
@@ -4208,9 +4218,9 @@ dependencies = [

 [[package]]
 name = "ring"
-version = "0.17.11"
+version = "0.17.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73"
+checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
 dependencies = [
 "cc",
 "cfg-if",
@@ -4477,6 +4487,9 @@ name = "semver"
 version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
+dependencies = [
+ "serde",
+]

 [[package]]
 name = "serde"
@@ -5168,6 +5181,12 @@ dependencies = [
 "winnow 0.7.3",
 ]

+[[package]]
+name = "topological-sort"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d"
+
 [[package]]
 name = "tower"
 version = "0.5.2"
@@ -5540,9 +5559,9 @@ dependencies = [

 [[package]]
 name = "wasm-encoder"
-version = "0.225.0"
+version = "0.227.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f7eac0445cac73bcf09e6a97f83248d64356dccf9f2b100199769b6b42464e5"
+checksum = "80bb72f02e7fbf07183443b27b0f3d4144abf8c114189f2e088ed95b696a7822"
 dependencies = [
 "leb128fmt",
 "wasmparser",
@@ -5550,11 +5569,13 @@ dependencies = [

 [[package]]
 name = "wasm-metadata"
-version = "0.225.0"
+version = "0.227.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1d20d0bf2c73c32a5114cf35a5c10ccf9f9aa37a3a2c0114b3e11cbf6faac12"
+checksum = "ce1ef0faabbbba6674e97a56bee857ccddf942785a336c8b47b42373c922a91d"
 dependencies = [
 "anyhow",
+ "auditable-serde",
+ "flate2",
 "indexmap",
 "serde",
 "serde_derive",
@@ -5580,9 +5601,9 @@ dependencies = [

 [[package]]
 name = "wasmparser"
-version = "0.225.0"
+version = "0.227.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36e5456165f81e64cb9908a0fe9b9d852c2c74582aa3fe2be3c2da57f937d3ae"
+checksum = "0f51cad774fb3c9461ab9bccc9c62dfb7388397b5deda31bf40e8108ccd678b2"
 dependencies = [
 "bitflags 2.9.0",
 "hashbrown",
@@ -6303,19 +6324,19 @@ dependencies = [

 [[package]]
 name = "wit-bindgen"
-version = "0.39.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4dd9a372b25d6f35456b0a730d2adabeb0c4878066ba8f8089800349be6ecb5"
+checksum = "8e7091ed6c9abfa4e0a2ef3b39d0539da992d841fcf32c255f64fb98764ffee5"
 dependencies = [
- "wit-bindgen-rt 0.39.0",
+ "wit-bindgen-rt 0.40.0",
 "wit-bindgen-rust-macro",
 ]

 [[package]]
 name = "wit-bindgen-core"
-version = "0.39.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f108fa9b77a346372858b30c11ea903680e7e2b9d820b1a5883e9d530bf51c7e"
+checksum = "398c650cec1278cfb72e214ba26ef3440ab726e66401bd39c04f465ee3979e6b"
 dependencies = [
 "anyhow",
 "heck",
@@ -6333,18 +6354,18 @@ dependencies = [

 [[package]]
 name = "wit-bindgen-rt"
-version = "0.39.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+checksum = "68faed92ae696b93ea9a7b67ba6c37bf09d72c6d9a70fa824a743c3020212f11"
 dependencies = [
 "bitflags 2.9.0",
 ]

 [[package]]
 name = "wit-bindgen-rust"
-version = "0.39.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ba5b852e976d35dbf6cb745746bf1bd4fc26782bab1e0c615fc71a7d8aac05"
+checksum = "83903c8dcd8084a8a67ae08190122cf0e25dc37bdc239070a00f47e22d3f0aae"
 dependencies = [
 "anyhow",
 "heck",
@@ -6358,9 +6379,9 @@ dependencies = [

 [[package]]
 name = "wit-bindgen-rust-macro"
-version = "0.39.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "401529c9af9304a20ed99fa01799e467b7d37727126f0c9a958895471268ad7a"
+checksum = "a7bf7f20495bcc7dc9f24c5fbcac9e919ca5ebdb7a1b1841d74447d3c8dd0c60"
 dependencies = [
 "anyhow",
 "prettyplease",
@@ -6373,9 +6394,9 @@ dependencies = [

 [[package]]
 name = "wit-component"
-version = "0.225.0"
+version = "0.227.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2505c917564c1d74774563bbcd3e4f8c216a6508050862fd5f449ee56e3c5125"
+checksum = "635c3adc595422cbf2341a17fb73a319669cc8d33deed3a48368a841df86b676"
 dependencies = [
 "anyhow",
 "bitflags 2.9.0",
@@ -6417,9 +6438,9 @@ dependencies = [

 [[package]]
 name = "wit-parser"
-version = "0.225.0"
+version = "0.227.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebefaa234e47224f10ce60480c5bfdece7497d0f3b87a12b41ff39e5c8377a78"
+checksum = "ddf445ed5157046e4baf56f9138c124a0824d4d1657e7204d71886ad8ce2fc11"
 dependencies = [
 "anyhow",
 "id-arena",
@@ -6527,6 +6548,12 @@ version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4"

+[[package]]
+name = "xxhash-rust"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
+
 [[package]]
 name = "yaxpeax-arch"
 version = "0.3.2"
@@ -5,7 +5,7 @@ members = [
    "objdiff-gui",
    "objdiff-wasm",
 ]
-resolver = "2"
+resolver = "3"

 [profile.release-lto]
 inherits = "release"
@@ -14,9 +14,9 @@ strip = "debuginfo"
 codegen-units = 1

 [workspace.package]
-version = "3.0.0-alpha.1"
+version = "3.0.0-beta.5"
 authors = ["Luke Street <luke@street.dev>"]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/encounter/objdiff"
-rust-version = "1.82"
+rust-version = "1.85"
@@ -143,15 +143,15 @@ If not specified, objdiff will use the default patterns listed above.
 `units` _(optional)_: If specified, objdiff will display a list of objects in the sidebar for easy navigation.

 > `name` _(optional)_: The name of the object in the UI. If not specified, the object's `path` will be used.
-> 
+>
 > `target_path`: Path to the "target" or "expected" object from the project root.  
 > This object is the **intended result** of the match.
-> 
+>
 > `base_path`: Path to the "base" or "actual" object from the project root.  
 > This object is built from the **current source code**.
-> 
+>
 > `metadata.auto_generated` _(optional)_: Hides the object from the object list, but still includes it in reports.
-> 
+>
 > `metadata.complete` _(optional)_: Marks the object as "complete" (or "linked") in the object list.  
 > This is useful for marking objects that are fully decompiled. A value of `false` will mark the object as "incomplete".

@@ -173,6 +173,21 @@ $ cargo install --locked --git https://github.com/encounter/objdiff.git objdiff-

 The binaries will be installed to `~/.cargo/bin` as `objdiff` and `objdiff-cli`.

+## Installing `pre-commit`
+
+When contributing, it's recommended to install `pre-commit` to automatically run the linter and formatter before a commit.
+
+[`uv`](https://github.com/astral-sh/uv#installation) is recommended to manage Python version and tools.
+
+Rust nightly is required for `cargo +nightly fmt` and `cargo +nightly clippy`.
+
+```shell
+$ cargo install --locked cargo-deny
+$ rustup toolchain install nightly
+$ uv tool install pre-commit
+$ pre-commit install
+```
+
 ## License

 Licensed under either of
@@ -73,6 +73,7 @@ ignore = [
    #{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" },
    #"a-crate-that-is-yanked@0.1.1", # you can also ignore yanked crate versions if you wish
    #{ 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" },
 ]
 # 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.
@@ -4,7 +4,7 @@
 //! For now, this only adds a --version/-V option which causes early-exit.
 use std::ffi::OsStr;

-use argp::{parser::ParseGlobalOptions, EarlyExit, FromArgs, TopLevelCommand};
+use argp::{EarlyExit, FromArgs, TopLevelCommand, parser::ParseGlobalOptions};

 struct ArgsOrVersion<T>(T)
 where T: FromArgs;
@@ -3,40 +3,39 @@ use std::{
    mem,
    str::FromStr,
    sync::{
-        atomic::{AtomicBool, Ordering},
        Arc,
+        atomic::{AtomicBool, Ordering},
    },
    task::{Wake, Waker},
    time::Duration,
 };

-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{Context, Result, anyhow, bail};
 use argp::FromArgs;
 use crossterm::{
    event,
    event::{DisableMouseCapture, EnableMouseCapture},
    terminal::{
-        disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen, SetTitle,
+        EnterAlternateScreen, LeaveAlternateScreen, SetTitle, disable_raw_mode, enable_raw_mode,
    },
 };
 use objdiff_core::{
    bindings::diff::DiffResult,
    build::{
-        watcher::{create_watcher, Watcher},
-        BuildConfig,
+        BuildConfig, BuildStatus,
+        watcher::{Watcher, create_watcher},
    },
    config::{
-        build_globset,
+        ProjectConfig, ProjectObject, ProjectObjectMetadata, build_globset,
        path::{check_path_buf, platform_path, platform_path_serde_option},
-        ProjectConfig, ProjectObject, ProjectObjectMetadata,
    },
    diff::{
        self, ConfigEnum, ConfigPropertyId, ConfigPropertyKind, DiffObjConfig, MappingConfig,
        ObjectDiff,
    },
    jobs::{
-        objdiff::{start_build, ObjDiffConfig},
        Job, JobQueue, JobResult,
+        objdiff::{ObjDiffConfig, start_build},
    },
    obj::{self, Object},
 };
@@ -45,10 +44,10 @@ use typed_path::{Utf8PlatformPath, Utf8PlatformPathBuf};

 use crate::{
    util::{
-        output::{write_output, OutputFormat},
+        output::{OutputFormat, write_output},
        term::crossterm_panic_handler,
    },
-    views::{function_diff::FunctionDiffUi, EventControlFlow, EventResult, UiView},
+    views::{EventControlFlow, EventResult, UiView, function_diff::FunctionDiffUi},
 };

 #[derive(FromArgs, PartialEq, Debug)]
@@ -252,6 +251,8 @@ pub struct AppState {
    pub project_config: Option<ProjectConfig>,
    pub target_path: Option<Utf8PlatformPathBuf>,
    pub base_path: Option<Utf8PlatformPathBuf>,
+    pub left_status: Option<BuildStatus>,
+    pub right_status: Option<BuildStatus>,
    pub left_obj: Option<(Object, ObjectDiff)>,
    pub right_obj: Option<(Object, ObjectDiff)>,
    pub prev_obj: Option<(Object, ObjectDiff)>,
@@ -349,6 +350,8 @@ impl AppState {
                JobResult::None => unreachable!("Unexpected JobResult::None"),
                JobResult::ObjDiff(result) => {
                    let result = result.unwrap();
+                    self.left_status = Some(result.first_status);
+                    self.right_status = Some(result.second_status);
                    self.left_obj = result.first_obj;
                    self.right_obj = result.second_obj;
                    self.reload_time = Some(result.time);
@@ -389,6 +392,8 @@ fn run_interactive(
        project_config,
        target_path,
        base_path,
+        left_status: None,
+        right_status: None,
        left_obj: None,
        right_obj: None,
        prev_obj: None,
@@ -426,15 +431,17 @@ fn run_interactive(
    let mut result = EventResult { redraw: true, ..Default::default() };
    'outer: loop {
        if result.redraw {
-            terminal.draw(|f| loop {
-                result.redraw = false;
-                view.draw(&state, f, &mut result);
-                result.click_xy = None;
-                if !result.redraw {
-                    break;
+            terminal.draw(|f| {
+                loop {
+                    result.redraw = false;
+                    view.draw(&state, f, &mut result);
+                    result.click_xy = None;
+                    if !result.redraw {
+                        break;
+                    }
+                    // Clear buffer on redraw
+                    f.buffer_mut().reset();
                }
-                // Clear buffer on redraw
-                f.buffer_mut().reset();
            })?;
        }
        loop {
@@ -1,12 +1,11 @@
 use std::{collections::HashSet, fs::File, io::Read, time::Instant};

-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use argp::FromArgs;
 use objdiff_core::{
    bindings::report::{
-        ChangeItem, ChangeItemInfo, ChangeUnit, Changes, ChangesInput, Measures, Report,
-        ReportCategory, ReportItem, ReportItemMetadata, ReportUnit, ReportUnitMetadata,
-        REPORT_VERSION,
+        ChangeItem, ChangeItemInfo, ChangeUnit, Changes, ChangesInput, Measures, REPORT_VERSION,
+        Report, ReportCategory, ReportItem, ReportItemMetadata, ReportUnit, ReportUnitMetadata,
    },
    config::path::platform_path,
    diff, obj,
@@ -19,7 +18,7 @@ use typed_path::{Utf8PlatformPath, Utf8PlatformPathBuf};

 use crate::{
    cmd::diff::ObjectConfig,
-    util::output::{write_output, OutputFormat},
+    util::output::{OutputFormat, write_output},
 };

 #[derive(FromArgs, PartialEq, Debug)]
@@ -203,14 +202,13 @@ fn report_object(
    for ((section_idx, section), section_diff) in
        obj.sections.iter().enumerate().zip(&obj_diff.sections)
    {
+        if section.kind == SectionKind::Unknown {
+            continue;
+        }
        let section_match_percent = section_diff.match_percent.unwrap_or_else(|| {
            // Support cases where we don't have a target object,
            // assume complete means 100% match
-            if object.complete.unwrap_or(false) {
-                100.0
-            } else {
-                0.0
-            }
+            if object.complete.unwrap_or(false) { 100.0 } else { 0.0 }
        });
        sections.push(ReportItem {
            name: section.name.clone(),
@@ -237,6 +235,7 @@ fn report_object(
            if symbol.section != Some(section_idx)
                || symbol.size == 0
                || symbol.flags.contains(SymbolFlag::Hidden)
+                || symbol.flags.contains(SymbolFlag::Ignored)
            {
                continue;
            }
@@ -251,11 +250,7 @@ fn report_object(
            let match_percent = symbol_diff.match_percent.unwrap_or_else(|| {
                // Support cases where we don't have a target object,
                // assume complete means 100% match
-                if object.complete.unwrap_or(false) {
-                    100.0
-                } else {
-                    0.0
-                }
+                if object.complete.unwrap_or(false) { 100.0 } else { 0.0 }
            });
            measures.fuzzy_match_percent += match_percent * symbol.size as f32;
            measures.total_code += symbol.size;
@@ -17,7 +17,7 @@ use anyhow::{Error, Result};
 use argp::{FromArgValue, FromArgs};
 use enable_ansi_support::enable_ansi_support;
 use supports_color::Stream;
-use tracing_subscriber::{filter::LevelFilter, EnvFilter};
+use tracing_subscriber::{EnvFilter, filter::LevelFilter};

 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
 enum LogLevel {
@@ -5,7 +5,7 @@ use std::{
    path::Path,
 };

-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use tracing::info;

 #[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
@@ -3,7 +3,7 @@ use std::{io::stdout, panic};
 use crossterm::{
    cursor::Show,
    event::DisableMouseCapture,
-    terminal::{disable_raw_mode, LeaveAlternateScreen},
+    terminal::{LeaveAlternateScreen, disable_raw_mode},
 };

 pub fn crossterm_panic_handler() {
@@ -1,18 +1,19 @@
 use core::cmp::Ordering;

-use anyhow::{bail, Result};
+use anyhow::Result;
 use crossterm::event::{Event, KeyCode, KeyEventKind, KeyModifiers, MouseButton, MouseEventKind};
 use objdiff_core::{
+    build::BuildStatus,
    diff::{
-        display::{display_row, DiffText, DiffTextColor, HighlightKind},
        DiffObjConfig, FunctionRelocDiffs, InstructionDiffKind, ObjectDiff, SymbolDiff,
+        display::{DiffText, DiffTextColor, HighlightKind, display_row},
    },
    obj::Object,
 };
 use ratatui::{
+    Frame,
    prelude::*,
    widgets::{Block, Borders, Clear, Paragraph, Scrollbar, ScrollbarOrientation, ScrollbarState},
-    Frame,
 };

 use super::{EventControlFlow, EventResult, UiView};
@@ -126,6 +127,11 @@ impl UiView for FunctionDiffUi {
            );
            max_width = max_width.max(text.width());
            left_text = Some(text);
+        } else if let Some(status) = &state.left_status {
+            let mut text = Text::default();
+            self.print_build_status(&mut text, status);
+            max_width = max_width.max(text.width());
+            left_text = Some(text);
        }

        let mut right_text = None;
@@ -155,6 +161,11 @@ impl UiView for FunctionDiffUi {
            let rect = content_chunks[1].inner(Margin::new(1, 1));
            self.print_margin(&mut text, symbol_diff, rect);
            margin_text = Some(text);
+        } else if let Some(status) = &state.right_status {
+            let mut text = Text::default();
+            self.print_build_status(&mut text, status);
+            max_width = max_width.max(text.width());
+            right_text = Some(text);
        }

        let mut prev_text = None;
@@ -453,7 +464,7 @@ impl UiView for FunctionDiffUi {
            }
            (Some((_l, _ls, ld)), None) => ld.instruction_rows.len(),
            (None, Some((_r, _rs, rd))) => rd.instruction_rows.len(),
-            (None, None) => bail!("Symbol not found: {}", self.symbol_name),
+            (None, None) => 0,
        };
        self.left_sym = left_sym;
        self.right_sym = right_sym;
@@ -596,6 +607,18 @@ impl FunctionDiffUi {
            }
        }
    }
+
+    fn print_build_status<'a>(&self, out: &mut Text<'a>, status: &'a BuildStatus) {
+        if !status.cmdline.is_empty() {
+            out.lines.push(Line::styled(status.cmdline.clone(), Style::new().fg(Color::LightBlue)));
+        }
+        for line in status.stdout.lines() {
+            out.lines.push(Line::styled(line, Style::new().fg(Color::White)));
+        }
+        for line in status.stderr.lines() {
+            out.lines.push(Line::styled(line, Style::new().fg(Color::Red)));
+        }
+    }
 }

 pub const COLOR_ROTATION: [Color; 7] = [
@@ -81,6 +81,8 @@ std = [
 ]
 mips = [
    "any-arch",
+    "dep:cpp_demangle",
+    "dep:cwdemangle",
    "dep:rabbitizer",
 ]
 ppc = [
@@ -19,7 +19,15 @@ fn compile_protos() {
        .map(|m| m.modified().unwrap())
        .unwrap_or(std::time::SystemTime::UNIX_EPOCH);
    let mut run_protoc = false;
-    let proto_files = vec![root.join("report.proto")];
+    let proto_files = root
+        .read_dir()
+        .unwrap()
+        .filter_map(|e| {
+            let e = e.unwrap();
+            let path = e.path();
+            (path.extension() == Some(std::ffi::OsStr::new("proto"))).then_some(path)
+        })
+        .collect::<Vec<_>>();
    for proto_file in &proto_files {
        println!("cargo:rerun-if-changed={}", proto_file.display());
        let mtime = match std::fs::metadata(proto_file) {
@@ -187,6 +187,20 @@
        }
      ]
    },
+    {
+      "id": "mips.registerPrefix",
+      "type": "boolean",
+      "default": false,
+      "name": "Register '$' prefix",
+      "description": "Display MIPS register names with a '$' prefix."
+    },
+    {
+      "id": "ppc.calculatePoolRelocations",
+      "type": "boolean",
+      "default": true,
+      "name": "Calculate pooled data references",
+      "description": "Display pooled data references in functions as fake relocations."
+    },
    {
      "id": "x86.formatter",
      "type": "choice",
@@ -242,7 +256,15 @@
      "name": "MIPS",
      "properties": [
        "mips.abi",
-        "mips.instrCategory"
+        "mips.instrCategory",
+        "mips.registerPrefix"
+      ]
+    },
+    {
+      "id": "ppc",
+      "name": "PowerPC",
+      "properties": [
+        "ppc.calculatePoolRelocations"
      ]
    },
    {
@@ -253,4 +275,4 @@
      ]
    }
  ]
-}
+}
@@ -0,0 +1,59 @@
+syntax = "proto3";
+
+import "report.proto";
+
+package objdiff.report;
+
+// A pair of reports to compare and generate changes
+message ChangesInput {
+  // The previous report
+  Report from = 1;
+  // The current report
+  Report to = 2;
+}
+
+// Changes between two reports
+message Changes {
+  // The progress info for the previous report
+  Measures from = 1;
+  // The progress info for the current report
+  Measures to = 2;
+  // Units that changed
+  repeated ChangeUnit units = 3;
+}
+
+// A changed unit
+message ChangeUnit {
+  // The name of the unit
+  string name = 1;
+  // The previous progress info (omitted if new)
+  optional Measures from = 2;
+  // The current progress info (omitted if removed)
+  optional Measures to = 3;
+  // Sections that changed
+  repeated ChangeItem sections = 4;
+  // Functions that changed
+  repeated ChangeItem functions = 5;
+  // Extra metadata for this unit
+  optional ReportUnitMetadata metadata = 6;
+}
+
+// A changed section or function
+message ChangeItem {
+  // The name of the item
+  string name = 1;
+  // The previous progress info (omitted if new)
+  optional ChangeItemInfo from = 2;
+  // The current progress info (omitted if removed)
+  optional ChangeItemInfo to = 3;
+  // Extra metadata for this item
+  optional ReportItemMetadata metadata = 4;
+}
+
+// Progress info for a section or function
+message ChangeItemInfo {
+  // The overall match percent for this item
+  float fuzzy_match_percent = 1;
+  // The size of the item in bytes
+  uint64 size = 2;
+}
@@ -2,6 +2,18 @@ syntax = "proto3";

 package objdiff.report;

+// Project progress report
+message Report {
+  // Overall progress info
+  Measures measures = 1;
+  // Units within this report
+  repeated ReportUnit units = 2;
+  // Report version
+  uint32 version = 3;
+  // Progress categories
+  repeated ReportCategory categories = 4;
+}
+
 // Progress info for a report or unit
 message Measures {
  // Overall match percent, including partially matched functions and data
@@ -38,18 +50,6 @@ message Measures {
  uint32 complete_units = 16;
 }

-// Project progress report
-message Report {
-  // Overall progress info
-  Measures measures = 1;
-  // Units within this report
-  repeated ReportUnit units = 2;
-  // Report version
-  uint32 version = 3;
-  // Progress categories
-  repeated ReportCategory categories = 4;
-}
-
 message ReportCategory {
  // The ID of the category
  string id = 1;
@@ -108,57 +108,3 @@ message ReportItemMetadata {
  // The virtual address of the function or section
  optional uint64 virtual_address = 2;
 }
-
-// A pair of reports to compare and generate changes
-message ChangesInput {
-  // The previous report
-  Report from = 1;
-  // The current report
-  Report to = 2;
-}
-
-// Changes between two reports
-message Changes {
-  // The progress info for the previous report
-  Measures from = 1;
-  // The progress info for the current report
-  Measures to = 2;
-  // Units that changed
-  repeated ChangeUnit units = 3;
-}
-
-// A changed unit
-message ChangeUnit {
-  // The name of the unit
-  string name = 1;
-  // The previous progress info (omitted if new)
-  optional Measures from = 2;
-  // The current progress info (omitted if removed)
-  optional Measures to = 3;
-  // Sections that changed
-  repeated ChangeItem sections = 4;
-  // Functions that changed
-  repeated ChangeItem functions = 5;
-  // Extra metadata for this unit
-  optional ReportUnitMetadata metadata = 6;
-}
-
-// A changed section or function
-message ChangeItem {
-  // The name of the item
-  string name = 1;
-  // The previous progress info (omitted if new)
-  optional ChangeItemInfo from = 2;
-  // The current progress info (omitted if removed)
-  optional ChangeItemInfo to = 3;
-  // Extra metadata for this item
-  optional ReportItemMetadata metadata = 4;
-}
-
-// Progress info for a section or function
-message ChangeItemInfo {
-  // The overall match percent for this item
-  float fuzzy_match_percent = 1;
-  // The size of the item in bytes
-  uint64 size = 2;
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Steven Casper	9b557e4c8e	Limit left-panel scrollview to the file tree (#185 ) * Limit left-panel scrollview to the file tree Removes the redundant build button * Expand ScrollArea to full side panel width * Use auto_shrink(false) instead of set_width --------- Co-authored-by: Luke Street <luke@street.dev>	2025-04-01 12:35:17 -06:00
LagoLunatic	b9ba5796ed	PPC: Fix pooled relocation addends being added twice sometimes (#184 )	2025-03-30 22:00:36 -06:00
LagoLunatic	e101610416	ARM: Fix subtract with overflow error when no mapping symbol at address 0 (#183 )	2025-03-30 22:00:06 -06:00
LagoLunatic	196c003a92	Reimplement colorized data relocation hover diffs (#182 ) * Reimplement colorized data relocation hover diffs * Fix objdiff-wasm build Data diffing doesn't seem to be fully implemented in objdiff-wasm yet, so just putting placeholders in so it compiles. * Reloc hover: Add separators, override special color too	2025-03-28 21:48:14 -06:00
Luke Street	7b00a9e9f2	wasm: Cache objects via data hash (XXH3)	2025-03-21 08:27:19 -06:00
Luke Street	311de887ec	Update test snapshot	2025-03-19 19:00:57 -06:00
Luke Street	485b259c32	Apply clippy suggestion	2025-03-19 19:00:01 -06:00
Luke Street	d8fdfaa2c0	Fix no_std build	2025-03-19 18:57:41 -06:00
Luke Street	2612cda1fb	objdiff-cli report: Skip unknown sections Regression in v3.0.0-alpha.1 Fixes #171	2025-03-19 18:54:34 -06:00
Luke Street	bc46e17824	x86_64: Fix relocation placement in instruction	2025-03-19 18:54:34 -06:00
Luke Street	e735adbd3d	x86: Support inline data for jumptables	2025-03-19 18:54:34 -06:00
Luke Street	6768df9d80	Version v3.0.0-beta.4	2025-03-18 21:36:37 -06:00
Luke Street	eaba2391e0	arm: Fix thumb & data decoding, add tests	2025-03-18 21:26:28 -06:00
Luke Street	bd8f5ede23	Add pre-commit hooks	2025-03-18 21:26:28 -06:00
Luke Street	acf46c6b54	Fix no_std build	2025-03-14 09:49:31 -06:00
Luke Street	9358d8ec60	mips: Add C++ symbol demangling (CW & modern GCC)	2025-03-14 09:44:15 -06:00
Luke Street	809e2ffddc	cargo fmt	2025-03-11 21:43:32 -06:00
Luke Street	87fa29e8b0	objdiff-wasm: Fix symbol filtering regex crate needed the `unicode-case` feature	2025-03-11 21:42:14 -06:00
Luke Street	42d4c38079	mips: Ignore `.NON_MATCHING` functions from `INLINE_ASM` macros	2025-03-11 21:39:17 -06:00
Luke Street	fa26200ed7	Silence warning	2025-03-10 22:22:05 -06:00
Luke Street	a0e7f9bc37	Fix x86 mov relocations with uint32	2025-03-10 22:09:58 -06:00
Luke Street	5898d7aebf	Fix section ordering with many same-named sections Before, this was comparing, for example, `.text-2` with `.text-10` with standard string comparison, yielding `.text-10` before `.text-2`. Instead, this simply uses a stable sort by name, which preserves the relative ordering of sections.	2025-03-10 21:51:54 -06:00
Luke Street	ffb38d1bb0	Fix cargo deny advisories	2025-03-09 22:59:42 -06:00
Luke Street	d56dda72f0	Version v3.0.0-beta.2	2025-03-09 22:56:28 -06:00
Luke Street	c6971f3f2d	Add initial support for x86-64 relocations	2025-03-09 22:51:43 -06:00
Luke Street	3965a035fa	objdiff-cli diff: Show build errors/log	2025-03-09 22:51:43 -06:00
Luke Street	f1fc29f77e	Split report changes into separate proto	2025-03-08 14:39:15 -07:00
Luke Street	7c4f1c5d13	Fix left/right arch mismatches in diff code	2025-03-08 10:44:44 -07:00
Luke Street	fa4a6cadbb	Downgrade objdiff-wasm Rust edition temporarily	2025-03-04 23:27:17 -07:00
Luke Street	799971d54e	Migrate to Rust edition 2024	2025-03-04 22:31:38 -07:00
Luke Street	8eef37e8df	Version v3.0.0-beta.1	2025-03-04 22:24:55 -07:00
Luke Street	5f36916087	Fix unintended unwrap in load_font_if_needed	2025-03-04 22:24:20 -07:00
Luke Street	ee667a2dde	Update config-schema.json: PPC -> PowerPC	2025-03-04 22:23:45 -07:00
LagoLunatic	cf5fc54cfa	PPC: Reimplement pooled data reference calculation (#167 ) * PPC: Calculate pooled relocations Reimplements #140 The relocations are now generated when the object is first read in `parse`, right after the real relocations are read. `resolve_relocation` was changed to take `obj.symbols` instead of `obj` as an argument, because `obj` itself doesn't exist yet at the time the relocations are being read. * Improve readability of PPC pool relocs code * Fix regression causing extern pool relocs to be ignored * Fix showing incorrect diff when diffing weak stripped symbol with an addend This is a regression that was introduced by #158 diffing addends in addition to symbol names. But it's not really a bug in that PR, rather it seems like I simply never added the offset into the addend when creating a fake pool relocation for an extern symbol. So this commit fixes that root issue instead. * Add PPC "Calculate pooled data references" option * Fix objdiff-wasm compilation errors * Update PPC test snapshots	2025-03-04 20:40:34 -07:00
Luke Street	1cdfa1e857	Update rabbitizer & utilize `use_dollar` option	2025-03-04 09:38:59 -07:00
Luke Street	3f157f33a5	Reorder tooltip/context items slightly	2025-03-04 09:10:54 -07:00
LagoLunatic	a1ea2919f8	Reimplement function data value tooltips, function data value diffing, and data relocation diffing (#166 ) * Show data literal values on instruction hover Reimplements #108 * Show reloc diffs in func view when data's content differs Reimplements #153 * Data diff view: Show relocs on hover and in context menu This reimplements #154 Note that colorizing the text depending on the kind of diff has still not been reimplemented yet * Fix up some comments	2025-03-04 08:56:46 -07:00
Luke Street	9c31c82a37	cargo fmt	2025-03-03 21:08:36 -07:00
Luke Street	4f34dfa194	Don't infer sizes for labels within another symbol	2025-03-03 21:01:22 -07:00
Luke Street	ae6d37a10b	Version v3.0.0-alpha.2	2025-03-03 18:25:38 -07:00
Luke Street	06e54f3456	cargo fmt	2025-03-03 17:16:35 -07:00
Luke Street	6ed07bfaf1	MIPS relocation pairing, '$' prefix option & fixes Implements MIPS relocation pairing logic. New option for "Register '$' prefix", off by default. Fixes various regressions introduced by refactoring. Resolves #122 Resolves #156	2025-03-03 17:14:32 -07:00
Luke Street	80e939653a	Build objdiff-gui against older glibc Resolves #165	2025-03-03 13:34:05 -07:00