Pin [email protected] (#889)

* revert: Pin [email protected]

* test: Add backtrace tests

Author: SergioGasquez

Cargo.lock

@@ -25,7 +25,7 @@ path              = "./src/bin/espflash.rs"
 required-features = ["cli", "serialport"]
 
 [dependencies]
-addr2line       = { version = "0.24.2", optional = true }
+addr2line       = { version = "=0.22.0", optional = true }
 base64          = "0.22.1"
 bitflags        = "2.9.0"
 bytemuck        = { version = "1.21.0", features = ["derive"] }

espflash/Cargo.toml

@@ -3,32 +3,22 @@ use std::error::Error;
 use addr2line::{
     Context,
     LookupResult,
-    gimli::{self, Dwarf, EndianSlice, LittleEndian, SectionId},
+    gimli::{EndianRcSlice, RunTimeEndian},
+    object::{Object, ObjectSegment, ObjectSymbol, read::File},
 };
-use object::{Object, ObjectSection, ObjectSegment, ObjectSymbol, read::File};
 
 // Wrapper around addr2line that allows to look up function names and
 // locations from a given address.
 pub(crate) struct Symbols<'sym> {
     object: File<'sym, &'sym [u8]>,
-    ctx: Context<EndianSlice<'sym, LittleEndian>>,
+    ctx: Context<EndianRcSlice<RunTimeEndian>>,
 }
 
 impl<'sym> Symbols<'sym> {
     /// Tries to create a new `Symbols` instance from the given ELF file bytes.
     pub fn try_from(bytes: &'sym [u8]) -> Result<Self, Box<dyn Error>> {
         let object = File::parse(bytes)?;
-        let dwarf = Dwarf::load(
-            |id: SectionId| -> Result<EndianSlice<'sym, LittleEndian>, gimli::Error> {
-                let data = object
-                    .section_by_name(id.name())
-                    .and_then(|section| section.data().ok())
-                    .unwrap_or(&[][..]);
-                Ok(EndianSlice::new(data, LittleEndian))
-            },
-        )?;
-
-        let ctx = Context::from_dwarf(dwarf)?;
+        let ctx = Context::new(&object)?;
 
         Ok(Self { object, ctx })
     }

espflash/src/cli/monitor/symbols.rs

@@ -15,3 +15,22 @@ esp-generate --chip=esp32c6 -o defmt --headless esp32c6_defmt
 cd esp32c6_defmt
 DEFMT_LOG=info cargo build --release
 ```
+
+
+The `esp32c6_backtrace` elf file under this folder has been generated using `esp-generate@f4213a9`:
+```
+esp-generate --chip=esp32c6 --headless -o esp-backtrace esp32c6_backtrace
+cd esp32c6_backtrace
+```
+Modified the main.rs to panic:
+```diff
+    let _peripherals = esp_hal::init(config);
+
++    panic!("test");
++
+    loop {
+```
+And then build the elf file:
+```
+cargo build --release
+```

espflash/tests/data/README.md

@@ -41,6 +41,29 @@ if [[ "$1" == "esp32c6" ]]; then
         echo "Monitoring failed!"
         exit 1
     fi
+
+    # Backtrace test
+    app_backtrace="${app}_backtrace"
+
+    result=$(timeout 10s espflash flash --no-skip --monitor --non-interactive $app_backtrace 2>&1)
+    echo "$result"
+    if [[ ! $result =~ "Flashing has completed!" ]]; then
+        echo "Flashing failed!"
+        exit 1
+    fi
+    expected_strings=(
+        "0x420012c8"
+        "main"
+        "esp32c6_backtrace/src/bin/main.rs:"
+        "0x42001280"
+        "hal_main"
+    )
+    for expected in "${expected_strings[@]}"; do
+        if ! echo "$result" | grep -q "$expected"; then
+            echo "Monitoring failed! Expected '$expected' not found in output."
+            exit 1
+        fi
+    done
 fi
 
 result=$(timeout 15s espflash flash --no-skip --monitor --non-interactive $app 2>&1)