collect register/cluster errors

Author: burrbull

src/patch/peripheral.rs

@@ -1202,14 +1202,20 @@ fn collect_in_array(
         .iter()
         .map(|r| r.address_offset)
         .collect::<Vec<_>>();
+    let dim_increment = if dim > 1 { offsets[1] - offsets[0] } else { 0 };
+    if !check_offsets(&offsets, dim_increment) {
+        return Err(anyhow!(
+            "{}: registers cannot be collected into {rspec} array. Different addressOffset increments",
+            path
+        ));
+    }
     let bitmasks = registers
         .iter()
         .map(RegisterInfo::get_bitmask)
         .collect::<Vec<_>>();
-    let dim_increment = if dim > 1 { offsets[1] - offsets[0] } else { 0 };
-    if !(check_offsets(&offsets, dim_increment) && bitmasks.iter().all(|&m| m == bitmasks[0])) {
+    if !bitmasks.iter().all(|&m| m == bitmasks[0]) {
         return Err(anyhow!(
-            "{}: registers cannot be collected into {rspec} array",
+            "{}: registers cannot be collected into {rspec} array. Different bit masks",
             path
         ));
     }
@@ -1248,8 +1254,7 @@ fn collect_in_cluster(
     cmod: &Hash,
 ) -> PatchResult {
     let mut rdict = linked_hash_map::LinkedHashMap::new();
-    let mut first = true;
-    let mut check = true;
+    let mut first = None;
     let mut dim = 0;
     let mut dim_index = Vec::new();
     let mut dim_increment = 0;
@@ -1311,43 +1316,43 @@ fn collect_in_cluster(
                     Ok(r.name[li..r.name.len() - ri].to_string())
                 })
                 .collect::<Result<Vec<_>, _>>();
-            let new_dim_index = match new_dim_index {
-                Ok(v) => v,
-                Err(e) => return Err(e),
-            };
-            if first {
+            let new_dim_index = new_dim_index?;
+            if let Some(rspec1) = first.as_ref() {
+                let len = registers.len();
+                if dim != len {
+                    return Err(anyhow!(
+                        "{path}: registers cannot be collected into {cname} cluster. Different number of registers {rspec} ({len}) and {rspec1} ({dim})"
+                    ));
+                }
+                if dim_index != new_dim_index {
+                    return Err(anyhow!(
+                        "{path}: registers cannot be collected into {cname} cluster. {rspec} and {rspec1} have different indeces"
+                    ));
+                }
+            } else {
                 dim = registers.len();
                 dim_index = new_dim_index;
-                dim_increment = 0;
                 offsets = registers
                     .iter()
                     .map(|r| r.address_offset)
                     .collect::<Vec<_>>();
                 if dim > 1 {
                     dim_increment = offsets[1] - offsets[0];
                 }
-                if !(check_offsets(&offsets, dim_increment)
-                    && bitmasks.iter().all(|&m| m == bitmasks[0]))
-                {
-                    check = false;
-                    break;
-                }
-            } else if (dim != registers.len())
-                || (dim_index != new_dim_index)
-                || (!check_offsets(&offsets, dim_increment))
-                || (!bitmasks.iter().all(|&m| m == bitmasks[0]))
-            {
-                check = false;
-                break;
+                first = Some(rspec.clone());
+            }
+            if !check_offsets(&offsets, dim_increment) {
+                return Err(anyhow!(
+                    "{path}: registers cannot be collected into {cname} cluster. Different addressOffset increments in {rspec} registers"
+                ));
+            }
+            if !bitmasks.iter().all(|&m| m == bitmasks[0]) {
+                return Err(anyhow!(
+                    "{path}: registers cannot be collected into {cname} cluster. Different bit masks in {rspec} registers"
+                ));
             }
         }
         rdict.insert(rspec.to_string(), registers);
-        first = false;
-    }
-    if !check {
-        return Err(anyhow!(
-            "{path}: registers cannot be collected into {cname} cluster"
-        ));
     }
     let address_offset = rdict
         .values()

src/patch/register.rs

@@ -405,7 +405,7 @@ impl RegisterExt for Register {
             let dim_increment = if dim > 1 { offsets[1] - offsets[0] } else { 0 };
             if !check_offsets(&offsets, dim_increment) {
                 return Err(anyhow!(
-                    "{}: registers cannot be collected into {fspec} array",
+                    "{}: fields cannot be collected into {fspec} array. Different bitOffset increments",
                     self.name
                 ));
             }