Merge pull request #775 from paulmenage/mapping-symbols

decoder: Ignore AArch64 mapping symbols

CHANGELOG.md

@@ -7,8 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- [#775]: `defmt-decoder`: Ignore AArch64 mapping symbols
 - [#771]: `defmt-macros`: Ignore empty items in DEFMT_LOG
 
+[#775]: https://github.com/knurling-rs/defmt/pull/775
 [#771]: https://github.com/knurling-rs/defmt/pull/771
 
 ## defmt-decoder v0.3.8, defmt-print v0.3.8 - 2023-08-01

decoder/src/elf2table/mod.rs

@@ -108,13 +108,21 @@ pub fn parse_impl(elf: &[u8], check_version: bool) -> Result<Option<Table>, anyh
     let mut bitflags_map = HashMap::new();
     let mut timestamp = None;
     for entry in elf.symbols() {
-        // Skipping symbols with empty string names, as they may be added by
-        // `objcopy`, and breaks JSON demangling
-        let name = match entry.name() {
-            Ok(name) if !name.is_empty() => name,
-            _ => continue,
+        let Ok(name) = entry.name() else {
+            continue;
         };
 
+        if name.is_empty() {
+            // Skipping symbols with empty string names, as they may be added by
+            // `objcopy`, and breaks JSON demangling
+            continue;
+        }
+
+        if name == "$d" || name.starts_with("$d.") {
+            // Skip AArch64 mapping symbols
+            continue;
+        }
+
         if name.starts_with("_defmt") || name.starts_with("__DEFMT_MARKER") {
             // `_defmt_version_` is not a JSON encoded `defmt` symbol / log-message; skip it
             // LLD and GNU LD behave differently here. LLD doesn't include `_defmt_version_`

firmware/qemu/src/bin/bitflags.rs

@@ -1,5 +1,6 @@
 #![no_std]
 #![no_main]
+#![allow(clippy::bad_bit_mask)]
 
 use cortex_m_rt::entry;
 use cortex_m_semihosting::debug;