From cb8ba8dbe3f41eec4b3c3c3b43d3aeba4df64ec3 Mon Sep 17 00:00:00 2001
From: eupn <eupn@protonmail.com>
Date: Fri, 25 Nov 2022 18:16:49 +0400
Subject: [PATCH] svd2utra: implement bitWidth and bitOffset tags for fields

---
 svd2utra/src/generate.rs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/svd2utra/src/generate.rs b/svd2utra/src/generate.rs
index d2ecdf4d0..b066c0174 100644
--- a/svd2utra/src/generate.rs
+++ b/svd2utra/src/generate.rs
@@ -121,6 +121,9 @@ fn generate_field<T: BufRead>(reader: &mut Reader<T>) -> Result<Field, ParseErro
     let mut name = None;
     let mut lsb = None;
     let mut msb = None;
+    let mut bit_offset = None;
+    let mut bit_width = None;
+
     loop {
         match reader.read_event(&mut buf) {
             Ok(Event::Start(ref e)) => {
@@ -153,6 +156,12 @@ fn generate_field<T: BufRead>(reader: &mut Reader<T>) -> Result<Field, ParseErro
                                 .map_err(|_| ParseError::ParseIntError)?,
                         );
                     }
+                    "bitWidth" => {
+                        bit_width = Some(parse_usize(extract_contents(reader)?.as_bytes())?)
+                    }
+                    "bitOffset" => {
+                        bit_offset = Some(parse_usize(extract_contents(reader)?.as_bytes())?)
+                    }
                     _ => (),
                 }
             }
@@ -166,6 +175,16 @@ fn generate_field<T: BufRead>(reader: &mut Reader<T>) -> Result<Field, ParseErro
         }
     }
 
+    // If no msb/lsb and bitRange tags were encountered then
+    // it's possible that the field is defined via
+    // `bitWidth` and `bitOffset` tags instead. Let's handle this.
+    if lsb.is_none() && msb.is_none() {
+        if let (Some(bit_width), Some(bit_offset)) = (bit_width, bit_offset) {
+            lsb = Some(bit_offset);
+            msb = Some(bit_offset + bit_width - 1);
+        }
+    }
+
     Ok(Field {
         name: name.ok_or(ParseError::MissingValue)?,
         lsb: lsb.ok_or(ParseError::MissingValue)?,