From 8453b46eab4038daaa17fc36baece9708026158a Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <email@gwilym.dev>
Date: Mon, 1 Apr 2024 13:43:08 +0100
Subject: [PATCH] Prettify the output a little

---
 agb-addr2line/Cargo.toml  |  5 ++++-
 agb-addr2line/src/main.rs | 43 ++++++++++++++++++++++++++++++++-------
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/agb-addr2line/Cargo.toml b/agb-addr2line/Cargo.toml
index 82cfffa7..1727ca6d 100644
--- a/agb-addr2line/Cargo.toml
+++ b/agb-addr2line/Cargo.toml
@@ -10,7 +10,10 @@ repository = "https://github.com/agbrs/agb"
 [dependencies]
 anyhow = "1"
 clap = { version = "4", features = ["derive"] }
-addr2line = "0.21"
+addr2line = { version = "0.21", default-features = false, features = [
+    "rustc-demangle",
+    "std-object",
+] }
 
 [profile.dev]
 opt-level = 3
diff --git a/agb-addr2line/src/main.rs b/agb-addr2line/src/main.rs
index 4c5641a8..85cbebcb 100644
--- a/agb-addr2line/src/main.rs
+++ b/agb-addr2line/src/main.rs
@@ -13,6 +13,20 @@ struct Args {
     dump: String,
 }
 
+struct Location {
+    filename: String,
+    line: u32,
+}
+
+impl Default for Location {
+    fn default() -> Self {
+        Self {
+            filename: "??".to_string(),
+            line: 0,
+        }
+    }
+}
+
 fn main() -> anyhow::Result<()> {
     let cli = Args::parse();
 
@@ -21,14 +35,29 @@ fn main() -> anyhow::Result<()> {
 
     let ctx = addr2line::Context::new(&object)?;
 
-    if let Some(location) = ctx.find_location(parse_address(&cli.dump)?)? {
-        let file = location.file.unwrap_or("unknown file");
-        let line = location
-            .line
-            .map(|line| line.to_string())
-            .unwrap_or_else(|| "??".to_owned());
+    let mut frames = ctx
+        .find_frames(parse_address(&cli.dump)?)
+        .skip_all_loads()?;
 
-        println!("{file}:{line}");
+    while let Some(frame) = frames.next()? {
+        let function_name = if let Some(func) = frame.function {
+            func.demangle()?.into_owned()
+        } else {
+            "unknown function".to_string()
+        };
+
+        let location = frame
+            .location
+            .map(|location| Location {
+                filename: location.file.unwrap_or("??").to_owned(),
+                line: location.line.unwrap_or(0),
+            })
+            .unwrap_or_default();
+
+        println!(
+            "{}:{} ({})",
+            location.filename, location.line, function_name
+        );
     }
 
     Ok(())