Merge pull request #194 from rust-embedded/collect_in_cluster

fix collect_in_cluster

Author: burrbull

CHANGELOG-python.md

@@ -5,6 +5,8 @@ This changelog tracks the Python `svdtools` project. See
 
 ## [Unreleased]
 
+* Fix #176 in `collect_in_cluster`
+
 ## [v0.1.27] 2023-12-23
 
 * Support `_include` in peripherals in `device.yaml`

CHANGELOG-rust.md

@@ -5,6 +5,8 @@ This changelog tracks the Rust `svdtools` project. See
 
 ## [Unreleased]
 
+* Fix #176 in `collect_in_cluster`
+
 ## [v0.3.7] 2023-12-22
 
 * Support `bitRange` and `msb+lsb` in field `_modify`

src/patch/peripheral.rs

@@ -1304,7 +1304,7 @@ fn collect_in_cluster(
     let mut rspecs = Vec::new();
     let single = !cname.contains("%s");
 
-    for rspec in cmod.keys() {
+    for (rspec, rmod) in cmod {
         let rspec = rspec.str()?;
         if rspec == "description" {
             continue;
@@ -1396,7 +1396,7 @@ fn collect_in_cluster(
                 ));
             }
         }
-        rdict.insert(rspec.to_string(), registers);
+        rdict.insert(rspec.to_string(), (rmod, registers));
     }
     if rdict.is_empty() {
         return Err(anyhow!(
@@ -1405,6 +1405,7 @@ fn collect_in_cluster(
     }
     let address_offset = rdict
         .values()
+        .map(|v| &v.1)
         .min_by_key(|rs| rs[0].address_offset)
         .unwrap()[0]
         .address_offset;
@@ -1420,9 +1421,9 @@ fn collect_in_cluster(
     let mut config = config.clone();
     config.update_fields = true;
     let cluster = if single {
-        for (rspec, mut registers) in rdict.into_iter() {
+        for (_, (rmod, mut registers)) in rdict.into_iter() {
             let mut reg = registers.swap_remove(0).single();
-            let rmod = cmod.get_hash(rspec.as_str())?.unwrap();
+            let rmod = rmod.hash()?;
             reg.process(rmod, path, &config)
                 .with_context(|| format!("Processing register `{}`", reg.name))?;
             if let Some(name) = rmod.get_str("name")? {
@@ -1434,9 +1435,9 @@ fn collect_in_cluster(
 
         cinfo.children(children).build(VAL_LVL)?.single()
     } else {
-        for (rspec, mut registers) in rdict.into_iter() {
+        for (rspec, (rmod, mut registers)) in rdict.into_iter() {
             let mut reg = registers.swap_remove(0).single();
-            let rmod = cmod.get_hash(rspec.as_str())?.unwrap();
+            let rmod = rmod.hash()?;
             reg.process(rmod, path, &config)
                 .with_context(|| format!("Processing register `{}`", reg.name))?;
             reg.name = if let Some(name) = rmod.get_str("name")? {

svdtools/patch.py

@@ -1107,6 +1107,7 @@ def collect_in_cluster(self, cname, cmod):
         check = True
         rspecs = [r for r in cmod if r != "description"]
         for rspec in rspecs:
+            rmod = cmod[rspec]
             rspec, ignore = get_spec(rspec)
             registers = []
             for rtag, match_rspec in list(self.iter_registers_with_matches(rspec)):
@@ -1126,7 +1127,7 @@ def collect_in_cluster(self, cname, cmod):
                     "{}: registers {rspec} not found".format(self.ptag.findtext("name"))
                 )
             registers = sorted(registers, key=lambda r: r[2])
-            rdict[rspec] = registers
+            rdict[rspec] = (rmod, registers)
             bitmasks = [Register(r[0]).get_bitmask() for r in registers]
             if first:
                 dim = len(registers)
@@ -1164,19 +1165,18 @@ def collect_in_cluster(self, cname, cmod):
                 )
             )
         ctag = ET.SubElement(self.ptag.find("registers"), "cluster")
-        addressOffset = min([registers[0][2] for _, registers in rdict.items()])
+        addressOffset = min([registers[0][2] for _, (_, registers) in rdict.items()])
         ET.SubElement(ctag, "name").text = cname
         if "description" in cmod:
             description = cmod["description"]
         else:
             description = "Cluster {}, containing {}".format(cname, ", ".join(rspecs))
         ET.SubElement(ctag, "description").text = description
         ET.SubElement(ctag, "addressOffset").text = hex(addressOffset)
-        for rspec, registers in rdict.items():
+        for rspec, (rmod, registers) in rdict.items():
             for rtag, _, _ in registers[1:]:
                 self.ptag.find("registers").remove(rtag)
             rtag = registers[0][0]
-            rmod = cmod[rspec]
             self.process_register(rspec, rmod)
             new_rtag = copy.deepcopy(rtag)
             self.ptag.find("registers").remove(rtag)