Parse rlib

.github/workflows/check-and-lint.yaml

@@ -32,134 +32,7 @@ jobs:
         run: cargo fmt --all --check
 
       - name: Native version of cargo-show-asm (Intel ASM)
-        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --rust
-
-      - name: Native version of cargo-show-asm (Intel ASM) + native CPU
-        run: cargo run -- --manifest-path sample/Cargo.toml --native --intel sample::main --rust
-
-      - name: Native version of cargo-show-asm (Intel ASM) + native CPU + no default features
-        run: cargo run -- -vvv --manifest-path sample/Cargo.toml --native --intel sample::main --rust --no-default-features
-
-      - name: Native version of cargo-show-asm (Intel ASM) + atom
-        run: cargo run -- --manifest-path sample/Cargo.toml --target-cpu atom --intel sample::main --rust
-
-      - name: Native version of cargo-show-asm with symbol mangling (Intel ASM)
-        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --rust --keep-mangled
-
-      - name: Native version of cargo-show-asm (LLVM)
-        run: cargo run -- --manifest-path sample/Cargo.toml --llvm sample::main
-
-      - name: Native version of cargo-show-asm with symbol mangling (LLVM)
-        run: cargo run -- --manifest-path sample/Cargo.toml --llvm --keep-mangled sample::main
-
-      - name: Native version of cargo-show-asm (LLVM Input)
-        run: cargo run -- --manifest-path sample/Cargo.toml --llvm-input sample::main
-
-      - name: Native version of cargo-show-asm (MIR)
-        run: cargo run -- --manifest-path sample/Cargo.toml --mir "main()"
-
-      - name: Crosscompiled version of cargo-show-asm (Intel ASM)
-        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --target armv7-unknown-linux-gnueabihf
-
-      - name: Rlib project, AT&T asm
-        run: cargo run -- --manifest-path sample_rlib/Cargo.toml --att
-
-      - name: cdylib project
-        run: cargo run -- --manifest-path sample_cdylib/Cargo.toml add
-
-      - name: cdylib project, underscore prefix
-        run: cargo run -- --manifest-path sample_cdylib/Cargo.toml _mul
-
-  windows:
-    runs-on: windows-latest
-    name: Tests on windows
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Install rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: stable
-          components: rustfmt clippy rust-src
-          targets: armv7-unknown-linux-gnueabihf
-
-      - name: Build all the things
-        run: cargo build --tests
-
-      - name: Run unit tests
-        run: cargo test --all-features
-
-      - name: Clippy
-        run: cargo clippy -- -D clippy::disallowed_macros
-
-      - name: Check formatting
-        run: cargo fmt --all --check
-
-      - name: Native version of cargo-show-asm (Intel ASM)
-        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --rust
-
-      - name: Native version of cargo-show-asm (Intel ASM) + native CPU
-        run: cargo run -- --manifest-path sample/Cargo.toml --native --intel sample::main --rust
-
-      - name: Native version of cargo-show-asm (Intel ASM) + native CPU + no default features
-        run: cargo run -- -vvv --manifest-path sample/Cargo.toml --native --intel sample::main --rust --no-default-features
-
-      - name: Native version of cargo-show-asm (Intel ASM) + atom
-        run: cargo run -- --manifest-path sample/Cargo.toml --target-cpu atom --intel sample::main --rust
-
-      - name: Native version of cargo-show-asm with symbol mangling (Intel ASM)
-        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --rust --keep-mangled
-
-      - name: Native version of cargo-show-asm (LLVM)
-        run: cargo run -- --manifest-path sample/Cargo.toml --llvm sample::main
-
-      - name: Native version of cargo-show-asm with symbol mangling (LLVM)
-        run: cargo run -- --manifest-path sample/Cargo.toml --llvm --keep-mangled sample::main
-
-      - name: Native version of cargo-show-asm (LLVM Input)
-        run: cargo run -- --manifest-path sample/Cargo.toml --llvm-input sample::main
-
-      - name: Native version of cargo-show-asm (MIR)
-        run: cargo run -- --manifest-path sample/Cargo.toml --mir "main()"
-
-      - name: Crosscompiled version of cargo-show-asm (Intel ASM)
-        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --target armv7-unknown-linux-gnueabihf
-
-      - name: Rlib project, AT&T asm
-        run: cargo run -- --manifest-path sample_rlib/Cargo.toml --att
-
-      - name: cdylib project
-        run: cargo run -- --manifest-path sample_cdylib/Cargo.toml --everything
-
-  macos:
-    runs-on: macos-latest
-    name: Tests on MacOS
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Install rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: stable
-          components: rustfmt clippy rust-src
-          targets: armv7-unknown-linux-gnueabihf
-
-      - name: Build all the things
-        run: cargo build --tests
-
-      - name: Run unit tests
-        run: cargo test --all-features
-
-      - name: Clippy
-        run: cargo clippy -- -D clippy::disallowed_macros
-
-      - name: Check formatting
-        run: cargo fmt --all --check
-
-      - name: Native version of cargo-show-asm (Intel ASM)
-        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --rust
+        run: cargo run -- -vvv --manifest-path sample/Cargo.toml --intel sample::main --rust
 
       - name: Native version of cargo-show-asm (Intel ASM) + native CPU
         run: cargo run -- --manifest-path sample/Cargo.toml --native --intel sample::main --rust
