unstable-riscv feature

Author: romancardenas

svd-encoder/CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 
 - Add `riscv` element for configuration parameters related to RISC-V targets.
+  You must use the `unstable-riscv` feature to enable this exeperimental element.
 - Bump MSRV to 1.65.0
 
 ## [v0.14.3] - 2023-11-15

svd-encoder/Cargo.toml

@@ -11,6 +11,9 @@ rust-version = "1.65.0"
 version = "0.14.4"
 readme = "README.md"
 
+[features]
+unstable-riscv = ["svd-rs/unstable-riscv"]
+
 [dependencies]
 convert_case = "0.6.0"
 svd-rs = { version = "0.14.7", path = "../svd-rs" }

svd-encoder/src/device.rs

@@ -34,7 +34,7 @@ impl Encode for Device {
             elem.children.push(new_node("licenseText", v.clone()));
         }
 
-        // TODO not sure if this is the correct position
+        #[cfg(feature = "unstable-riscv")]
         if let Some(v) = &self.riscv {
             elem.children
                 .push(XMLNode::Element(v.encode_with_config(config)?));

svd-encoder/src/lib.rs

@@ -103,6 +103,7 @@ mod readaction;
 mod register;
 mod registercluster;
 mod registerproperties;
+#[cfg(feature = "unstable-riscv")]
 mod riscv;
 mod usage;
 mod writeconstraint;

svd-encoder/src/riscv.rs

@@ -7,15 +7,6 @@ impl Encode for Riscv {
     fn encode_with_config(&self, config: &Config) -> Result<Element, EncodeError> {
         let mut elem = Element::new("riscv");
 
-        if let Some(clic) = &self.clic {
-            elem.children.push(new_node("clic", clic.clone()));
-        }
-        if let Some(clint) = &self.clint {
-            elem.children.push(new_node("clint", clint.clone()));
-        }
-        if let Some(plic) = &self.plic {
-            elem.children.push(new_node("plic", plic.clone()));
-        }
         if !self.core_interrupts.is_empty() {
             let mut interrupts = Element::new("coreInterrupts");
             for interrupt in &self.core_interrupts {

svd-parser/CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 
 - Add `riscv` element for configuration parameters related to RISC-V targets.
+  You must use the `unstable-riscv` feature to enable this exeperimental element.
 - Bump MSRV to 1.65.0
 
 ## [v0.14.5] - 2024-01-03

svd-parser/Cargo.toml

@@ -17,6 +17,7 @@ readme = "README.md"
 [features]
 derive-from = ["svd-rs/derive-from"]
 expand = ["derive-from"]
+unstable-riscv = ["svd-rs/unstable-riscv"]
 
 [dependencies]
 svd-rs = { version = "0.14.7", path = "../svd-rs" }

svd-parser/src/device.rs

@@ -1,7 +1,7 @@
 use super::*;
-use crate::svd::{
-    cpu::Cpu, peripheral::Peripheral, registerproperties::RegisterProperties, riscv::Riscv,
-};
+#[cfg(feature = "unstable-riscv")]
+use crate::svd::riscv::Riscv;
+use crate::svd::{cpu::Cpu, peripheral::Peripheral, registerproperties::RegisterProperties};
 
 /// Parses a SVD file
 impl Parse for Device {
@@ -20,7 +20,6 @@ impl Parse for Device {
             .name(tree.get_child_text("name")?)
             .series(tree.get_child_text_opt("series")?)
             .license_text(tree.get_child_text_opt("licenseText")?)
-            .riscv(optional::<Riscv>("riscv", tree, config)?)
             .cpu(optional::<Cpu>("cpu", tree, config)?)
             .header_system_filename(tree.get_child_text_opt("headerSystemFilename")?)
             .header_definitions_prefix(tree.get_child_text_opt("headerDefinitionsPrefix")?)
@@ -34,6 +33,10 @@ impl Parse for Device {
                     .collect();
                 ps?
             });
+        #[cfg(feature = "unstable-riscv")]
+        if let Some(riscv) = optional::<Riscv>("riscv", tree, config)? {
+            device = device.riscv(riscv);
+        }
         if let Some(version) = tree.get_child_text_opt("version")? {
             device = device.version(version)
         }

svd-parser/src/lib.rs

@@ -211,6 +211,7 @@ mod readaction;
 mod register;
 mod registercluster;
 mod registerproperties;
+#[cfg(feature = "unstable-riscv")]
 mod riscv;
 mod usage;
 mod writeconstraint;

svd-parser/src/riscv.rs

@@ -11,10 +11,7 @@ impl Parse for Riscv {
             return Err(SVDError::NotExpectedTag("riscv".to_string()).at(tree.id()));
         }
 
-        let mut builder = Riscv::builder()
-            .clic(tree.get_child_text("clic").ok())
-            .clint(tree.get_child_text("clint").ok())
-            .plic(tree.get_child_text("plic").ok());
+        let mut builder = Riscv::builder();
 
         if let Some(interrupts) = tree.get_child("coreInterrupts") {
             let interrupts: Result<Vec<_>, _> = interrupts