saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-15 08:30:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

svd2utra: implement bitWidth and bitOffset tags for fields

Browse source
This commit is contained in:
eupn 2022-11-25 18:16:49 +04:00
parent 998061448c
commit cb8ba8dbe3
No known key found for this signature in database
GPG key ID: 0BBE77FB42014014
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
svd2utra/src/generate.rs
View file

@ -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)?,