@@ -196,3 +69,130 @@ jobs:
 
       - name: cdylib project, underscore prefix
         run: cargo run -- --manifest-path sample_cdylib/Cargo.toml _mul
+#
+#  windows:
+#    runs-on: windows-latest
+#    name: Tests on windows
+#    steps:
+#      - name: Checkout repo
+#        uses: actions/checkout@v3
+#
+#      - name: Install rust toolchain
+#        uses: dtolnay/rust-toolchain@stable
+#        with:
+#          toolchain: stable
+#          components: rustfmt clippy rust-src
+#          targets: armv7-unknown-linux-gnueabihf
+#
+#      - name: Build all the things
+#        run: cargo build --tests
+#
+#      - name: Run unit tests
+#        run: cargo test --all-features
+#
+#      - name: Clippy
+#        run: cargo clippy -- -D clippy::disallowed_macros
+#
+#      - name: Check formatting
+#        run: cargo fmt --all --check
+#
+#      - name: Native version of cargo-show-asm (Intel ASM)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --rust
+#
+#      - name: Native version of cargo-show-asm (Intel ASM) + native CPU
+#        run: cargo run -- --manifest-path sample/Cargo.toml --native --intel sample::main --rust
+#
+#      - name: Native version of cargo-show-asm (Intel ASM) + native CPU + no default features
+#        run: cargo run -- -vvv --manifest-path sample/Cargo.toml --native --intel sample::main --rust --no-default-features
+#
+#      - name: Native version of cargo-show-asm (Intel ASM) + atom
+#        run: cargo run -- --manifest-path sample/Cargo.toml --target-cpu atom --intel sample::main --rust
+#
+#      - name: Native version of cargo-show-asm with symbol mangling (Intel ASM)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --rust --keep-mangled
+#
+#      - name: Native version of cargo-show-asm (LLVM)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --llvm sample::main
+#
+#      - name: Native version of cargo-show-asm with symbol mangling (LLVM)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --llvm --keep-mangled sample::main
+#
+#      - name: Native version of cargo-show-asm (LLVM Input)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --llvm-input sample::main
+#
+#      - name: Native version of cargo-show-asm (MIR)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --mir "main()"
+#
+#      - name: Crosscompiled version of cargo-show-asm (Intel ASM)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --target armv7-unknown-linux-gnueabihf
+#
+#      - name: Rlib project, AT&T asm
+#        run: cargo run -- --manifest-path sample_rlib/Cargo.toml --att
+#
+#      - name: cdylib project
+#        run: cargo run -- --manifest-path sample_cdylib/Cargo.toml --everything
+#
+#  macos:
+#    runs-on: macos-latest
+#    name: Tests on MacOS
+#    steps:
+#      - name: Checkout repo
+#        uses: actions/checkout@v3
+#
+#      - name: Install rust toolchain
+#        uses: dtolnay/rust-toolchain@stable
+#        with:
+#          toolchain: stable
+#          components: rustfmt clippy rust-src
+#          targets: armv7-unknown-linux-gnueabihf
+#
+#      - name: Build all the things
+#        run: cargo build --tests
+#
+#      - name: Run unit tests
+#        run: cargo test --all-features
+#
+#      - name: Clippy
+#        run: cargo clippy -- -D clippy::disallowed_macros
+#
+#      - name: Check formatting
+#        run: cargo fmt --all --check
+#
+#      - name: Native version of cargo-show-asm (Intel ASM)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --rust
+#
+#      - name: Native version of cargo-show-asm (Intel ASM) + native CPU
+#        run: cargo run -- --manifest-path sample/Cargo.toml --native --intel sample::main --rust
+#
+#      - name: Native version of cargo-show-asm (Intel ASM) + native CPU + no default features
+#        run: cargo run -- -vvv --manifest-path sample/Cargo.toml --native --intel sample::main --rust --no-default-features
+#
+#      - name: Native version of cargo-show-asm (Intel ASM) + atom
+#        run: cargo run -- --manifest-path sample/Cargo.toml --target-cpu atom --intel sample::main --rust
+#
+#      - name: Native version of cargo-show-asm with symbol mangling (Intel ASM)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --rust --keep-mangled
+#
+#      - name: Native version of cargo-show-asm (LLVM)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --llvm sample::main
+#
+#      - name: Native version of cargo-show-asm with symbol mangling (LLVM)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --llvm --keep-mangled sample::main
+#
+#      - name: Native version of cargo-show-asm (LLVM Input)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --llvm-input sample::main
+#
+#      - name: Native version of cargo-show-asm (MIR)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --mir "main()"
+#
+#      - name: Crosscompiled version of cargo-show-asm (Intel ASM)
+#        run: cargo run -- --manifest-path sample/Cargo.toml --intel sample::main --target armv7-unknown-linux-gnueabihf
+#
+#      - name: Rlib project, AT&T asm
+#        run: cargo run -- --manifest-path sample_rlib/Cargo.toml --att
+#
+#      - name: cdylib project
+#        run: cargo run -- --manifest-path sample_cdylib/Cargo.toml add
+#
+#      - name: cdylib project, underscore prefix
+#        run: cargo run -- --manifest-path sample_cdylib/Cargo.toml _mul

