From 947ff2d1729132c226c0fa01a4938e5b9ea0ee86 Mon Sep 17 00:00:00 2001 From: eupn Date: Wed, 26 Oct 2022 21:01:46 +0400 Subject: [PATCH 1/2] svd2utra: implement derivedFrom SVD attribute --- svd2utra/src/generate.rs | 66 +++++++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/svd2utra/src/generate.rs b/svd2utra/src/generate.rs index 60e88deda..ee8a74076 100644 --- a/svd2utra/src/generate.rs +++ b/svd2utra/src/generate.rs @@ -1,5 +1,5 @@ use convert_case::{Case, Casing}; -use quick_xml::events::Event; +use quick_xml::events::{attributes::Attribute, Event}; use quick_xml::Reader; use std::io::{BufRead, BufReader, Read, Write}; @@ -11,16 +11,17 @@ pub enum ParseError { NonUTF8, WriteError, UnexpectedValue, + MissingBasePeripheral(String), } -#[derive(Default, Debug)] +#[derive(Default, Debug, Clone)] pub struct Field { name: String, lsb: usize, msb: usize, } -#[derive(Default, Debug)] +#[derive(Default, Debug, Clone)] pub struct Register { name: String, offset: usize, @@ -28,7 +29,7 @@ pub struct Register { fields: Vec, } -#[derive(Default, Debug)] +#[derive(Default, Debug, Clone)] pub struct Interrupt { name: String, value: usize, @@ -73,6 +74,7 @@ impl core::fmt::Display for ParseError { ParseIntError => write!(f, "unable to parse number"), NonUTF8 => write!(f, "file is not UTF-8"), WriteError => write!(f, "unable to write destination file"), + MissingBasePeripheral(ref name) => write!(f, "undeclared base peripheral: {}", name), } } } @@ -286,13 +288,24 @@ fn generate_registers( Ok(()) } -fn generate_peripheral(reader: &mut Reader) -> Result { +fn derive_peripheral(base: &Peripheral, child_name: &str, child_base: usize) -> Peripheral { + Peripheral { + name: child_name.to_owned(), + base: child_base, + _size: base._size, + interrupt: base.interrupt.clone(), + registers: base.registers.clone(), + } +} + +fn generate_peripheral(base_peripheral: Option<&Peripheral>, reader: &mut Reader) -> Result { let mut buf = Vec::new(); let mut name = None; let mut base = None; let mut size = None; let mut registers = vec![]; let mut interrupts = vec![]; + loop { match reader.read_event(&mut buf) { Ok(Event::Start(ref e)) => { @@ -320,22 +333,47 @@ fn generate_peripheral(reader: &mut Reader) -> Result(reader: &mut Reader) -> Result, ParseError> { let mut buf = Vec::new(); - let mut peripherals = vec![]; + let mut peripherals: Vec = vec![]; + loop { match reader.read_event(&mut buf) { Ok(Event::Start(ref e)) => match e.name() { - b"peripheral" => peripherals.push(generate_peripheral(reader)?), + b"peripheral" => { + let base_peripheral = match e.attributes().next() { + Some(Ok(Attribute { key, value })) if key == b"derivedFrom" => { + let base_peripheral_name = String::from_utf8(value.to_vec()) + .or_else(|_| Err(ParseError::NonUTF8))?; + + let base = peripherals.iter() + .find(|p| p.name == base_peripheral_name) + .ok_or_else(|| ParseError::MissingBasePeripheral(base_peripheral_name))?; + + Some(base) + } + _ => None, + }; + + peripherals.push(generate_peripheral(base_peripheral, reader)?); + }, _ => panic!("unexpected tag in : {:?}", e), }, Ok(Event::End(ref e)) => match e.name() { From 36db49d7b72e2dfdbd64246b2be4260fe5ce8268 Mon Sep 17 00:00:00 2001 From: eupn Date: Wed, 26 Oct 2022 21:03:03 +0400 Subject: [PATCH 2/2] svd2utra: apply rustfmt --- svd2utra/src/generate.rs | 45 +++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/svd2utra/src/generate.rs b/svd2utra/src/generate.rs index ee8a74076..701bbd9a9 100644 --- a/svd2utra/src/generate.rs +++ b/svd2utra/src/generate.rs @@ -134,14 +134,24 @@ fn generate_field(reader: &mut Reader) -> Result { let range = extract_contents(reader)?; if !range.starts_with("[") || !range.ends_with("]") { - return Err(ParseError::UnexpectedValue) + 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))?); + 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))?, + ); } _ => (), } @@ -298,7 +308,10 @@ fn derive_peripheral(base: &Peripheral, child_name: &str, child_base: usize) -> } } -fn generate_peripheral(base_peripheral: Option<&Peripheral>, reader: &mut Reader) -> Result { +fn generate_peripheral( + base_peripheral: Option<&Peripheral>, + reader: &mut Reader, +) -> Result { let mut buf = Vec::new(); let mut name = None; let mut base = None; @@ -338,7 +351,7 @@ fn generate_peripheral(base_peripheral: Option<&Peripheral>, reader: // Derive from the base peripheral if specified if let Some(base_peripheral) = base_peripheral { - return Ok(derive_peripheral(base_peripheral, &name, base)) + return Ok(derive_peripheral(base_peripheral, &name, base)); } else { Ok(Peripheral { name, @@ -363,9 +376,12 @@ fn generate_peripherals(reader: &mut Reader) -> Result(reader: &mut Reader) -> Result panic!("unexpected tag in : {:?}", e), }, Ok(Event::End(ref e)) => match e.name() { @@ -946,11 +962,16 @@ mod tests { let mod_name = peripheral.name.to_lowercase(); let per_name = peripheral.name.to_lowercase() + "_csr"; - write!(out, r####" + write!( + out, + r####" #[test] #[ignore] fn compile_check_{}() {{ - use super::*;"####, per_name)?; + use super::*; +"####, + per_name + )?; writeln!( out,