Merge branch 'main' into fix/flash-26mhz

CHANGELOG.md

@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `espflash` will now exit with an error if `defmt` is selected but not usable (#524)
 - Unify configuration methods (#551)
 - MSRV bumped to `1.73.0` (#578)
+- Improved symbol resolving (#581)
 - Update ESP32 and ESP32-C2 stubs (#584)
 
 ### Removed

espflash/src/cli/monitor/parser/mod.rs

@@ -38,14 +38,21 @@ fn resolve_addresses(
         let name = symbols.get_name(addr);
         let location = symbols.get_location(addr);
 
-        let name = name.as_deref().unwrap_or("??");
-        let output = if let Some((file, line_num)) = location {
-            format!("{matched} - {name}\r\n    at {file}:{line_num}\r\n")
-        } else {
-            format!("{matched} - {name}\r\n    at ??:??\r\n")
-        };
+        if let Some(name) = name {
+            let output = if line.trim() == format!("0x{:x}", addr) {
+                if let Some((file, line_num)) = location {
+                    format!("{name}\r\n    at {file}:{line_num}\r\n")
+                } else {
+                    format!("{name}\r\n    at ??:??\r\n")
+                }
+            } else if let Some((file, line_num)) = location {
+                format!("{matched} - {name}\r\n    at {file}:{line_num}\r\n")
+            } else {
+                format!("{matched} - {name}\r\n    at ??:??\r\n")
+            };
 
-        out.queue(PrintStyledContent(output.with(Color::Yellow)))?;
+            out.queue(PrintStyledContent(output.with(Color::Yellow)))?;
+        }
     }
 
     Ok(())

espflash/src/cli/monitor/symbols.rs

@@ -2,7 +2,7 @@ use std::error::Error;
 
 use addr2line::{
     gimli::{EndianRcSlice, RunTimeEndian},
-    object::{read::File, Object},
+    object::{read::File, Object, ObjectSegment},
     Context, LookupResult,
 };
 
@@ -23,6 +23,13 @@ impl<'sym> Symbols<'sym> {
 
     /// Returns the name of the function at the given address, if one can be found.
     pub fn get_name(&self, addr: u64) -> Option<String> {
+        // no need to try an address not contained in any segment
+        if !self.file.segments().any(|segment| {
+            (segment.address()..(segment.address() + segment.size())).contains(&addr)
+        }) {
+            return None;
+        }
+
         // The basic steps here are:
         //   1. find which frame `addr` is in
         //   2. look up and demangle the function name
@@ -44,10 +51,10 @@ impl<'sym> Symbols<'sym> {
                     .and_then(|name| name.demangle().map(|s| s.into_owned()).ok())
             })
             .or_else(|| {
-                self.file
-                    .symbol_map()
-                    .get(addr)
-                    .map(|sym| sym.name().to_string())
+                self.file.symbol_map().get(addr).map(|sym| {
+                    addr2line::demangle_auto(std::borrow::Cow::Borrowed(sym.name()), None)
+                        .to_string()
+                })
             })
     }