Cargo.toml

@@ -24,6 +24,7 @@ rustc-demangle = "0.1"
 same-file = "1.0.6"
 supports-color = "3.0"
 serde = "=1.0.195"
+ar = "0.9.0"
 
 [dev-dependencies]
 bpaf = { version = "0.9.8", features = ["bpaf_derive", "autocomplete", "docgen"] }

Changelog.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [0.2.31] - unreleased
+- replace RPITIT with more consevative implementation
+
 ## [0.2.30] - 2024-02-11
 - Add an option `-c` / `--context` to recursively include functions called from target as
   additional context

src/asm.rs

@@ -473,7 +473,7 @@ impl RawLines for Statement<'_> {
 /// try to print `goal` from `path`, collect available items otherwise
 pub fn dump_function(
     goal: ToDump,
-    path: &Path,
+    contents: String,
     workspace: &Path,
     sysroot: &Path,
     fmt: &Format,
@@ -483,8 +483,6 @@ pub fn dump_function(
     }
 
     // For some reason llvm/rustc can produce non utf8 files...
-    let payload = std::fs::read(path)?;
-    let contents = String::from_utf8_lossy(&payload).into_owned();
 
     let statements = parse_file(&contents)?;
     let functions = find_items(&statements);

src/lib.rs

@@ -7,7 +7,6 @@ use std::{
 
 use crate::cached_lines::CachedLines;
 use opts::{Format, NameDisplay, ToDump};
-use std::path::Path;
 
 pub mod asm;
 pub mod cached_lines;
@@ -16,6 +15,7 @@ pub mod llvm;
 pub mod mca;
 pub mod mir;
 pub mod opts;
+pub mod rlib;
 
 #[macro_export]
 macro_rules! color {
@@ -265,10 +265,11 @@ pub trait Dumpable {
 ///
 /// # Errors
 /// Reports file IO errors
-pub fn dump_function<T: Dumpable>(goal: ToDump, path: &Path, fmt: &Format) -> anyhow::Result<()> {
-    // For some reason llvm/rustc can produce non utf8 files...
-    let payload = std::fs::read(path)?;
-    let contents = String::from_utf8_lossy(&payload).into_owned();
+pub fn dump_function<T: Dumpable>(
+    goal: ToDump,
+    contents: String,
+    fmt: &Format,
+) -> anyhow::Result<()> {
     let lines = CachedLines::without_ending(contents);
     let items = T::find_items(&lines);
     let strs = lines.iter().collect::<Vec<_>>();