From c7c3efae2b5904f40ec2a9ee8c61bb8ba3769782 Mon Sep 17 00:00:00 2001 From: eupn Date: Thu, 13 Oct 2022 11:56:14 +0400 Subject: [PATCH 1/3] svd2utra: read the field's tag only once --- svd2utra/src/generate.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svd2utra/src/generate.rs b/svd2utra/src/generate.rs index 1ffa5e492..fda88e12c 100644 --- a/svd2utra/src/generate.rs +++ b/svd2utra/src/generate.rs @@ -123,7 +123,7 @@ fn generate_field(reader: &mut Reader) -> Result name = Some(extract_contents(reader)?), + "name" if name.is_none() => name = Some(extract_contents(reader)?), "lsb" => lsb = Some(parse_usize(extract_contents(reader)?.as_bytes())?), "msb" => msb = Some(parse_usize(extract_contents(reader)?.as_bytes())?), _ => (), From bcb99ba72781a7772b2bf849e374bc19744ed9b4 Mon Sep 17 00:00:00 2001 From: eupn Date: Thu, 13 Oct 2022 11:59:44 +0400 Subject: [PATCH 2/3] svd2utra: add bitRange tag support for fields --- svd2utra/src/generate.rs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/svd2utra/src/generate.rs b/svd2utra/src/generate.rs index fda88e12c..686484e4b 100644 --- a/svd2utra/src/generate.rs +++ b/svd2utra/src/generate.rs @@ -2,6 +2,7 @@ use convert_case::{Case, Casing}; use quick_xml::events::Event; use quick_xml::Reader; use std::io::{BufRead, BufReader, Read, Write}; + #[derive(Debug)] pub enum ParseError { UnexpectedTag, @@ -9,6 +10,7 @@ pub enum ParseError { ParseIntError, NonUTF8, WriteError, + UnexpectedValue, } #[derive(Default, Debug)] @@ -66,6 +68,7 @@ impl core::fmt::Display for ParseError { use ParseError::*; match *self { UnexpectedTag => write!(f, "unexpected XML tag encountered"), + UnexpectedValue => write!(f, "unexpected XML tag value encountered"), MissingValue => write!(f, "XML tag should have contained a value"), ParseIntError => write!(f, "unable to parse number"), NonUTF8 => write!(f, "file is not UTF-8"), @@ -126,6 +129,18 @@ fn generate_field(reader: &mut Reader) -> Result name = Some(extract_contents(reader)?), "lsb" => lsb = Some(parse_usize(extract_contents(reader)?.as_bytes())?), "msb" => msb = Some(parse_usize(extract_contents(reader)?.as_bytes())?), + "bitRange" => { + let range = extract_contents(reader)?; + if !range.starts_with("[") || !range.ends_with("]") { + return Err(ParseError::UnexpectedValue) + } + + let mut parts = range[1..range.len() - 1].split(':'); + msb = Some(parts.next().ok_or_else(|| ParseError::UnexpectedValue)? + .parse::().or_else(|_| Err(ParseError::ParseIntError))?); + lsb = Some(parts.next().ok_or_else(|| ParseError::UnexpectedValue)? + .parse::().or_else(|_| Err(ParseError::ParseIntError))?); + } _ => (), } } From 5ce93a8615e1d291a3acd2abf3cdb46cabb0f433 Mon Sep 17 00:00:00 2001 From: eupn Date: Thu, 13 Oct 2022 12:04:26 +0400 Subject: [PATCH 3/3] svd2utra: fix duplicate enum discriminants error for offsets --- svd2utra/src/generate.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svd2utra/src/generate.rs b/svd2utra/src/generate.rs index 686484e4b..6bf150c1f 100644 --- a/svd2utra/src/generate.rs +++ b/svd2utra/src/generate.rs @@ -837,7 +837,7 @@ pub mod utra { out, " {} = {},", register.name.to_case(Case::UpperCamel), - register.offset / 4 + register.offset )?; } writeln!(out, " }}")?;