max cluster size

Author: burrbull

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Check cluster size, add `max_cluster_size` option
+
 ## [v0.25.0] - 2022-08-02
 
 - Add `feature_peripheral` option which generates cfg features for each peripheral

src/generate/peripheral.rs

@@ -670,7 +670,7 @@ fn expand_cluster(cluster: &Cluster, config: &Config) -> Result<Vec<RegisterBloc
     let mut cluster_expanded = vec![];
 
     let cluster_size = cluster_info_size_in_bits(cluster, config)
-        .with_context(|| format!("Cluster {} has no determinable `size` field", cluster.name))?;
+        .with_context(|| format!("Can't calculate cluster {} size", cluster.name))?;
     let description = cluster
         .description
         .as_ref()
@@ -696,8 +696,17 @@ fn expand_cluster(cluster: &Cluster, config: &Config) -> Result<Vec<RegisterBloc
             })
         }
         Cluster::Array(info, array_info) => {
-            let sequential_addresses =
-                (array_info.dim == 1) || (cluster_size == array_info.dim_increment * BITS_PER_BYTE);
+            let increment_bits = array_info.dim_increment * BITS_PER_BYTE;
+            if cluster_size > increment_bits {
+                let cname = &cluster.name;
+                return Err(anyhow!("Cluster {cname} has size {cluster_size} bits that is more then array increment {increment_bits} bits"));
+            }
+            let cluster_size = if config.max_cluster_size {
+                increment_bits
+            } else {
+                cluster_size
+            };
+            let sequential_addresses = (array_info.dim == 1) || (cluster_size == increment_bits);
 
             // if dimIndex exists, test if it is a sequence of numbers from 0 to dim
             let sequential_indexes_from0 = array_info

src/main.rs

@@ -85,6 +85,11 @@ fn run() -> Result<()> {
                 .long("feature_peripheral")
                 .help("Use independent cfg feature flags for each peripheral"),
         )
+        .arg(
+            Arg::with_name("max_cluster_size")
+                .long("max_cluster_size")
+                .help("Use array increment for cluster size"),
+        )
         .arg(
             Arg::with_name("make_mod")
                 .long("make_mod")
@@ -183,6 +188,8 @@ fn run() -> Result<()> {
         cfg.bool_flag("feature_group", Filter::Arg) || cfg.bool_flag("feature_group", Filter::Conf);
     let feature_peripheral = cfg.bool_flag("feature_peripheral", Filter::Arg)
         || cfg.bool_flag("feature_peripheral", Filter::Conf);
+    let max_cluster_size = cfg.bool_flag("max_cluster_size", Filter::Arg)
+        || cfg.bool_flag("max_cluster_size", Filter::Conf);
 
     let mut source_type = cfg
         .grab()
@@ -209,6 +216,7 @@ fn run() -> Result<()> {
         derive_more,
         feature_group,
         feature_peripheral,
+        max_cluster_size,
         output_dir: path.clone(),
         source_type,
     };

src/util.rs

@@ -22,7 +22,7 @@ pub const BITS_PER_BYTE: u32 = 8;
 /// that are not valid in Rust ident
 const BLACKLIST_CHARS: &[char] = &['(', ')', '[', ']', '/', ' ', '-'];
 
-#[derive(Clone, PartialEq, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct Config {
     pub target: Target,
     pub nightly: bool,
@@ -36,6 +36,7 @@ pub struct Config {
     pub derive_more: bool,
     pub feature_group: bool,
     pub feature_peripheral: bool,
+    pub max_cluster_size: bool,
     pub output_dir: PathBuf,
     pub source_type: SourceType,
 }
@@ -55,6 +56,7 @@ impl Default for Config {
             derive_more: false,
             feature_group: false,
             feature_peripheral: false,
+            max_cluster_size: false,
             output_dir: PathBuf::from("."),
             source_type: SourceType::default(),
         }
@@ -63,7 +65,7 @@ impl Default for Config {
 
 #[allow(clippy::upper_case_acronyms)]
 #[allow(non_camel_case_types)]
-#[derive(Clone, Copy, PartialEq, Debug)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub enum Target {
     CortexM,
     Msp430,
@@ -93,7 +95,7 @@ impl Default for Target {
     }
 }
 
-#[derive(Clone, Copy, PartialEq, Debug)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub enum SourceType {
     Xml,
     #[cfg(feature = "yaml")]